nitta-lab-2018/Cactus

Fork: 0

nitta-lab-2018 / Cactus

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
	b5cd4b5 Browse files » Merge branch 'master' into testM h-matsumoto committed on 26 Jun 2018
	cb79560 Browse files » こみｔｔ h-matsumoto committed on 26 Jun 2018
	505f209 Browse files » Merge pull request #20 from nitta-lab-2018/ui ... Ui Takumi Hayashi committed on 26 Jun 2018
	2fc284d Browse files » 一部の処理を移動 s-iwatani committed on 26 Jun 2018
	a1eeacc Browse files » Merge pull request #19 from nitta-lab-2018/hash_univ ... UniverseにIDで管理するものを追加 Takumi Hayashi committed on 26 Jun 2018
2018-06-22	0daa3ba Browse files » サンプルのFragmentのやつを最新版に合わせた n-konishi committed on 22 Jun 2018
2018-06-21	2e3ab5e Browse files » build.glradleの変更、削除 n-konishi committed on 21 Jun 2018
	b7403fd Browse files » 文字化け修正 n-konishi committed on 21 Jun 2018
	f291eff Browse files » UniverseにIDで管理するものを追加 Totori committed on 21 Jun 2018
	1770c45 Browse files » Merge pull request #18 from nitta-lab-2018/collidable ... 確認しました。問題ありません。ただし、動作確認はしてください。 Naoya Nitta committed on 21 Jun 2018
	34ddd4d 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 21 Jun 2018
	cddb6b0 Browse files » 余分なもの削除とインデント直し n-konishi committed on 21 Jun 2018
	0fef771 Browse files » 微変更 n-konishi committed on 21 Jun 2018
	e312bbf Browse files » 物体と人との当たり判定のFor文の変更 n-konishi committed on 21 Jun 2018
	34bbcbb Browse files » Merge pull request #17 from nitta-lab-2018/sprite ... Sprite OK KonishiNana committed on 21 Jun 2018
	7288024 Browse files » 余計なimportを削除 s-iwatani committed on 21 Jun 2018