Merge branch 'master' into collidable

Fork: 0

nitta-lab-2018 / Cactus

Browse code Merge branch 'master' into collidable # Conflicts: # .idea/caches/build_file_checksums.ser # app/build.gradle # app/src/main/AndroidManifest.xml CleanArchitecture ForEasySignUp PlayerFragment RemakeLoginFragment all-layout bullet correct_design logout_player master object_move test ui
commit daaaa802fdf4d377ff7d385d9971df662152510f 2 parents 0daa3ba + 6bf147a n-konishi authored on 26 Jun 2018

Patch

Unified Split

Showing 10 changed files

Ignore Space Show notes View .idea/caches/build_file_checksums.ser
Not supported

Ignore Space Show notes View app/src/main/AndroidManifest.xml

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/SampleUiFragment.java

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/StartFragment.java

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

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/framework/common/CommonId.java 0 → 100644

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/RealTime3DFragment.java

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/framework/model3D/Universe.java

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

Show line notes below