Merge remote-tracking branch 'origin/master'
|
---|
.idea/caches/build_file_checksums.ser |
---|
Not supported
|
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 0 → 100644 |
---|
app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/InstancesFragmentConnection.java 0 → 100644 |
---|
app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/LoginFragmentConnection.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 0 → 100644 |
---|
app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Area.java 0 → 100644 |
---|
app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/CameraState.java 0 → 100644 |
---|
app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Character.java 0 → 100644 |
---|
app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/CharacterModelManager.java 0 → 100644 |
---|
app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/EmoteState.java 0 → 100644 |
---|
app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Entity.java 0 → 100644 |
---|
app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Entity3D.java 0 → 100644 |
---|
app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Instance.java 0 → 100644 |
---|
app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Instances.java 0 → 100644 |
---|
app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Item.java 0 → 100644 |
---|
app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Object.java 0 → 100644 |
---|
app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Plain.java 0 → 100644 |
---|
app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Player.java 0 → 100644 |
---|
app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/StageModelManager.java 0 → 100644 |
---|
app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/SampleActivity.java |
---|
app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/StartFragment.java 100644 → 0 |
---|
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/SignUpFragment.java |
---|
app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/StartFragment.java 0 → 100644 |
---|
app/src/main/java/org/ntlab/radishforandroidstudio/framework/network/HttpAsyncConnection.java |
---|
app/src/main/res/drawable/nittalab.png 0 → 100644 |
---|
|
app/src/main/res/drawable/splash.xml 0 → 100644 |
---|
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 |
---|