Merge branch 'master' into ForEasySignUp

Fork: 0

n-konishi / Cactus-CleanArchitecture

Browse code Merge branch 'master' into ForEasySignUp # Conflicts: # .idea/caches/build_file_checksums.ser # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/BulletsManager.java # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/DummyBullet.java CleanArchitecture chenge_design correct_design master onResponse update update2
commit b4b03193326eaf91fc6e23ad5a8a2c736c48820f 2 parents 92bccda + 0bac1aa a-matsumoto authored on 15 Nov 2018

Patch

Unified Split

Showing 6 changed files

Ignore Space Show notes View .idea/caches/build_file_checksums.ser
Not supported

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Bullet.java 0 → 100644

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/BulletsManager.java

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/DummyBullet.java

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/MyBullet.java

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/GameBaseModelManager.java

Show line notes below