From bb3dae981451484e92807ff83255f399b201621f Mon Sep 17 00:00:00 2001 From: austin Date: Fri, 5 Nov 2021 00:08:12 -0400 Subject: [PATCH] Collision engine tweaks, crosshair+bow change --- assets/Models/bow1.fbx | Bin 17580 -> 17724 bytes assets/Models/lockoncrosshair1.fbx | Bin 0 -> 14860 bytes .../controls/ControlHandler.java | 3 ++ .../electrosphere/engine/LoadingThread.java | 4 +- .../entity/state/GravityTree.java | 2 +- .../state/collidable/CollidableTree.java | 35 ++++++++++++------ .../game/collision/CollisionEngine.java | 8 ++-- 7 files changed, 33 insertions(+), 19 deletions(-) create mode 100644 assets/Models/lockoncrosshair1.fbx diff --git a/assets/Models/bow1.fbx b/assets/Models/bow1.fbx index ca6a0bef8449e52f35afa5adfb3b570234bfc28d..2b8515ddfbbc6fef13222cb7f06a9458fb1ca1c0 100644 GIT binary patch delta 2186 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 diff --git a/assets/Models/lockoncrosshair1.fbx b/assets/Models/lockoncrosshair1.fbx new file mode 100644 index 0000000000000000000000000000000000000000..3349e74f3e24d333ccbd237f49ab9fa24e5c8eed GIT binary patch literal 14860 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