nitta-lab-2018/Cactus

Fork: 0

nitta-lab-2018 / Cactus

History for Cactus / app / src / main

2018-08-02	d374bad Browse files » Merge remote-tracking branch 'origin/master' s-iwatani committed on 2 Aug 2018
2018-07-31	54bd892 Browse files » 小文字修正instanceId n-konishi committed on 31 Jul 2018
	cff98c7 Browse files » s[s.length-1]に修正 n-konishi committed on 31 Jul 2018
	e8c65ef Browse files » URLのinstanceのスペルミス修正 n-konishi committed on 31 Jul 2018
	decee15 Browse files » Merge branch 'master' into 2018年7月24日AkiMatsumoto ... # Conflicts: # .idea/caches/build_file_checksums.ser # app/src/main/AndroidManifest.xml # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/CharactersFragment.java # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/InstancesFragment.java # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/LoginFragment.java # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java n-konishi committed on 31 Jul 2018
	75c1801 Browse files » テストコード消去 s-iwatani committed on 31 Jul 2018
	f693c4d Browse files » Merge remote-tracking branch 'origin/2018年7月24日AkiMatsumoto' into 2018年7月24日AkiMatsumoto a-matsumoto committed on 31 Jul 2018
	1109666 Browse files » ここまで a-matsumoto committed on 31 Jul 2018
	68718dc Browse files » Andridmanifestのいらないやつ削除 n-konishi committed on 31 Jul 2018
2018-07-26	b7e44ea Browse files » みんな頑張ろう a-matsumoto committed on 26 Jul 2018
2018-07-24	1ccb9b6 Browse files » みんな頑張ろう a-matsumoto committed on 24 Jul 2018
	6f76366 Browse files » id統一 n-konishi committed on 24 Jul 2018
	0681300 Browse files » インデント整理 n-konishi committed on 24 Jul 2018
	e6cbd9b Browse files » 座標等の取得から外れたキャラクターを消す処理を実装 s-iwatani committed on 24 Jul 2018
	75191e2 Browse files » Merge branch 'master' into splash ... # Conflicts: # .idea/caches/build_file_checksums.ser # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/CharactersFragment.java # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/InstancesFragment.java # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/LoginFragment.java # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java n-konishi committed on 24 Jul 2018
	d5ff067 Browse files » みんな頑張ろう a-matsumoto committed on 24 Jul 2018
	a3a8951 Browse files » テストコードで． s-iwatani authored on 24 Jul 2018 s-iwatani committed on 24 Jul 2018
2018-07-19	fc4a347 Browse files » みんな頑張ろう a-matsumoto committed on 19 Jul 2018
	4b5b013 Browse files » ほい a-matsumoto committed on 19 Jul 2018
	1b0e84d Browse files » ほい a-matsumoto committed on 19 Jul 2018
	1c5b508 Browse files » コード整理 n-konishi committed on 19 Jul 2018
2018-07-10	1761cb7 Browse files » 文字重なりしないようにした n-konishi committed on 10 Jul 2018
	e36e782 Browse files » 途中 s-iwatani committed on 10 Jul 2018
	f1e2fa7 Browse files » Merge branch 'master' into model ... # Conflicts: # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OtherPlayerCharactersModel.java s-iwatani committed on 10 Jul 2018
	c064a26 Browse files » Merge branch 'master' of http://nitta-lab-www2.is.konan-u.ac.jp:8080/gitbucket/git/nitta-lab-2018/Cactus s-iwatani committed on 10 Jul 2018
2018-07-09	bbee035 Browse files » ちょっと誤字修正 n-konishi committed on 9 Jul 2018
2018-07-09	928293f Browse files » レイアウトの変更 n-konishi committed on 9 Jul 2018
2018-07-03	6685128 Browse files » レイアウト遊び n-konishi committed on 3 Jul 2018
	665a3db Browse files » color.xmlのテンプレ追加＋色変更 n-konishi committed on 3 Jul 2018
	4f0c976 Browse files » 5秒に変更 n-konishi committed on 3 Jul 2018