| 2018-08-02 |
Merge remote-tracking branch 'origin/master'
s-iwatani
committed
on 2 Aug 2018
|
|---|---|
| 2018-08-01 |
Merge pull request #34 from nitta-lab-2018/2018年7月24日AkiMatsumoto
...
Souki Iwatani
committed
on 1 Aug 2018
|
| 2018-07-31 | |
|
Merge remote-tracking branch 'origin/2018年7月24日AkiMatsumoto' into 2018年7月24日AkiMatsumoto
a-matsumoto
committed
on 31 Jul 2018
|
|
|
ここまで
a-matsumoto
committed
on 31 Jul 2018
|
|
|
Andridmanifestのいらないやつ削除
n-konishi
committed
on 31 Jul 2018
|
|
| 2018-07-26 |
みんな頑張ろう
a-matsumoto
committed
on 26 Jul 2018
|
| 2018-07-24 |
|
|
みんな頑張ろう
a-matsumoto
committed
on 24 Jul 2018
|
|
|
id統一
n-konishi
committed
on 24 Jul 2018
|
|
|
インデント整理
n-konishi
committed
on 24 Jul 2018
|
|
|
みんな頑張ろう
a-matsumoto
committed
on 24 Jul 2018
|
|
| 2018-07-20 |
|
|
|
|
| 2018-07-19 |
みんな頑張ろう
a-matsumoto
committed
on 19 Jul 2018
|
|
ほい
a-matsumoto
committed
on 19 Jul 2018
|
|
|
ほい
a-matsumoto
committed
on 19 Jul 2018
|
|
|
コード整理
n-konishi
committed
on 19 Jul 2018
|
|
| 2018-07-10 |
文字重なりしないようにした
n-konishi
committed
on 10 Jul 2018
|
|
Merge branch 'master' of http://nitta-lab-www2.is.konan-u.ac.jp:8080/gitbucket/git/nitta-lab-2018/Cactus
s-iwatani
committed
on 10 Jul 2018
|
|
| 2018-07-09 |
ちょっと誤字修正
n-konishi
committed
on 9 Jul 2018
|
|
レイアウトの変更
n-konishi
committed
on 9 Jul 2018
|
|
| 2018-07-03 |
レイアウト遊び
n-konishi
committed
on 3 Jul 2018
|
|
color.xmlのテンプレ追加+色変更
n-konishi
committed
on 3 Jul 2018
|
|
|
5秒に変更
n-konishi
committed
on 3 Jul 2018
|
|
|
スプラッシュ画面っぽいのできた
n-konishi
committed
on 3 Jul 2018
|
|
|
スプラッシュ画面っぽいのはできた
n-konishi
committed
on 3 Jul 2018
|
|
|
レイアウトで遊んでみた
n-konishi
committed
on 3 Jul 2018
|
|
|
レイアウトで遊んでみた
n-konishi
committed
on 3 Jul 2018
|
|
|
|
|
|
これでいいのだ
a-matsumoto
committed
on 3 Jul 2018
|
|
|
|
|
|
戻れるようにした
n-konishi
committed
on 3 Jul 2018
|
|
|
AndroidManifestの調整
n-konishi
committed
on 3 Jul 2018
|
|
|
PlayerFragmentの調整
n-konishi
committed
on 3 Jul 2018
|
|
|
|
|
|
これでいいでしょ
a-matsumoto
committed
on 3 Jul 2018
|
|
|
|
|
|
2nd
a-matsumoto
committed
on 3 Jul 2018
|
|
|
Merge pull request #25 from nitta-lab-2018/Playerfragment2
...
aki matsumoto
committed
on 3 Jul 2018
|
|
|
AndroiAndroid Manifest
n-konishi
committed
on 3 Jul 2018
|
|
|
いらないやつ削除
n-konishi
committed
on 3 Jul 2018
|
|
|
Merge pull request #24 from nitta-lab-2018/選ばれたインスタンスに対応するキャラクターを表示するのを頑張る人のためのブランチ
...
Nana Konishi
committed
on 3 Jul 2018
|
|
|
2nd
a-matsumoto
committed
on 3 Jul 2018
|
|
| 2018-06-28 |
1st
a-matsumoto
committed
on 28 Jun 2018
|
|
動いた
n-konishi
committed
on 28 Jun 2018
|
|
|
PlayActivityをFragmentで動き確認。要調整。
n-konishi
committed
on 28 Jun 2018
|
|
|
Merge pull request #23 from nitta-lab-2018/インスタンスを可変で表示させたいから頑張る人のブランチ
...
Hiromu Matsumoto
committed
on 28 Jun 2018
|
|
|
3rd
a-matsumoto
committed
on 28 Jun 2018
|
|
|
2nd
a-matsumoto
committed
on 28 Jun 2018
|
|
|
|
|
| 2018-06-27 | |
| 2018-06-26 |
ここまで
n-konishi
committed
on 26 Jun 2018
|
|
エラー直せた。全部動く。
n-konishi
committed
on 26 Jun 2018
|
|
|
修正
n-konishi
committed
on 26 Jun 2018
|
|
|
微変更
s-iwatani
committed
on 26 Jun 2018
|
|
|
微変更
s-iwatani
committed
on 26 Jun 2018
|
|
|
接続を実装
s-iwatani
committed
on 26 Jun 2018
|
|
|
バグ修正
s-iwatani
committed
on 26 Jun 2018
|
|
|
モデル管理を追加(途中)
s-iwatani
committed
on 26 Jun 2018
|
|
|
|
|
|
Pad 余計な部分を消去
s-bekki
committed
on 26 Jun 2018
|
|
|
Padで動くver
s-bekki
committed
on 26 Jun 2018
|
|
|
|
|
|
Merge branch 'master' into testM
h-matsumoto
committed
on 26 Jun 2018
|
|
|
こみtt
h-matsumoto
committed
on 26 Jun 2018
|
|
|
|
|
|
一部の処理を移動
s-iwatani
committed
on 26 Jun 2018
|
|
|
|
|
| 2018-06-22 |
サンプルのFragmentのやつを最新版に合わせた
n-konishi
committed
on 22 Jun 2018
|
| 2018-06-21 |
build.glradleの変更、削除
n-konishi
committed
on 21 Jun 2018
|
|
文字化け修正
n-konishi
committed
on 21 Jun 2018
|
|
|
UniverseにIDで管理するものを追加
Totori
committed
on 21 Jun 2018
|
|
|
|
|
|
余分なもの削除とインデント直し
n-konishi
committed
on 21 Jun 2018
|
|
|
微変更
n-konishi
committed
on 21 Jun 2018
|
|
|
物体と人との当たり判定のFor文の変更
n-konishi
committed
on 21 Jun 2018
|
|
|
|
|
|
余計なimportを削除
s-iwatani
committed
on 21 Jun 2018
|
|
|
動作ok
s-iwatani
committed
on 21 Jun 2018
|
|
|
UI周りのものをfragmentへ移行
s-iwatani
committed
on 21 Jun 2018
|
|
|
Merge pull request #16 from nitta-lab-2018/changeFragment
...
Hiromu Matsumoto
committed
on 21 Jun 2018
|
|
| 2018-06-20 |
いらないもの消した
n-konishi
committed
on 20 Jun 2018
|
| 2018-06-19 | |
|
コミット忘れ
n-konishi
committed
on 19 Jun 2018
|
|
|
単なる微調整
n-konishi
committed
on 19 Jun 2018
|
|
|
Fragment上で画面遷移できた
n-konishi
committed
on 19 Jun 2018
|
|
|
Padでとりあえず動く
s-bekki
committed
on 19 Jun 2018
|
|
| 2018-06-14 | |
|
|
|
|
戻れるようにした
a-matsumoto
committed
on 14 Jun 2018
|
|
|
|
|
|
戻れるようにした
a-matsumoto
committed
on 14 Jun 2018
|
|
|
戻れるようにした
a-matsumoto
committed
on 14 Jun 2018
|
|
|
|
|
|
instances画面への遷移
h-matsumoto
committed
on 14 Jun 2018
|
|
|
Merge pull request #11 from nitta-lab-2018/ユーザーのデータを保存する
...
Hiromu Matsumoto
committed
on 14 Jun 2018
|
|
|
動いたっぽいぜよ
a-matsumoto
committed
on 14 Jun 2018
|
|
|
動いたっぽいぜよ
a-matsumoto
committed
on 14 Jun 2018
|
|
|
動いたっぽいぜよ
a-matsumoto
committed
on 14 Jun 2018
|
|
|
ここまで
n-konishi
committed
on 14 Jun 2018
|
|
|
|
|
|
instances画面への遷移
h-matsumoto
committed
on 14 Jun 2018
|
|
|
for文を拡張for文に変更
n-konishi
committed
on 14 Jun 2018
|
|
|
動いたっぽいぜよ
a-matsumoto
committed
on 14 Jun 2018
|
|
|
インタンスのフラグメント作って見たけど動かんぜよ
a-matsumoto
committed
on 14 Jun 2018
|
|
|
インタンスのフラグメント作って見たけど動かんぜよ
a-matsumoto
committed
on 14 Jun 2018
|
|
|
|
|
|
|
|
|
Merge branch 'master' of /Users/matsumotoayaju/AndroidStudioProjects/Cactus2 with conflicts.
a-matsumoto
committed
on 14 Jun 2018
|
|
|
subjectを少し修正
s-iwatani
committed
on 14 Jun 2018
|
|
|
Merge pull request #9 from nitta-lab-2018/アカウント情報をCuctusクラスに保存するためのブランチ
...
Hiromu Matsumoto
committed
on 14 Jun 2018
|
|
|
|
|
| 2018-06-12 |
物体と人の判定
n-konishi
committed
on 12 Jun 2018
|
|
ArrayListListのfor文の追加
n-konishi
committed
on 12 Jun 2018
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ログイン画面です
a-matsumoto
committed
on 12 Jun 2018
|
|
|
ログイン画面です
a-matsumoto
committed
on 12 Jun 2018
|
|
|
ここまで
n-konishi
committed
on 12 Jun 2018
|
|
|
ログイン画面です
a-matsumoto
committed
on 12 Jun 2018
|
|
|
|
|
|
todo追加
Souki Iwatani
committed
on 12 Jun 2018
|
|
|
コメント修正
Souki Iwatani
committed
on 12 Jun 2018
|
|
|
コメント追加
Souki Iwatani
committed
on 12 Jun 2018
|
|
|
関数名を修正
Totori
committed
on 12 Jun 2018
|
|
| 2018-06-11 |
処理のメモ
n-konishi
committed
on 11 Jun 2018
|
|
リストに変更
n-konishi
committed
on 11 Jun 2018
|
|
|
実行確認
n-konishi
committed
on 11 Jun 2018
|
|
|
interfaceのメソッド追加
n-konishi
committed
on 11 Jun 2018
|
|
| 2018-06-08 |
Collidableの作成
n-konishi
committed
on 8 Jun 2018
|
|
ログイン画面です
a-matsumoto
committed
on 8 Jun 2018
|
|
| 2018-06-07 | |
|
ログイン画面です
a-matsumoto
committed
on 7 Jun 2018
|
|
|
ログイン画面です
a-matsumoto
committed
on 7 Jun 2018
|
|
|
ログイン画面です
a-matsumoto
committed
on 7 Jun 2018
|
|
|
ログイン画面です
a-matsumoto
committed
on 7 Jun 2018
|
|
|
おk
h-matsumoto
committed
on 7 Jun 2018
|
|
|
|
|
|
ログイン画面です
a-matsumoto
committed
on 7 Jun 2018
|
|
|
button上下左右に増やしてみた
n-konishi
committed
on 7 Jun 2018
|
|
|
ボタンクリックでprintln文の表示は出来た
n-konishi
committed
on 7 Jun 2018
|
|
|
ログイン画面です
a-matsumoto
committed
on 7 Jun 2018
|
|
|
ボタン配置移動
n-konishi
committed
on 7 Jun 2018
|
|
|
Merge pull request #5 from nitta-lab-2018/ConnectionLoginFragment
...
Hiromu Matsumoto
committed
on 7 Jun 2018
|
|
|
ログイン画面です
a-matsumoto
committed
on 7 Jun 2018
|
|
| 2018-06-05 |
test
s-iwatani
committed
on 5 Jun 2018
|
|
sighupフラグメント2
a-matsumoto
committed
on 5 Jun 2018
|
|
|
sighupフラグメント2
a-matsumoto
committed
on 5 Jun 2018
|
|
|
sighupフラグメント2
a-matsumoto
committed
on 5 Jun 2018
|
|
|
|
|
|
コメント追加
n-konishi
committed
on 5 Jun 2018
|
|
| 2018-05-31 |
追加
n-konishi
committed
on 31 May 2018
|
|
削除
n-konishi
committed
on 31 May 2018
|
|
|
sighupフラグメント2
a-matsumoto
committed
on 31 May 2018
|
|
|
text追加とLayout追加
n-konishi
committed
on 31 May 2018
|
|
|
sighupフラグメント2
a-matsumoto
committed
on 31 May 2018
|
|
|
sighupフラグメント2
a-matsumoto
committed
on 31 May 2018
|
|
|
Sampleにボタン配置できた
n-konishi
committed
on 31 May 2018
|
|
|
直し2
n-konishi
committed
on 31 May 2018
|
|
|
直し
n-konishi
committed
on 31 May 2018
|
|
|
sighupフラグメント2
a-matsumoto
committed
on 31 May 2018
|
|
|
|
|
|
sighupフラグメント2
a-matsumoto
committed
on 31 May 2018
|
|
|
sighupフラグメント2
a-matsumoto
committed
on 31 May 2018
|
|
| 2018-05-30 |
いらないもの削除
n-konishi
committed
on 30 May 2018
|
| 2018-05-29 |
sighupフラグメント2
a-matsumoto
committed
on 29 May 2018
|
|
sighupフラグメント
a-matsumoto
committed
on 29 May 2018
|
|
|
sighupフラグメント
a-matsumoto
committed
on 29 May 2018
|
|
| 2018-05-24 | |
|
とりあえずここまで
n-konishi
committed
on 24 May 2018
|
|
|
getsetの追加
n-konishi
committed
on 24 May 2018
|
|
|
|
|
|
あえdふぁkj
a-matsumoto
committed
on 24 May 2018
|
|
|
Accountの作業
n-konishi
committed
on 24 May 2018
|
|
| 2018-05-23 |
gitignoreの変更
n-konishi
committed
on 23 May 2018
|
|
Cuctusクラスの作成
n-konishi
committed
on 23 May 2018
|
|
| 2018-05-22 |
レイヤーの優先順位の説明と挙動が食い違っていたのを修正
s-iwatani
committed
on 22 May 2018
|
|
あえdふぁkj
a-matsumoto
committed
on 22 May 2018
|
|
|
プログラム微修正
s-iwatani
committed
on 22 May 2018
|
|
|
レイヤーに対応
s-iwatani
committed
on 22 May 2018
|
|
| 2018-05-18 |
Fragment動作確認用
n-konishi
committed
on 18 May 2018
|
|
とりあえずFragment動いたけど変な感じ
n-konishi
committed
on 18 May 2018
|
|
| 2018-05-17 |
簡易Fragment画面遷移の作成(修正版)
n-konishi
committed
on 17 May 2018
|
|
簡易Fragment画面遷移の作成
n-konishi
committed
on 17 May 2018
|
|
|
Fragmentの追加
n-konishi
committed
on 17 May 2018
|
|
|
SampleActivityの追加
n-konishi
committed
on 17 May 2018
|
|
|
設計変更
s-iwatani
committed
on 17 May 2018
|
|
|
.gitignore is now working
s-iwatani
committed
on 17 May 2018
|
|
|
.gitignore is now working
s-iwatani
committed
on 17 May 2018
|
|
|
|
|
| 2018-05-15 | |
|
gitignoreの.idea/caches追加
n-konishi
committed
on 15 May 2018
|
|
|
MainActivityのTextView追加
n-konishi
committed
on 15 May 2018
|
|
|
MainActivityの作成
n-konishi
committed
on 15 May 2018
|
|
|
fileの追加
n-konishi
committed
on 15 May 2018
|
|
|
残りcommit
n-konishi
committed
on 15 May 2018
|
|
| 2018-05-14 |
buildToolsVersionの追加
n-konishi
committed
on 14 May 2018
|
|
コメントの追加
n-konishi
committed
on 14 May 2018
|
|
|
targetSdkVersionの変更
n-konishi
committed
on 14 May 2018
|
|
|
first commit
n-konishi
committed
on 14 May 2018
|