nitta-lab-2018/Cactus

Fork: 0

nitta-lab-2018 / Cactus

History for Cactus / app / src

2018-07-03	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
	5adcede Browse files » 戻れるようにした n-konishi committed on 3 Jul 2018
	b713c7a Browse files » AndroidManifestの調整 n-konishi committed on 3 Jul 2018
	f2b7507 Browse files » PlayerFragmentの調整 n-konishi committed on 3 Jul 2018
	8c8f2c6 Browse files » これでいいでしょ a-matsumoto committed on 3 Jul 2018
	64b5e3e Browse files » 2nd 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
	79b85fe Browse files » いらないやつ削除 n-konishi committed on 3 Jul 2018
	db8b8bc Browse files » 2nd a-matsumoto committed on 3 Jul 2018
2018-06-28	fbf4d07 Browse files » 1st a-matsumoto committed on 28 Jun 2018
	6a6eda4 Browse files » 動いた n-konishi committed on 28 Jun 2018
	ff59516 Browse files » PlayActivityをFragmentで動き確認。要調整。 n-konishi committed on 28 Jun 2018
	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-27	3ab171f Browse files » PlayerActivityをちょっと変更 ... （FragmentManagerがActivityだとimport記述が違ったのでそれに関係するやつをMergeしたときにエラーが発生したため） n-konishi committed on 27 Jun 2018
2018-06-26	5e43032 Browse files » ここまで n-konishi committed on 26 Jun 2018
	bff973c Browse files » エラー直せた。全部動く。 n-konishi committed on 26 Jun 2018
	871aaea Browse files » ここまでFragment関係は動く ... （PlayerActivityの確認が必要） n-konishi committed on 26 Jun 2018
	2d95e2e Browse files » 修正 ... 以下エラー内容エラー: addに適切なメソッドが見つかりません(int,RWTUIFragment) メソッド FragmentTransaction.add(Fragment,String)は使用できません (引数の不一致: intをFragmentに変換できません:) メソッド FragmentTransaction.add(int,Fragment)は使用できません (引数の不一致: RWTUIFragmentをFragmentに変換できません:) n-konishi committed on 26 Jun 2018
	b13eaf2 Browse files » 修正 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
	518d384 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
	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
	5b06348 Browse files » Pad　余計な部分を消去 s-bekki committed on 26 Jun 2018
	4755ba1 Browse files » Padで動くver s-bekki committed on 26 Jun 2018
	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
	2fc284d 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	b7403fd Browse files » 文字化け修正 n-konishi committed on 21 Jun 2018
	f291eff Browse files » UniverseにIDで管理するものを追加 Totori 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
	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
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
	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
	99912cb Browse files » Padでとりあえず動く s-bekki 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
	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
	a6a9682 Browse files » instances画面への遷移 h-matsumoto committed on 14 Jun 2018
	422f2e4 Browse files » とりあえず独立した状態になった ... velocityをパッドの情報から取得したものにしなければならない add.Listener(this)に関してはなぜエラーが出るのかはわからない s-bekki 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
	a9db988 Browse files » ここまで n-konishi committed on 14 Jun 2018
	d1cd115 Browse files » instances画面への遷移 h-matsumoto committed on 14 Jun 2018
	236036e Browse files » for文を拡張for文に変更 n-konishi committed on 14 Jun 2018
	d960f84 Browse files » 動いたっぽいぜよ a-matsumoto committed on 14 Jun 2018
	47f2f46 Browse files » インタンスのフラグメント作って見たけど動かんぜよ a-matsumoto committed on 14 Jun 2018
	551cc81 Browse files » インタンスのフラグメント作って見たけど動かんぜよ a-matsumoto committed on 14 Jun 2018
	335c564 Browse files » 通信できた ... あと、ID入力欄をデファルトで文字を設定から、 hint文に変更してます 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
	f20c073 Browse files » subjectを少し修正 s-iwatani committed on 14 Jun 2018
	3d996da Browse files » 通信できた ... あと、ID入力欄をデファルトで文字を設定から、 hint文に変更してます a-matsumoto committed on 14 Jun 2018
	147c364 Browse files » 第一段階としてとりあえずコミット ... カメラの処理を考えたが動かない touchX等に関して少し考え直さなければいけない気がする s-bekki committed on 14 Jun 2018
2018-06-12	ba77642 Browse files » 物体と人の判定 n-konishi committed on 12 Jun 2018
	5191503 Browse files » ArrayListListのfor文の追加 n-konishi committed on 12 Jun 2018
	6df0d04 Browse files » Merge branch 'master' into ログインの通信 ... # Conflicts: # app/build.gradle まーじしました a-matsumoto committed on 12 Jun 2018
	d58d53b Browse files » Merge branch 'master' into ログインの通信 ... # Conflicts: # app/build.gradle まーじしました a-matsumoto committed on 12 Jun 2018
	740caf7 Browse files » Merge branch 'master' into ログインの通信 ... # Conflicts: # app/build.gradle まーじしました a-matsumoto committed on 12 Jun 2018
	f43355b Browse files » ログイン画面です a-matsumoto committed on 12 Jun 2018
	c39e695 Browse files » ログイン画面です a-matsumoto committed on 12 Jun 2018
	a7a0281 Browse files » ここまで n-konishi committed on 12 Jun 2018
	a50f80d Browse files » ログイン画面です a-matsumoto committed on 12 Jun 2018
	3353ad9 Browse files » todo追加 Souki Iwatani committed on 12 Jun 2018
	eb31169 Browse files » コメント修正 Souki Iwatani committed on 12 Jun 2018
	b0688d1 Browse files » コメント追加 Souki Iwatani committed on 12 Jun 2018
	e440cc1 Browse files » 関数名を修正 Totori committed on 12 Jun 2018
