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 8080はだめです。っていう変更 CleanArchitecture ForEasySignUp correct_design master
1 parent 137ceb7 commit 3a4647ac0cb5c8821dc18c30d6e6c963415f7784 a-matsumoto authored on 13 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

8080はだめです。っていう変更

CleanArchitecture ForEasySignUp correct_design master

1 parent 137ceb7 commit 3a4647ac0cb5c8821dc18c30d6e6c963415f7784

a-matsumoto authored on 13 Nov 2018

Patch

Unified Split

Showing 11 changed files

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/BulletCreateConnection.java

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/BulletGetConnection.java

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/BulletUpdateConnection.java

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/CharacterConnection.java

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/CharactersConnection.java

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/CharactersFragmentConnection.java

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/InstancesFragmentConnection.java

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/LoginFragmentConnection.java

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

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/PlayersConnection.java

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/SignUpFragmentConnection.java

Show line notes below