nitta-lab-2018/Cactus

Fork: 0

nitta-lab-2018 / Cactus

History for Cactus / app

2018-11-01	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	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
	6206521 Browse files » 持ってきただけ n-konishi committed on 23 Oct 2018
	72b1f39 Browse files » 通信関係 n-konishi committed on 23 Oct 2018
2018-10-18	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
	de098c8 Browse files » 名前変更 s-iwatani committed on 18 Oct 2018
	c172d85 Browse files » Bullet周りクラス大改革 s-iwatani committed on 18 Oct 2018
	c5c3bc0 Browse files » 少しミス修正 n-konishi committed on 18 Oct 2018
	2f9ea51 Browse files » オブジェクト管理 n-konishi committed on 18 Oct 2018
	9a9a385 Browse files » OwnPlayer戻し s-iwatani committed on 18 Oct 2018
	5bc1003 Browse files » PlayerFragment戻し s-iwatani committed on 18 Oct 2018
2018-10-16	8352061 Browse files » Merge remote-tracking branch 'origin/master' ... # Conflicts: # .idea/caches/build_file_checksums.ser # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/PlayerFragment.java a-matsumoto committed on 16 Oct 2018
	5e1fa6c Browse files » 弾を撃ち，弾の情報を送受信できるよう実装中 s-iwatani committed on 16 Oct 2018
	bc7b8a2 Browse files » Merge branch 'ObjectsConnection' of http://nitta-lab-www.is.konan-u.ac.jp:8080/gitbucket/git/nitta-lab-2018/Cactus into create_object n-konishi committed on 16 Oct 2018
	d336c3b Browse files » 戻した a-matsumoto committed on 16 Oct 2018
	8382c9d Browse files » Merge branches 'ObjectsConnection' and 'master' of http://nitta-lab-www.is.konan-u.ac.jp:8080/gitbucket/git/nitta-lab-2018/Cactus into ObjectsConnection ... # Conflicts: # .idea/caches/build_file_checksums.ser s-bekki committed on 16 Oct 2018
	c80b3a5 Browse files » サイコロの設置 n-konishi committed on 16 Oct 2018
	26e79b5 Browse files » Merge branch 'master' into Player ... # Conflicts: # .idea/caches/build_file_checksums.ser # app/src/main/AndroidManifest.xml # app/src/main/java/org/ntlab/radishforandroidstudio/framework/RWT/RWTUIFragment.java # build.gradle s-bekki committed on 16 Oct 2018