2018-06-11	8deafab Browse files » 処理のメモ n-konishi committed on 11 Jun 2018
	80b2477 Browse files » リストに変更 n-konishi committed on 11 Jun 2018
	b1fec05 Browse files » 実行確認 n-konishi committed on 11 Jun 2018
	ca26ebb Browse files » 簡単なpadを作成 s-iwatani authored on 11 Jun 2018 s-iwatani committed on 11 Jun 2018
	7416605 Browse files » interfaceのメソッド追加 n-konishi committed on 11 Jun 2018
2018-06-08	bd20a01 Browse files » Collidableの作成 n-konishi committed on 8 Jun 2018
	b206678 Browse files » 動作確認だけ ... SampleActiviyのaddcontentの重ね表示用のブランチボタン配置してるけどprint文の生成しかしてくれないただのボタン動作確認 n-konishi committed on 8 Jun 2018
	d20d9cb Browse files » Merge branch 'master' into addcontent ... # Conflicts: # app/src/main/AndroidManifest.xml n-konishi committed on 8 Jun 2018
	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
	e1e6f7d Browse files » ログイン画面です a-matsumoto committed on 7 Jun 2018
	935e0c6 Browse files » ログイン画面です a-matsumoto committed on 7 Jun 2018
	de15d59 Browse files » ログイン画面です a-matsumoto committed on 7 Jun 2018
	2f9f44c Browse files » ログイン画面です a-matsumoto committed on 7 Jun 2018
	04df45c Browse files » おｋ h-matsumoto committed on 7 Jun 2018
	aa47345 Browse files » ログイン画面です a-matsumoto committed on 7 Jun 2018
	73630c0 Browse files » button上下左右に増やしてみた n-konishi committed on 7 Jun 2018
	6237d13 Browse files » ボタンクリックでprintln文の表示は出来た n-konishi committed on 7 Jun 2018
	c772992 Browse files » ログイン画面です a-matsumoto committed on 7 Jun 2018
	6fe5b1f Browse files » ボタン配置移動 n-konishi committed on 7 Jun 2018
	6a51f80 Browse files » Merge pull request #5 from nitta-lab-2018/ConnectionLoginFragment ... OK Hiromu Matsumoto committed on 7 Jun 2018
	7dc6533 Browse files » ログイン画面です a-matsumoto committed on 7 Jun 2018
2018-06-05	4bd23a9 Browse files » test s-iwatani committed on 5 Jun 2018
	da3fc51 Browse files » sighupフラグメント2 a-matsumoto committed on 5 Jun 2018
	8639b34 Browse files » sighupフラグメント2 a-matsumoto committed on 5 Jun 2018
	cff5188 Browse files » sighupフラグメント2 a-matsumoto committed on 5 Jun 2018
	d60de7d Browse files » コメント追加 n-konishi committed on 5 Jun 2018
	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	7a5443d Browse files » sighupフラグメント2 a-matsumoto committed on 31 May 2018
	e43f035 Browse files » text追加とLayout追加 n-konishi committed on 31 May 2018
	654d534 Browse files » sighupフラグメント2 a-matsumoto committed on 31 May 2018
	11f72f5 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
	26e1c34 Browse files » 直し2 n-konishi committed on 31 May 2018
	805e9f6 Browse files » 直し n-konishi committed on 31 May 2018
	985867f Browse files » sighupフラグメント2 a-matsumoto 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-30	49707fc Browse files » いらないもの削除 n-konishi committed on 30 May 2018
2018-05-29	a3b8cd2 Browse files » sighupフラグメント2 a-matsumoto committed on 29 May 2018
	cf548f5 Browse files » sighupフラグメント a-matsumoto committed on 29 May 2018
	dd77fab Browse files » sighupフラグメント a-matsumoto committed on 29 May 2018
2018-05-24	13b9ee5 Browse files » MyAccountのgetsetの設定 ... Accountにimportエラー有り n-konishi committed on 24 May 2018
	47f83a6 Browse files » とりあえずここまで n-konishi committed on 24 May 2018
	0693df5 Browse files » getsetの追加 n-konishi committed on 24 May 2018
	a90ecf5 Browse files » あえdふぁkj a-matsumoto committed on 24 May 2018
	45dc120 Browse files » Accountの作業 n-konishi committed on 24 May 2018
2018-05-23	4d2c8d0 Browse files » Cuctusクラスの作成 n-konishi committed on 23 May 2018
2018-05-22	082a494 Browse files » レイヤーの優先順位の説明と挙動が食い違っていたのを修正 s-iwatani committed on 22 May 2018
	2c1e929 Browse files » あえdふぁkj a-matsumoto committed on 22 May 2018
	7729b96 Browse files » プログラム微修正 s-iwatani committed on 22 May 2018
	0ec58f8 Browse files » レイヤーに対応 s-iwatani 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
	6b36962 Browse files » .gitignore is now working s-iwatani committed on 17 May 2018
2018-05-15	63f5e2d Browse files » File branchの作業完了 ... Merge後にCactusClient → Cactusへ移動作業開始OK n-konishi committed on 15 May 2018
	face947 Browse files » MainActivityのTextView追加 n-konishi committed on 15 May 2018
	6aeedee Browse files » MainActivityの作成 n-konishi committed on 15 May 2018
	85cd2b5 Browse files » fileの追加 n-konishi committed on 15 May 2018
2018-05-14	6b03f47 Browse files » first commit n-konishi committed on 14 May 2018