nitta-lab-2018/Cactus

Fork: 0

nitta-lab-2018 / Cactus

History for Cactus / app / src

2018-07-10	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
2018-07-10	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-03	80acdf6 Browse files » これでいいのだ a-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
	8c8f2c6 Browse files » これでいいでしょ a-matsumoto committed on 3 Jul 2018
	64b5e3e Browse files » 2nd a-matsumoto committed on 3 Jul 2018
	1da9952 Browse files » AndroiAndroid Manifest n-konishi committed on 3 Jul 2018
	8104808 Browse files » Merge branch 'master' into Playerfragment2 ... # Conflicts: # app/src/main/AndroidManifest.xml n-konishi committed on 3 Jul 2018
	79b85fe Browse files » いらないやつ削除 n-konishi committed on 3 Jul 2018
	db8b8bc Browse files » 2nd a-matsumoto committed on 3 Jul 2018
2018-06-28	fbf4d07 Browse files » 1st a-matsumoto committed on 28 Jun 2018
	6a6eda4 Browse files » 動いた n-konishi committed on 28 Jun 2018
	ff59516 Browse files » PlayActivityをFragmentで動き確認。要調整。 n-konishi committed on 28 Jun 2018
	1257d70 Browse files » 3rd a-matsumoto committed on 28 Jun 2018
	49050f2 Browse files » 2nd a-matsumoto committed on 28 Jun 2018
	7ed9826 Browse files » 作業途中 s-iwatani committed on 28 Jun 2018
	7085b68 Browse files » PlayerFragmentの作成 ... SampleGameのやつの移行完了 n-konishi committed on 28 Jun 2018
2018-06-27	3ab171f Browse files » PlayerActivityをちょっと変更 ... （FragmentManagerがActivityだとimport記述が違ったのでそれに関係するやつをMergeしたときにエラーが発生したため） n-konishi committed on 27 Jun 2018
2018-06-26	5e43032 Browse files » ここまで n-konishi committed on 26 Jun 2018
	bff973c Browse files » エラー直せた。全部動く。 n-konishi committed on 26 Jun 2018
	871aaea Browse files » ここまでFragment関係は動く ... （PlayerActivityの確認が必要） n-konishi committed on 26 Jun 2018
	2d95e2e Browse files » 修正 ... 以下エラー内容エラー: addに適切なメソッドが見つかりません(int,RWTUIFragment) メソッド FragmentTransaction.add(Fragment,String)は使用できません (引数の不一致: intをFragmentに変換できません:) メソッド FragmentTransaction.add(int,Fragment)は使用できません (引数の不一致: RWTUIFragmentをFragmentに変換できません:) n-konishi committed on 26 Jun 2018
	b13eaf2 Browse files » 修正 n-konishi committed on 26 Jun 2018
	78b428a Browse files » キャラクターの状態を取得してパースできるように実装 ... 状態はとりあえずダミーを用意 s-iwatani committed on 26 Jun 2018
	6e73165 Browse files » Merge branch 'Player' into restore ... # 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 n-konishi committed on 26 Jun 2018
	518d384 Browse files » Merge branch 'master' into collidable ... # Conflicts: # .idea/caches/build_file_checksums.ser # app/build.gradle # app/src/main/AndroidManifest.xml n-konishi committed on 26 Jun 2018
	3f187d2 Browse files » 微変更 s-iwatani committed on 26 Jun 2018
	9341cec Browse files » 微変更 s-iwatani committed on 26 Jun 2018