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 RemakeLoginFragment bullet correct_design master
commit aebcec690464b84efe31727f5f15e836b4b38e03 2 parents 36ca19c + caeb17b a-matsumoto authored on 8 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 RemakeLoginFragment bullet correct_design master

commit aebcec690464b84efe31727f5f15e836b4b38e03

2 parents 36ca19c + caeb17b

a-matsumoto authored on 8 Nov 2018

Patch

Unified Split

Showing 11 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/connections/ObjectsConnection.java

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

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

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

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

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/CharactersFragment.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/framework/RWT/RWTUIFragment.java

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

Show line notes below