Browse code Merge branch 'master' into all-layout # Conflicts: # app/build.gradle all-layout
commit 357997483ae9b9cb500e7a4e2d5e4f09426780c4 2 parents 571e3e8 + 4d37a54 n-konishi authored on 11 Oct 2018

Showing 47 changed files

• .idea/caches/build_file_checksums.ser
• app/build.gradle
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/Cactus.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/CharacterConnection.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/CharactersConnection.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/CharactersFragmentConnection.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/InstancesFragmentConnection.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/LoginFragmentConnection.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/PlayersConnection.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/SignUpFragmentConnection.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Account.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Angle.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Area.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/CactusModels.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/CameraState.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Character.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/CharacterModelManager.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/EmoteState.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Entity.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Entity3D.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Instance.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Instances.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Item.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Object.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OtherPlayerCharacter.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OtherPlayerCharactersModel.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OwnPlayer.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Plain.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Player.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/StageModelManager.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/types/PlayerId.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/CharactersFragment.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/InstancesFragment.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/LoginFragment.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/PlayerFragment.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/PlayerFragmentLight.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/StartFragment.java
• app/src/main/java/org/ntlab/radishforandroidstudio/framework/common/CommonId.java
• app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/GameBaseModel.java
• app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/GameBaseModelManager.java
• app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/RealTime3DFragment.java
• app/src/main/java/org/ntlab/radishforandroidstudio/framework/model3D/Universe.java
• app/src/main/java/org/ntlab/radishforandroidstudio/framework/network/HttpAsyncConnection.java
• app/src/main/res/layout/ui_fragment.xml
• build.gradle
• gradle/wrapper/gradle-wrapper.properties

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

Ignore Space Show notes View app/build.gradle

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

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

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

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

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

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/PlayersConnection.java 0 → 100644

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/LoginFragment.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/PlayerFragmentLight.java 0 → 100644

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

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

Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/framework/common/CommonId.java 100644 → 0

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/GameBaseModel.java 0 → 100644

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/GameBaseModelManager.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/java/org/ntlab/radishforandroidstudio/framework/network/HttpAsyncConnection.java

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

Ignore Space Show notes View build.gradle

Ignore Space Show notes View gradle/wrapper/gradle-wrapper.properties

Show line notes below