nitta-lab-2018/Cactus

Fork: 0

nitta-lab-2018 / Cactus

History for Cactus / app / src / main / java / org / ntlab / radishforandroidstudio / framework

2018-06-28	6a6eda4 Browse files » 動いた n-konishi committed on 28 Jun 2018
2018-06-28	ff59516 Browse files » PlayActivityをFragmentで動き確認。要調整。 n-konishi committed on 28 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
	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
	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
	2fc284d Browse files » 一部の処理を移動 s-iwatani committed on 26 Jun 2018
2018-06-21	b7403fd Browse files » 文字化け修正 n-konishi committed on 21 Jun 2018
	f291eff Browse files » UniverseにIDで管理するものを追加 Totori 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
	7288024 Browse files » 余計なimportを削除 s-iwatani committed on 21 Jun 2018
	6b363e2 Browse files » 動作ok s-iwatani committed on 21 Jun 2018
	bfbca1f Browse files » UI周りのものをfragmentへ移行 s-iwatani committed on 21 Jun 2018
	082e19f Browse files » Merge branch 'master' into sprite ... # Conflicts: # .idea/caches/build_file_checksums.ser # app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/RealTimeActivity.java # app/src/main/res/layout/activity_main.xml # build.gradle s-iwatani committed on 21 Jun 2018
2018-06-19	6b352f9 Browse files » Merge branch 'master' into changeFragment ... # Conflicts: # .idea/caches/build_file_checksums.ser # app/src/main/AndroidManifest.xml # app/src/main/res/layout/activity_main.xml # app/src/main/res/layout/activity_sample.xml 加えてちょっと変更 n-konishi committed on 19 Jun 2018
	befe3eb Browse files » 単なる微調整 n-konishi committed on 19 Jun 2018
	0a98374 Browse files » Fragment上で画面遷移できた n-konishi committed on 19 Jun 2018
	dd7e846 Browse files » コメント追加 ... 追加したリスナを削除するメソッドを実装 s-iwatani authored on 19 Jun 2018 s-iwatani committed on 19 Jun 2018
	4e35a98 Browse files » 余計な実行文を修正 s-iwatani authored on 19 Jun 2018 s-iwatani committed on 19 Jun 2018
	99912cb Browse files » Padでとりあえず動く s-bekki committed on 19 Jun 2018
2018-06-14	a1ca5fa Browse files » 前回のやつのバグ取り ... add.Listener(this)の件は解決した。実行したときにパッドの情報が取れるのは確認できた s-bekki committed on 14 Jun 2018
2018-06-14	a9db988 Browse files » ここまで n-konishi committed on 14 Jun 2018