This commit is contained in:
Anuken
2019-11-05 15:32:13 -05:00
parent 3e43f5577e
commit 21b7016fb5
5 changed files with 6 additions and 5 deletions

View File

@@ -617,6 +617,7 @@ setting.difficulty.name = Difficulty:
setting.screenshake.name = Screen Shake setting.screenshake.name = Screen Shake
setting.effects.name = Display Effects setting.effects.name = Display Effects
setting.destroyedblocks.name = Display Destroyed Blocks setting.destroyedblocks.name = Display Destroyed Blocks
setting.conveyorpathfinding.name = Conveyor Placement Pathfinding
setting.sensitivity.name = Controller Sensitivity setting.sensitivity.name = Controller Sensitivity
setting.saveinterval.name = Save Interval setting.saveinterval.name = Save Interval
setting.seconds = {0} Seconds setting.seconds = {0} Seconds

View File

@@ -194,7 +194,7 @@ public class Mechs implements ContentList{
@Override @Override
public void updateAlt(Player player){ public void updateAlt(Player player){
float scl = 1f - player.shootHeat / 2f; float scl = 1f - player.shootHeat / 2f*Time.delta();
player.velocity().scl(scl); player.velocity().scl(scl);
} }

View File

@@ -36,7 +36,7 @@ public class MissileBulletType extends BasicBulletType{
} }
if(weaveMag > 0){ if(weaveMag > 0){
b.velocity().rotate(Mathf.sin(Time.time() + b.id * 4422, weaveScale, weaveMag)); b.velocity().rotate(Mathf.sin(Time.time() + b.id * 4422, weaveScale, weaveMag) * Time.delta());
} }
} }
} }

View File

@@ -1,5 +1,6 @@
package io.anuke.mindustry.input; package io.anuke.mindustry.input;
import io.anuke.arc.*;
import io.anuke.arc.collection.*; import io.anuke.arc.collection.*;
import io.anuke.arc.math.*; import io.anuke.arc.math.*;
import io.anuke.arc.math.geom.*; import io.anuke.arc.math.geom.*;
@@ -26,7 +27,7 @@ public class Placement{
Pools.freeAll(points); Pools.freeAll(points);
points.clear(); points.clear();
if(conveyors){ if(conveyors && Core.settings.getBool("conveyorpathfinding")){
if(astar(startX, startY, endX, endY)){ if(astar(startX, startY, endX, endY)){
return points; return points;
}else{ }else{

View File

@@ -225,9 +225,8 @@ public class SettingsMenuDialog extends SettingsDialog{
} }
game.checkPref("savecreate", true); game.checkPref("savecreate", true);
game.checkPref("blockreplace", true); game.checkPref("blockreplace", true);
game.checkPref("conveyorpathfinding", true);
game.checkPref("hints", true); game.checkPref("hints", true);
if(steam && !Version.modifier.contains("beta")){ if(steam && !Version.modifier.contains("beta")){