nitta-lab-2018/Cactus

Fork: 0

nitta-lab-2018 / Cactus

2018-06-26	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
	6c163ba Browse files » バグ修正 s-iwatani 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
	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