nitta-lab-2018/Cactus

Fork: 0

nitta-lab-2018 / Cactus

History for Cactus / app / src / main / res / layout

2018-11-08	aebcec6 Browse files » Merge branch 'master' into PlplupLearnedBulletSeed ... # Conflicts: # .idea/caches/build_file_checksums.ser # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OwnPlayer.java # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/PlayerFragment.java # app/src/main/res/layout/ui_fragment.xml 岩谷氏の件 a-matsumoto committed on 8 Nov 2018
2018-11-08	b638e53 Browse files » 跳ねるを覚えた！ a-matsumoto committed on 8 Nov 2018
2018-11-01	f710618 Browse files » 戻したver2.0 a-matsumoto committed on 1 Nov 2018
2018-10-23	33f8a15 Browse files » 戻したver2.0 a-matsumoto committed on 23 Oct 2018
2018-10-18	73bf2f2 Browse files » Merge branch 'master' into bullet ... # Conflicts: # .idea/caches/build_file_checksums.ser # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OwnPlayer.java # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/PlayerFragment.java # app/src/main/res/layout/ui_fragment.xml s-iwatani committed on 18 Oct 2018
2018-10-18	c172d85 Browse files » Bullet周りクラス大改革 s-iwatani committed on 18 Oct 2018
2018-10-11	a393d3f Browse files » jumpできるようにしました a-matsumoto committed on 11 Oct 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
	6434955 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
	db8b8bc Browse files » 2nd a-matsumoto committed on 3 Jul 2018
2018-06-28	1257d70 Browse files » 3rd a-matsumoto committed on 28 Jun 2018
	49050f2 Browse files » 2nd a-matsumoto committed on 28 Jun 2018
	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
	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
	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
2018-06-21	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	40e55d0 Browse files » SampleGameActivityのFragment版作成 ... タッチイベントも動いた。全部動いた。 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
	4e35a98 Browse files » 余計な実行文を修正 s-iwatani authored on 19 Jun 2018 s-iwatani committed on 19 Jun 2018
2018-06-14	a1ca5fa Browse files » 前回のやつのバグ取り ... add.Listener(this)の件は解決した。実行したときにパッドの情報が取れるのは確認できた s-bekki committed on 14 Jun 2018
	9b75577 Browse files » 戻れるようにした a-matsumoto committed on 14 Jun 2018
	a6a9682 Browse files » instances画面への遷移 h-matsumoto committed on 14 Jun 2018
	47f2f46 Browse files » インタンスのフラグメント作って見たけど動かんぜよ a-matsumoto committed on 14 Jun 2018
	ae3b3b3 Browse files » Merge remote-tracking branch 'origin/master' ... # Conflicts: # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java a-matsumoto committed on 14 Jun 2018
	e84ee9c Browse files » Merge branch 'master' of /Users/matsumotoayaju/AndroidStudioProjects/Cactus２ with conflicts. a-matsumoto committed on 14 Jun 2018
	3d996da Browse files » 通信できた ... あと、ID入力欄をデファルトで文字を設定から、 hint文に変更してます a-matsumoto 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	ca26ebb Browse files » 簡単なpadを作成 s-iwatani authored on 11 Jun 2018 s-iwatani committed on 11 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-08	1814b8e Browse files » ログイン画面です a-matsumoto committed on 8 Jun 2018
2018-06-07	d142a3b Browse files » ListenerとSubjectの実装 ... ボタンをちゃんとタッチできるよう対応 s-iwatani authored on 7 Jun 2018 s-iwatani committed on 7 Jun 2018
	73630c0 Browse files » button上下左右に増やしてみた n-konishi committed on 7 Jun 2018
	6fe5b1f Browse files » ボタン配置移動 n-konishi committed on 7 Jun 2018
2018-06-05	4bd23a9 Browse files » test s-iwatani committed on 5 Jun 2018
2018-06-05	cff5188 Browse files » sighupフラグメント2 a-matsumoto committed on 5 Jun 2018
2018-05-31	e43f035 Browse files » text追加とLayout追加 n-konishi committed on 31 May 2018
	654d534 Browse files » sighupフラグメント2 a-matsumoto committed on 31 May 2018
	8e3031c Browse files » Sampleにボタン配置できた n-konishi committed on 31 May 2018
	cef04b2 Browse files » ボタンの表示はok ... イベントは発生しない状態 s-iwatani authored on 31 May 2018 s-iwatani committed on 31 May 2018
	0049723 Browse files » sighupフラグメント2 a-matsumoto committed on 31 May 2018
	3faa790 Browse files » sighupフラグメント2 a-matsumoto committed on 31 May 2018
2018-05-29	a3b8cd2 Browse files » sighupフラグメント2 a-matsumoto committed on 29 May 2018
2018-05-29	dd77fab Browse files » sighupフラグメント a-matsumoto committed on 29 May 2018
2018-05-24	a90ecf5 Browse files » あえdふぁkj a-matsumoto committed on 24 May 2018
2018-05-22	2c1e929 Browse files » あえdふぁkj a-matsumoto committed on 22 May 2018
2018-05-18	3116f7d Browse files » Fragment動作確認用 n-konishi committed on 18 May 2018
2018-05-18	3e8ad22 Browse files » とりあえずFragment動いたけど変な感じ n-konishi committed on 18 May 2018
2018-05-17	3ded0ea Browse files » 簡易Fragment画面遷移の作成(修正版) n-konishi committed on 17 May 2018
	eebd377 Browse files » 簡易Fragment画面遷移の作成 n-konishi committed on 17 May 2018
	66363fa Browse files » Fragmentの追加 n-konishi committed on 17 May 2018
	9725bcc Browse files » SampleActivityの追加 n-konishi committed on 17 May 2018
	872e06d Browse files » 設計変更 s-iwatani committed on 17 May 2018
2018-05-15	face947 Browse files » MainActivityのTextView追加 n-konishi committed on 15 May 2018
2018-05-15	6aeedee Browse files » MainActivityの作成 n-konishi committed on 15 May 2018