Merged with master

2018-05-06 01:43:12 -04:00
parent 3905da1a62 b020336f8c
commit c931bbf107
35 changed files with 1634 additions and 798 deletions
@@ -119,6 +119,8 @@ public abstract class SyncEntity extends DestructibleEntity{

            time += 1f / spacing * Math.min(Timers.delta(), 1f);

+            time = Mathf.clamp(time, 0, 2f);
+
            Mathf.lerp2(pos.set(last), target, time);

            rotation = Mathf.slerpDelta(rotation, targetrot, 0.6f);