Merge branch 'master' into Loop

Fork: 0

nitta-lab-2018 / CactusServer

Browse code Merge branch 'master' into Loop InstancesRest3 collisionCorrection master
commit 3ae81d82ddfae5bf88bfd8d81c915ddd803408d5 2 parents 1f3e62c + 76aa88c student authored on 28 Jun 2018

Patch

Unified Split

Showing 18 changed files

Ignore Space Show notes View .settings/org.eclipse.jdt.core.prefs 0 → 100644

Show notes View src/main/assets/konan/Head4.obj 100644 → 0
Not supported

Show notes View src/main/assets/konan/konan.obj 100644 → 0
Not supported

Show notes View src/main/assets/konan/konan.stl 100644 → 0
Not supported

Show notes View src/main/assets/konan/pocha.stl 100644 → 0
Not supported

Ignore Space Show notes View src/main/java/cactusServer/models/CharacterModelManager.java

Ignore Space Show notes View src/main/java/cactusServer/models/Instances.java

Ignore Space Show notes View src/main/java/cactusServer/models/assets/Head4.mtl 0 → 100644

Ignore Space Show notes View src/main/java/cactusServer/models/assets/Head4.obj 0 → 100644
Not supported

Ignore Space Show notes View src/main/java/cactusServer/models/assets/konan.mtl 0 → 100644

Ignore Space Show notes View src/main/java/cactusServer/models/assets/konan.obj 0 → 100644
Not supported

Ignore Space Show notes View src/main/java/cactusServer/models/assets/konan.stl 0 → 100644
Not supported

Ignore Space Show notes View src/main/java/cactusServer/models/assets/pocha.stl 0 → 100644
Not supported

Ignore Space Show notes View src/main/java/cactusServer/resources/CharactersRest.java 0 → 100644

Ignore Space Show notes View src/main/java/cactusServer/resources/InstancesRest.java

Ignore Space Show notes View src/main/java/cactusServer/resources/ObjectsRest.java

Ignore Space Show notes View src/main/java/cactusServer/resources/PlayersRest.java 0 → 100644

Ignore Space Show notes View src/main/java/cactusServer/utils/App.java

Show line notes below