n-konishi/Cactus-CleanArchitecture

Fork: 0

n-konishi / Cactus-CleanArchitecture

2018-07-24	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-20	4ed3a69 Browse files » Merge pull request #32 from nitta-lab-2018/キャラクターを選ぶ ... みんな頑張ろう Hiromu Matsumoto committed on 20 Jul 2018
2018-07-20	5301cd9 Browse files » Merge pull request #31 from nitta-lab-2018/松本彩樹のブランチ ... 松本彩樹のブランチ Hiromu Matsumoto committed on 20 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
	21596fe Browse files » スプラッシュ画面っぽいのできた n-konishi committed on 3 Jul 2018
	6434955 Browse files » スプラッシュ画面っぽいのはできた n-konishi committed on 3 Jul 2018
	621d52c Browse files » レイアウトで遊んでみた n-konishi committed on 3 Jul 2018
	0cc5f78 Browse files » レイアウトで遊んでみた n-konishi committed on 3 Jul 2018
	2543c04 Browse files » Merge pull request #30 from nitta-lab-2018/これはテスト絵dす ... OKです Nana Konishi committed on 3 Jul 2018
	80acdf6 Browse files » これでいいのだ a-matsumoto committed on 3 Jul 2018
	595b408 Browse files » Merge pull request #29 from nitta-lab-2018/adjustment ... Adjustment aki matsumoto committed on 3 Jul 2018
	5adcede Browse files » 戻れるようにした n-konishi committed on 3 Jul 2018
	b713c7a Browse files » AndroidManifestの調整 n-konishi committed on 3 Jul 2018
	f2b7507 Browse files » PlayerFragmentの調整 n-konishi committed on 3 Jul 2018
	706d098 Browse files » Merge pull request #28 from nitta-lab-2018/new2 ... OKです Nana Konishi committed on 3 Jul 2018
	8c8f2c6 Browse files » これでいいでしょ a-matsumoto committed on 3 Jul 2018