nitta-lab-2018/Cactus

Fork: 0

nitta-lab-2018 / Cactus

History for Cactus / app / src / main / AndroidManifest.xml

2018-07-03	a8a9bd3 Browse files » kaegfakuro 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
	db8b8bc Browse files » 2nd a-matsumoto committed on 3 Jul 2018
2018-06-28	7085b68 Browse files » PlayerFragmentの作成 ... SampleGameのやつの移行完了 n-konishi committed on 28 Jun 2018
2018-06-26	bff973c Browse files » エラー直せた。全部動く。 n-konishi committed on 26 Jun 2018
	871aaea Browse files » ここまでFragment関係は動く ... （PlayerActivityの確認が必要） 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
	cb79560 Browse files » こみｔｔ h-matsumoto committed on 26 Jun 2018
2018-06-21	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
	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-20	bcf2692 Browse files » いらないもの消した n-konishi committed on 20 Jun 2018
2018-06-19	14dd9a5 Browse files » コミット忘れ n-konishi committed on 19 Jun 2018
	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
2018-06-14	a1ca5fa Browse files » 前回のやつのバグ取り ... add.Listener(this)の件は解決した。実行したときにパッドの情報が取れるのは確認できた s-bekki committed on 14 Jun 2018
2018-06-12	740caf7 Browse files » Merge branch 'master' into ログインの通信 ... # Conflicts: # app/build.gradle まーじしました a-matsumoto committed on 12 Jun 2018
2018-06-12	a50f80d Browse files » ログイン画面です a-matsumoto committed on 12 Jun 2018
2018-06-11	b1fec05 Browse files » 実行確認 n-konishi committed on 11 Jun 2018
2018-06-08	b206678 Browse files » 動作確認だけ ... SampleActiviyのaddcontentの重ね表示用のブランチボタン配置してるけどprint文の生成しかしてくれないただのボタン動作確認 n-konishi committed on 8 Jun 2018
2018-06-08	d20d9cb Browse files » Merge branch 'master' into addcontent ... # Conflicts: # app/src/main/AndroidManifest.xml n-konishi committed on 8 Jun 2018
2018-06-05	5ecc47e Browse files » Merge branch 'master' into net ... # Conflicts: # .idea/caches/build_file_checksums.ser # app/src/main/AndroidManifest.xml n-konishi committed on 5 Jun 2018
2018-05-31	8e3031c Browse files » Sampleにボタン配置できた n-konishi committed on 31 May 2018
	26e1c34 Browse files » 直し2 n-konishi committed on 31 May 2018
	805e9f6 Browse files » 直し n-konishi committed on 31 May 2018
2018-05-29	a3b8cd2 Browse files » sighupフラグメント2 a-matsumoto committed on 29 May 2018
2018-05-24	45dc120 Browse files » Accountの作業 n-konishi committed on 24 May 2018
2018-05-22	2c1e929 Browse files » あえdふぁkj a-matsumoto committed on 22 May 2018