diff --git a/assets/Data/creatures/human.json b/assets/Data/creatures/human.json index 324eaf43..2f256c04 100644 --- a/assets/Data/creatures/human.json +++ b/assets/Data/creatures/human.json @@ -128,7 +128,7 @@ "type" : "GROUND", "acceleration" : 5000.0, "maxVelocity" : 500.5, - "strafeMultiplier" : 0.7, + "strafeMultiplier" : 1.0, "backpedalMultiplier" : 0.5, "footstepFirstAudioOffset" : 0.2, "footstepSecondAudioOffset" : 0.6, @@ -160,7 +160,7 @@ { "type" : "JUMP", "jumpFrames" : 3, - "jumpForce" : 500, + "jumpForce" : 700, "animationJump" : { "nameThirdPerson" : "Jump", "nameFirstPerson" : "Jump", diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md index dcf96691..42cac7dc 100644 --- a/docs/src/progress/renderertodo.md +++ b/docs/src/progress/renderertodo.md @@ -546,6 +546,8 @@ Block sfx Fix server hitboxes freaking out at animation end Fix hitcapsule misalignment Always upright tree +Fix upright tree clearing linear force/velocity +Movement tweaks # TODO diff --git a/src/main/java/electrosphere/entity/state/physicssync/upright/ClientAlwaysUprightTree.java b/src/main/java/electrosphere/entity/state/physicssync/upright/ClientAlwaysUprightTree.java index a68b9f2f..c063a2ff 100644 --- a/src/main/java/electrosphere/entity/state/physicssync/upright/ClientAlwaysUprightTree.java +++ b/src/main/java/electrosphere/entity/state/physicssync/upright/ClientAlwaysUprightTree.java @@ -33,9 +33,9 @@ public class ClientAlwaysUprightTree implements BehaviorTree { if(body != null){ Vector3d position = EntityUtils.getPosition(parent); Quaterniond sourceRotation = new Quaterniond(EntityUtils.getRotation(parent)); - Vector3d linearVelocity = new Vector3d(); + Vector3d linearVelocity = PhysicsUtils.odeVecToJomlVec(body.getLinearVel()); Vector3d angularVelocity = new Vector3d(); - Vector3d linearForce = new Vector3d(); + Vector3d linearForce = PhysicsUtils.odeVecToJomlVec(body.getForce()); Vector3d angularForce = new Vector3d(); //make sure rotation is vertical diff --git a/src/main/java/electrosphere/entity/state/physicssync/upright/ServerAlwaysUprightTree.java b/src/main/java/electrosphere/entity/state/physicssync/upright/ServerAlwaysUprightTree.java index f4b3455b..238b4df8 100644 --- a/src/main/java/electrosphere/entity/state/physicssync/upright/ServerAlwaysUprightTree.java +++ b/src/main/java/electrosphere/entity/state/physicssync/upright/ServerAlwaysUprightTree.java @@ -36,9 +36,9 @@ public class ServerAlwaysUprightTree implements BehaviorTree { Realm realm = Globals.realmManager.getEntityRealm(parent); Vector3d position = EntityUtils.getPosition(parent); Quaterniond sourceRotation = new Quaterniond(EntityUtils.getRotation(parent)); - Vector3d linearVelocity = new Vector3d(); + Vector3d linearVelocity = PhysicsUtils.odeVecToJomlVec(body.getLinearVel()); Vector3d angularVelocity = new Vector3d(); - Vector3d linearForce = new Vector3d(); + Vector3d linearForce = PhysicsUtils.odeVecToJomlVec(body.getForce()); Vector3d angularForce = new Vector3d(); //make sure rotation is vertical