Browse code Merge branch 'master' into model # Conflicts: # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OtherPlayerCharactersModel.java CleanArchitecture ForEasySignUp RemakeLoginFragment all-layout bullet correct_design logout_player master test ui
commit f1e2fa74147014f91c8288917fa3d7b653a365aa 2 parents 7ed9826 + c064a26 s-iwatani authored on 10 Jul 2018

Showing 31 changed files

• .idea/caches/build_file_checksums.ser
• app/build.gradle
• app/src/main/AndroidManifest.xml
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Account.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/RandomStringGenerator.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/URIAddressedAccount.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/URIAddressedEntity.java
• 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/PlayerFragment.java
• app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java
• app/src/main/java/org/ntlab/radishforandroidstudio/framework/RWT/RWTUIFragment.java
• app/src/main/java/org/ntlab/radishforandroidstudio/framework/event/PadEvent.java
• app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/BaseActor.java
• app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/RealTimeActivity.java
• app/src/main/java/org/ntlab/radishforandroidstudio/sample/SampleGameActivity.java
• app/src/main/res/layout/activity_sample.xml
• app/src/main/res/layout/characters_fragment.xml
• app/src/main/res/layout/fragment_player.xml
• app/src/main/res/layout/instances_fragment.xml
• app/src/main/res/layout/login_fragment.xml
• app/src/main/res/layout/test_activity.xml
• build.gradle

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

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

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

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

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

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

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

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

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

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

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

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 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/framework/RWT/RWTUIFragment.java

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

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

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/sample/SampleGameActivity.java

Ignore Space Show notes View app/src/main/res/layout/activity_sample.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_player.xml 0 → 100644

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

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

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

Ignore Space Show notes View build.gradle

Show line notes below