Browse code Merge branch 'master' into model # Conflicts: # .idea/caches/build_file_checksums.ser # app/src/main/AndroidManifest.xml # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/StartFragment.java CleanArchitecture ForEasySignUp RemakeLoginFragment all-layout bullet correct_design logout_player master test ui
commit 8d474678da13c002abae047f5cf7ca41f3525326 2 parents 75c1801 + bc70925 s-iwatani authored on 27 Sep 2018

Showing 44 changed files

• .idea/caches/build_file_checksums.ser
• app/build.gradle
• app/src/main/AndroidManifest.xml
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/Cactus.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/MainActivity.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/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/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/tests/SampleActivity.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/StartFragment.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/network/HttpAsyncConnection.java
• app/src/main/res/drawable/nittalab.png
• app/src/main/res/drawable/splash.xml
• app/src/main/res/layout/activity_main.xml
• app/src/main/res/layout/characters_fragment.xml
• app/src/main/res/layout/fragment_start.xml
• app/src/main/res/values/colors.xml
• app/src/main/res/values/strings.xml
• app/src/main/res/values/styles.xml

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/AndroidManifest.xml

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

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/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/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

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

Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/StartFragment.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 0 → 100644

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/drawable/nittalab.png 0 → 100644

Ignore Space Show notes View app/src/main/res/drawable/splash.xml 0 → 100644

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

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

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

Ignore Space Show notes View app/src/main/res/values/colors.xml

Ignore Space Show notes View app/src/main/res/values/strings.xml

Ignore Space Show notes View app/src/main/res/values/styles.xml

Show line notes below