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
commit 73bf2f2a84e08bb31afe1e16e89b15ca827205ef 2 parents de098c8 + f4c9e38 s-iwatani authored on 18 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

commit 73bf2f2a84e08bb31afe1e16e89b15ca827205ef

2 parents de098c8 + f4c9e38

s-iwatani authored on 18 Oct 2018

Patch

Unified Split

Showing 7 changed files

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

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

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

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

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

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

Ignore Space Show notes View app/src/main/res/layout/ui_fragment.xml

Show line notes below