Merge remote-tracking branch 'origin/collisionCorrection' into collisionBullets

Fork: 0

nitta-lab-2018 / CactusServer

Browse code Merge remote-tracking branch 'origin/collisionCorrection' into collisionBullets Conflicts: src/main/java/cactusServer/models/CollisionManager.java src/main/java/cactusServer/utils/App.java 当たり判定関連の修正を反映した. master
commit d9e9baf812ff3972f7fd144eea931751d323f7f8 2 parents 830e48d + 6b650cc r-isitani authored on 30 Oct 2018

Patch

Unified Split

Showing 5 changed files

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/models/CollisionManager.java

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

Ignore Space Show notes View src/main/java/org/ntlab/radishforandroidstudio/framework/physics/BoundingBoxVisitor.java

Show line notes below