Browse code Merge branch 'master' into sprite # Conflicts: # .idea/caches/build_file_checksums.ser # app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/RealTimeActivity.java # app/src/main/res/layout/activity_main.xml # build.gradle CleanArchitecture ForEasySignUp PlayerFragment RemakeLoginFragment all-layout bullet correct_design logout_player master object_move test ui
commit 082e19fa5c958d956a34c1dd255e9d63322442e1 2 parents dd7e846 + 3ace58f s-iwatani authored on 21 Jun 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/LoginFragmentConnection.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/SignUpFragmentConnection.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/test.txt
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/AddressedEntity.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Entity.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/URIAddressedEntity.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/test
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/SampleActivity.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/SampleGame2Fragment.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/SampleGameFragment.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/StartFragment.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/viewModels/test
• 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/test
• app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/RealTime3DActivity.java
• app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/RealTime3DFragment.java
• app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/RealTimeActivity.java
• app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/RealTimeFragment.java
• app/src/main/java/org/ntlab/radishforandroidstudio/framework/network/CallBack.java
• app/src/main/java/org/ntlab/radishforandroidstudio/framework/network/HttpAsyncConnection.java
• app/src/main/java/org/ntlab/radishforandroidstudio/sample/SampleActivity.java
• app/src/main/java/org/ntlab/radishforandroidstudio/sample/SampleGameActivity.java
• app/src/main/res/layout/activity_main.xml
• app/src/main/res/layout/activity_sample.xml
• app/src/main/res/layout/button_layout.xml
• app/src/main/res/layout/characters_fragment.xml
• app/src/main/res/layout/fragment_real_time.xml
• app/src/main/res/layout/fragment_real_time_3d.xml
• app/src/main/res/layout/fragment_sample_game.xml
• app/src/main/res/layout/fragment_sample_game2.xml
• app/src/main/res/layout/fragment_start.xml
• app/src/main/res/layout/instances_fragment.xml
• app/src/main/res/layout/login_fragment.xml
• app/src/main/res/layout/sign_up_fragment.xml
• app/src/main/res/values/strings.xml
• build.gradle

Ignore Space Show notes View .idea/caches/build_file_checksums.ser 0 → 100644
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 0 → 100644

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

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

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

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

Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/test 100644 → 0

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

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

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

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

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/viewModels/test

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

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

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

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

Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/test 100644 → 0

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

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

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

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

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/framework/network/CallBack.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/java/org/ntlab/radishforandroidstudio/sample/SampleActivity.java 0 → 100644

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/sample/SampleGameActivity.java

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

Ignore Space Show notes View app/src/main/res/layout/activity_sample.xml 0 → 100644

Ignore Space Show notes View app/src/main/res/layout/button_layout.xml 0 → 100644

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

Ignore Space Show notes View app/src/main/res/layout/fragment_real_time.xml 0 → 100644

Ignore Space Show notes View app/src/main/res/layout/fragment_real_time_3d.xml 0 → 100644

Ignore Space Show notes View app/src/main/res/layout/fragment_sample_game.xml 0 → 100644

Ignore Space Show notes View app/src/main/res/layout/fragment_sample_game2.xml 0 → 100644

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

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

Ignore Space Show notes View app/src/main/res/layout/login_fragment.xml 0 → 100644

Ignore Space Show notes View app/src/main/res/layout/sign_up_fragment.xml 0 → 100644

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

Ignore Space Show notes View build.gradle

Show line notes below