nitta-lab-2018/Cactus

Fork: 0

nitta-lab-2018 / Cactus

2018-11-08	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
2018-11-09	caeb17b Browse files » Merge pull request #51 from nitta-lab-2018/ViewpointControl ... 不安です Hiromu Matsumoto committed on 9 Nov 2018
2018-11-08	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
2018-11-08	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
	aff663c Browse files » エラー修正 n-fujimoto committed on 1 Nov 2018
2018-10-29	36ca19c Browse files » Merge branch 'master' into bullet ... # 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 s-iwatani committed on 29 Oct 2018
2018-10-25	e5ff0c7 Browse files » 動いてる気はしてない ... ただのスペルミス修正だけ n-konishi committed on 25 Oct 2018
	13e78fd Browse files » リソースの修正 n-konishi committed on 25 Oct 2018
	9543931 Browse files » とりあえずここまで n-konishi committed on 25 Oct 2018
	c3b93de Browse files » 通信の大まかの記述 n-konishi committed on 25 Oct 2018
2018-10-23	96ae6cf Browse files » Merge pull request #49 from nitta-lab-2018/object ... Object Takumi Hayashi committed on 23 Oct 2018
	f0d8f24 Browse files » ObjectModelManagerの記述 n-konishi committed on 23 Oct 2018
	5f441e5 Browse files » ObjectModelManagerの記述 n-konishi committed on 23 Oct 2018
	02b175e Browse files » 型宣言の修正 n-konishi committed on 23 Oct 2018
	33f8a15 Browse files » 戻したver2.0 a-matsumoto committed on 23 Oct 2018
	9c921de Browse files » Merge branch 'master' into object n-konishi committed on 23 Oct 2018
	6206521 Browse files » 持ってきただけ n-konishi committed on 23 Oct 2018
	72b1f39 Browse files » 通信関係 n-konishi committed on 23 Oct 2018
2018-10-19	f4c9e38 Browse files » Merge pull request #48 from nitta-lab-2018/createobject ... ok Souki Iwatani committed on 19 Oct 2018
2018-10-18	1ab54d9 Browse files » Merge pull request #47 from nitta-lab-2018/PlayerFragmentFix ... PlayerFragmentFix aki matsumoto committed on 18 Oct 2018
	0ec40b5 Browse files » ObjectId n-konishi committed on 18 Oct 2018
	73bf2f2 Browse files » Merge branch 'master' into bullet ... # 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 s-iwatani committed on 18 Oct 2018