nitta-lab-2018/Cactus

Fork: 0

nitta-lab-2018 / Cactus

2018-07-03	9417b7b Browse files » Merge pull request #26 from nitta-lab-2018/play画面まで動かします ... 確認しました。 Nana Konishi committed on 3 Jul 2018
	64b5e3e Browse files » 2nd a-matsumoto committed on 3 Jul 2018
	d39eee2 Browse files » Merge pull request #25 from nitta-lab-2018/Playerfragment2 ... good job aki 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
	ba09fde Browse files » Merge pull request #24 from nitta-lab-2018/選ばれたインスタンスに対応するキャラクターを表示するのを頑張る人のためのブランチ ... 確認しました Nana 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
	ae6586b Browse files » Merge pull request #23 from nitta-lab-2018/インスタンスを可変で表示させたいから頑張る人のブランチ ... 2nd Hiromu Matsumoto 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
	7085b68 Browse files » PlayerFragmentの作成 ... SampleGameのやつの移行完了 n-konishi committed on 28 Jun 2018
	1f510bd Browse files » Merge pull request #22 from nitta-lab-2018/restore ... Restore Takumi Hayashi 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
	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
	daaaa80 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
	d930780 Browse files » Merge pull request #15 from nitta-lab-2018/Player ... OKです KonishiNana committed on 26 Jun 2018
	a35f33c 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 26 Jun 2018
	5b06348 Browse files » Pad　余計な部分を消去 s-bekki committed on 26 Jun 2018
	4755ba1 Browse files » Padで動くver s-bekki committed on 26 Jun 2018
	6bf147a Browse files » Merge pull request #21 from nitta-lab-2018/testM ... OK aki matsumoto committed on 26 Jun 2018