nitta-lab-2018/Cactus

Fork: 0

nitta-lab-2018 / Cactus

2018-06-21	07e107c Browse files » Merge branch 'master' into model s-iwatani 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
	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
	3ace58f Browse files » Merge pull request #16 from nitta-lab-2018/changeFragment ... OK Hiromu Matsumoto committed on 21 Jun 2018
2018-06-20	bcf2692 Browse files » いらないもの消した n-konishi committed on 20 Jun 2018
2018-06-19	40e55d0 Browse files » SampleGameActivityのFragment版作成 ... タッチイベントも動いた。全部動いた。 n-konishi committed on 19 Jun 2018
	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
	e990cdf Browse files » モデル管理を追加(途中) s-iwatani committed on 19 Jun 2018
	ccb93b3 Browse files » モデル管理を追加(途中) s-iwatani authored on 19 Jun 2018 s-iwatani 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
2018-06-14	b11e7ae Browse files » Merge pull request #14 from nitta-lab-2018/バグ修正 ... 戻れるようにした aki matsumoto committed on 14 Jun 2018
	9b75577 Browse files » 戻れるようにした a-matsumoto committed on 14 Jun 2018
	c6a1f4b Browse files » Merge pull request #13 from nitta-lab-2018/戻れるようにする ... 戻れるようにする aki matsumoto committed on 14 Jun 2018
	1aeeaf6 Browse files » 戻れるようにした a-matsumoto committed on 14 Jun 2018
	1595fdc Browse files » 戻れるようにした a-matsumoto committed on 14 Jun 2018
	ae6a901 Browse files » Merge pull request #12 from nitta-lab-2018/Test ... instances画面、characters画面への遷移、移動 aki matsumoto committed on 14 Jun 2018
	a6a9682 Browse files » instances画面への遷移 h-matsumoto committed on 14 Jun 2018
	9397911 Browse files » Merge pull request #11 from nitta-lab-2018/ユーザーのデータを保存する ... ユーザーのデータを保存するyo Hiromu Matsumoto committed on 14 Jun 2018
	461ab6a Browse files » 動いたっぽいぜよ a-matsumoto committed on 14 Jun 2018
	f89baa8 Browse files » 動いたっぽいぜよ a-matsumoto committed on 14 Jun 2018
	8a9855d Browse files » 動いたっぽいぜよ a-matsumoto committed on 14 Jun 2018
	f2d0e44 Browse files » Merge pull request #10 from nitta-lab-2018/test2 ... Test2 aki matsumoto committed on 14 Jun 2018
	d1cd115 Browse files » instances画面への遷移 h-matsumoto committed on 14 Jun 2018