Fork: 0
nitta-lab-2018 / Cactus
Browse code
Merge branch 'master' into ViewpointControl
# Conflicts:
#	.idea/caches/build_file_checksums.ser
#	app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/PlayerFragment.java

ポッチャマは、すでに跳ねます。
CleanArchitecture ForEasySignUp RemakeLoginFragment bullet correct_design master
commit c19a8db2031286b4c36ab7499c090ac8c4288f90
2 parents b638e53 + a4744ec
a-matsumoto authored on 8 Nov 2018
Patch
Unified Split
Showing 7 changed files
View
app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/ObjectsConnection.java
View
app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Instance.java
View
app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/MovableObject.java 0 → 100644
View
app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/MovableObjectModel.java 0 → 100644
View
app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Object.java
View
app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/ObjectModelManager.java 0 → 100644
View
app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/PlayerFragment.java