nitta-lab-2018/Cactus

Fork: 0

nitta-lab-2018 / Cactus

History for Cactus / app / src / main / res

2018-10-11	d21c6a3 Browse files » 背景色消した n-konishi committed on 11 Oct 2018
	3579974 Browse files » Merge branch 'master' into all-layout ... # Conflicts: # app/build.gradle n-konishi committed on 11 Oct 2018
	a393d3f Browse files » jumpできるようにしました a-matsumoto committed on 11 Oct 2018
2018-07-26	571e3e8 Browse files » 位置調整 n-konishi committed on 26 Jul 2018
	10fec22 Browse files » Cactusのタイトル画像 n-konishi committed on 26 Jul 2018
	7fcd54b Browse files » layout背景変更（@color/wheat） n-konishi committed on 26 Jul 2018
2018-07-24	6f76366 Browse files » id統一 n-konishi committed on 24 Jul 2018
2018-07-24	75191e2 Browse files » Merge branch 'master' into splash ... # Conflicts: # .idea/caches/build_file_checksums.ser # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/CharactersFragment.java # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/InstancesFragment.java # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/LoginFragment.java # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java n-konishi committed on 24 Jul 2018
2018-07-19	fc4a347 Browse files » みんな頑張ろう a-matsumoto committed on 19 Jul 2018
2018-07-09	bbee035 Browse files » ちょっと誤字修正 n-konishi committed on 9 Jul 2018
2018-07-09	928293f Browse files » レイアウトの変更 n-konishi committed on 9 Jul 2018
2018-07-03	6685128 Browse files » レイアウト遊び n-konishi committed on 3 Jul 2018
	665a3db Browse files » color.xmlのテンプレ追加＋色変更 n-konishi committed on 3 Jul 2018
	21596fe Browse files » スプラッシュ画面っぽいのできた n-konishi committed on 3 Jul 2018
	6434955 Browse files » スプラッシュ画面っぽいのはできた n-konishi committed on 3 Jul 2018
	621d52c Browse files » レイアウトで遊んでみた n-konishi committed on 3 Jul 2018
	0cc5f78 Browse files » レイアウトで遊んでみた n-konishi committed on 3 Jul 2018
	80acdf6 Browse files » これでいいのだ a-matsumoto committed on 3 Jul 2018
	8c8f2c6 Browse files » これでいいでしょ a-matsumoto 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
	ba09fde Browse files » Merge pull request #24 from nitta-lab-2018/選ばれたインスタンスに対応するキャラクターを表示するのを頑張る人のためのブランチ ... 確認しました Nana Konishi committed on 3 Jul 2018
2018-06-28	7085b68 Browse files » PlayerFragmentの作成 ... SampleGameのやつの移行完了 n-konishi committed on 28 Jun 2018
2018-06-26	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
	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
	cb79560 Browse files » こみｔｔ h-matsumoto committed on 26 Jun 2018
2018-06-22	0daa3ba Browse files » サンプルのFragmentのやつを最新版に合わせた n-konishi committed on 22 Jun 2018
2018-06-21	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-19	4e35a98 Browse files » 余計な実行文を修正 s-iwatani authored on 19 Jun 2018 s-iwatani committed on 19 Jun 2018