Browse code Merge branch 'master' into collidable # Conflicts: # .idea/caches/build_file_checksums.ser # app/build.gradle # app/src/main/AndroidManifest.xml CleanArchitecture chenge_design correct_design master onResponse update update2
commit 34ddd4d2db7a56e6ca3ce3f3dd4d3da59bedc18d 2 parents cddb6b0 + 34bbcbb n-konishi authored on 21 Jun 2018

Showing 57 changed files

• .idea/caches/build_file_checksums.ser
• app/build.gradle
• app/src/main/AndroidManifest.xml
• 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/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/SampleUiFragment.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/SignUpFragment.java
• app/src/main/java/org/ntlab/radishforandroidstudio/framework/RWT/RWTCameraController.java
• app/src/main/java/org/ntlab/radishforandroidstudio/framework/RWT/RWTDrawable.java
• app/src/main/java/org/ntlab/radishforandroidstudio/framework/RWT/RWTImageLoader.java
• app/src/main/java/org/ntlab/radishforandroidstudio/framework/RWT/RWTPad.java
• app/src/main/java/org/ntlab/radishforandroidstudio/framework/RWT/RWTRenderer.java
• app/src/main/java/org/ntlab/radishforandroidstudio/framework/RWT/RWTSprite.java
• app/src/main/java/org/ntlab/radishforandroidstudio/framework/RWT/RWTSurfaceView.java
• app/src/main/java/org/ntlab/radishforandroidstudio/framework/RWT/RWTUIFragment.java
• app/src/main/java/org/ntlab/radishforandroidstudio/framework/RWT/RWTView.java
• app/src/main/java/org/ntlab/radishforandroidstudio/framework/event/MyEvent.java
• app/src/main/java/org/ntlab/radishforandroidstudio/framework/event/PadEvent.java
• 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/listener/MyListener.java
• app/src/main/java/org/ntlab/radishforandroidstudio/framework/listener/PadListener.java
• app/src/main/java/org/ntlab/radishforandroidstudio/framework/listener/SamplePadListener.java
• app/src/main/java/org/ntlab/radishforandroidstudio/framework/subject/MySubject.java
• app/src/main/java/org/ntlab/radishforandroidstudio/framework/subject/PadSubject.java
• app/src/main/java/org/ntlab/radishforandroidstudio/java3d/GraphicsContext3D.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/drawable/tss_thumb.png
• app/src/main/res/drawable/wadahand.png
• 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/layout/test_activity.xml
• app/src/main/res/layout/ui_fragment.xml
• app/src/main/res/values/strings.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/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/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/SampleUiFragment.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/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

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/framework/RWT/RWTCameraController.java 0 → 100644

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

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

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

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/framework/RWT/RWTRenderer.java

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

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/framework/RWT/RWTSurfaceView.java

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

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

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

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

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

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

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

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

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

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/java3d/GraphicsContext3D.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/drawable/tss_thumb.png 0 → 100644

Ignore Space Show notes View app/src/main/res/drawable/wadahand.png 0 → 100644

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

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

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

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

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

Show line notes below