Merge branch 'master' into PlplupLearnedBulletSeed

Fork: 0

nitta-lab-2018 / Cactus

Browse code 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 何もしてない CleanArchitecture ForEasySignUp correct_design master
1 parent 4f30006 commit 51cbaf8fa42b8b389ce517fd87341aac153724d8 a-matsumoto authored on 15 Nov 2018

Browse code

# 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

何もしてない

CleanArchitecture ForEasySignUp correct_design master

1 parent 4f30006 commit 51cbaf8fa42b8b389ce517fd87341aac153724d8

a-matsumoto authored on 15 Nov 2018

Patch

Unified Split

Showing 5 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/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/views/LoginFragment.java

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java

Show line notes below