nitta-lab-2018/Cactus

Fork: 0

nitta-lab-2018 / Cactus

2018-11-15	b4b0319 Browse files » Merge branch 'master' into ForEasySignUp ... # Conflicts: # .idea/caches/build_file_checksums.ser # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/BulletsManager.java # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/DummyBullet.java a-matsumoto committed on 15 Nov 2018
2018-11-16	0bac1aa Browse files » Merge pull request #58 from nitta-lab-2018/get_other_player_bullet ... Get other player bullet Takumi Hayashi committed on 16 Nov 2018
2018-11-15	92bccda Browse files » Merge branch 'master' into PlplupLearnedBulletSeed ... # Conflicts: # .idea/caches/build_file_checksums.ser # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OwnPlayer.java # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/PlayerFragment.java # app/src/main/res/layout/ui_fragment.xml 何もしてない a-matsumoto committed on 15 Nov 2018
	e18e863 Browse files » 自分の弾を他者の弾として描画していたのを修正 ... scale変更 iwatani committed on 15 Nov 2018
	30202fd Browse files » clear忘れ iwatani committed on 15 Nov 2018
	2c044a5 Browse files » 他者の弾をGetできるよう実装 s-iwatani authored on 15 Nov 2018 iwatani committed on 15 Nov 2018
	51cbaf8 Browse files » Merge branch 'master' into PlplupLearnedBulletSeed ... # Conflicts: # .idea/caches/build_file_checksums.ser # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OwnPlayer.java # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/PlayerFragment.java # app/src/main/res/layout/ui_fragment.xml 何もしてない a-matsumoto committed on 15 Nov 2018
2018-11-13	4f30006 Browse files » Merge pull request #57 from nitta-lab-2018/correct_model_manager ... modelManagerでsetInstanceIdが反映されない不具合を修正 aki matsumoto committed on 13 Nov 2018
	820d637 Browse files » Merge pull request #56 from nitta-lab-2018/BehaviorTest ... scaleでオブジェクトのサイズ変更 Takumi Hayashi committed on 13 Nov 2018
	3159903 Browse files » Merge pull request #55 from nitta-lab-2018/not8080 ... Merge branch 'master' into PlplupLearnedBulletSeed テストして Nana Konishi committed on 13 Nov 2018
	76152fe Browse files » modelManagerでsetInstanceIdが反映されない不具合を修正 iwatani committed on 13 Nov 2018
	aa5d4bc Browse files » scaleでオブジェクトのサイズ変更 n-konishi committed on 13 Nov 2018
	3a4647a Browse files » Merge branch 'master' into PlplupLearnedBulletSeed ... # Conflicts: # .idea/caches/build_file_checksums.ser # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OwnPlayer.java # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/PlayerFragment.java # app/src/main/res/layout/ui_fragment.xml 8080はだめです。っていう変更 a-matsumoto committed on 13 Nov 2018
2018-11-09	137ceb7 Browse files » Merge pull request #54 from nitta-lab-2018/ChangeViewpoint ... Merge branch 'master' into PlplupLearnedBulletSeed Hiromu Matsumoto committed on 9 Nov 2018
	4aeaa7d Browse files » Merge pull request #53 from nitta-lab-2018/BulletsShouldGoForward ... これは安心 Hiromu Matsumoto committed on 9 Nov 2018
	157b472 Browse files » Merge pull request #52 from nitta-lab-2018/copy ... 本当に大丈夫なのでしょうか？あき君は自信満々ですが Hiromu Matsumoto committed on 9 Nov 2018
	caeb17b Browse files » Merge pull request #51 from nitta-lab-2018/ViewpointControl ... 不安です Hiromu Matsumoto committed on 9 Nov 2018
2018-11-08	c3c1e1e Browse files » Merge branch 'master' into PlplupLearnedBulletSeed ... # Conflicts: # .idea/caches/build_file_checksums.ser # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OwnPlayer.java # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/PlayerFragment.java # app/src/main/res/layout/ui_fragment.xml 微修正 a-matsumoto committed on 8 Nov 2018
	20065ce Browse files » Merge branch 'master' into PlplupLearnedBulletSeed ... # Conflicts: # .idea/caches/build_file_checksums.ser # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OwnPlayer.java # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/PlayerFragment.java # app/src/main/res/layout/ui_fragment.xml 弾の向きの修正 a-matsumoto committed on 8 Nov 2018
	aebcec6 Browse files » Merge branch 'master' into PlplupLearnedBulletSeed ... # Conflicts: # .idea/caches/build_file_checksums.ser # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OwnPlayer.java # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/PlayerFragment.java # app/src/main/res/layout/ui_fragment.xml 岩谷氏の件 a-matsumoto committed on 8 Nov 2018
	c19a8db Browse files » Merge branch 'master' into ViewpointControl ... # Conflicts: # .idea/caches/build_file_checksums.ser # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/PlayerFragment.java ポッチャマは、すでに跳ねます。 a-matsumoto committed on 8 Nov 2018
	b638e53 Browse files » 跳ねるを覚えた！ a-matsumoto committed on 8 Nov 2018
2018-11-07	a4744ec Browse files » Merge pull request #50 from nitta-lab-2018/obj_movetest ... Obj movetest Takumi Hayashi committed on 7 Nov 2018
2018-11-06	e631aa9 Browse files » オブジェクト表示された n-konishi committed on 6 Nov 2018
2018-11-06	81b6d68 Browse files » 通信とオブジェクトの生成（まだ見えてない） n-konishi committed on 6 Nov 2018
2018-11-01	792f09f Browse files » 通信できた n-konishi committed on 1 Nov 2018
	f56a046 Browse files » 戻したver2.0 a-matsumoto committed on 1 Nov 2018
	4f6134f Browse files » Merge branch 'master' into obj_movetest ... # Conflicts: # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Instance.java n-konishi committed on 1 Nov 2018
	fccd921 Browse files » 消した n-konishi committed on 1 Nov 2018
	f710618 Browse files » 戻したver2.0 a-matsumoto committed on 1 Nov 2018