Merge pull request #146 from nitta-lab-2018/obj

Fork: 0

nitta-lab-2018 / CactusServer

Browse code Merge pull request #146 from nitta-lab-2018/obj 確認しました. collisionCorrection master
commit 75aaf1472d5d1fe1843db0894516bf0e98047e2a 2 parents 735debe + a27697c ryo isitani authored on 24 Oct 2018

Patch

Unified Split

Showing 18 changed files

Ignore Space Show notes View src/main/java/cactusServer/entities/Bullet.java

Ignore Space Show notes View src/main/java/cactusServer/entities/CameraState.java

Ignore Space Show notes View src/main/java/cactusServer/entities/EmoteState.java

Ignore Space Show notes View src/main/java/cactusServer/entities/Entity.java

Ignore Space Show notes View src/main/java/cactusServer/entities/Instance.java

Ignore Space Show notes View src/main/java/cactusServer/entities/MovableObject.java

Ignore Space Show notes View src/main/java/cactusServer/entities/Player.java

Ignore Space Show notes View src/main/java/cactusServer/entities/URIAddressedAccount.java

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

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

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

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

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

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

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

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

Show line notes below