Merge branch 'master' into bullet

Fork: 0

nitta-lab-2018 / Cactus

Browse code 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 CleanArchitecture ForEasySignUp RemakeLoginFragment bullet correct_design master
1 parent 73bf2f2 commit 36ca19c4326d8c7b5c96a5c865f78e971afedc51 s-iwatani authored on 29 Oct 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 RemakeLoginFragment bullet correct_design master

1 parent 73bf2f2 commit 36ca19c4326d8c7b5c96a5c865f78e971afedc51

s-iwatani authored on 29 Oct 2018

Patch

Unified Split

Showing 5 changed files

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/MyBullet.java

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

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

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

Show line notes below