Added camera movement while paused
This commit is contained in:
@@ -123,12 +123,14 @@ public class Renderer implements ApplicationListener{
|
|||||||
|
|
||||||
if(player.isDead()){
|
if(player.isDead()){
|
||||||
TileEntity core = player.getClosestCore();
|
TileEntity core = player.getClosestCore();
|
||||||
if(core != null && player.spawner == null){
|
if(core != null){
|
||||||
camera.position.lerpDelta(core.x, core.y, 0.08f);
|
if(player.spawner == null){
|
||||||
}else if(core != null){
|
camera.position.lerpDelta(core.x, core.y, 0.08f);
|
||||||
camera.position.lerpDelta(position, 0.08f);
|
}else{
|
||||||
|
camera.position.lerpDelta(position, 0.08f);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}else if(control.input instanceof DesktopInput){
|
}else if(control.input instanceof DesktopInput && !state.isPaused()){
|
||||||
camera.position.lerpDelta(position, 0.08f);
|
camera.position.lerpDelta(position, 0.08f);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -136,9 +136,9 @@ public class DesktopInput extends InputHandler{
|
|||||||
ui.listfrag.toggle();
|
ui.listfrag.toggle();
|
||||||
}
|
}
|
||||||
|
|
||||||
if(player.getClosestCore() == null && !ui.chatfrag.shown()){
|
if((player.getClosestCore() == null || state.isPaused()) && !ui.chatfrag.shown()){
|
||||||
//move camera around
|
//move camera around
|
||||||
float camSpeed = 6f;
|
float camSpeed = !Core.input.keyDown(Binding.dash) ? 3f : 8f;
|
||||||
Core.camera.position.add(Tmp.v1.setZero().add(Core.input.axis(Binding.move_x), Core.input.axis(Binding.move_y)).nor().scl(Time.delta() * camSpeed));
|
Core.camera.position.add(Tmp.v1.setZero().add(Core.input.axis(Binding.move_x), Core.input.axis(Binding.move_y)).nor().scl(Time.delta() * camSpeed));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ public class ScriptConsoleFragment extends Table{
|
|||||||
clearChatInput();
|
clearChatInput();
|
||||||
}
|
}
|
||||||
|
|
||||||
return shown;
|
return shown && Vars.net.active();
|
||||||
});
|
});
|
||||||
|
|
||||||
update(() -> {
|
update(() -> {
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
org.gradle.daemon=true
|
org.gradle.daemon=true
|
||||||
org.gradle.jvmargs=-Xms256m -Xmx1024m
|
org.gradle.jvmargs=-Xms256m -Xmx1024m
|
||||||
archash=fe82ca9037028044764cc4b02fdbf851e3d09f78
|
archash=14b6027d79cda5e02d74a7c2f85eb7e768c7abeb
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
package mindustry.server;
|
package mindustry.server;
|
||||||
|
|
||||||
import arc.*;
|
import arc.*;
|
||||||
|
import arc.files.*;
|
||||||
import arc.struct.*;
|
import arc.struct.*;
|
||||||
import arc.struct.Array.*;
|
import arc.struct.Array.*;
|
||||||
import arc.files.*;
|
|
||||||
import arc.util.*;
|
|
||||||
import arc.util.ArcAnnotate.*;
|
import arc.util.ArcAnnotate.*;
|
||||||
|
import arc.util.*;
|
||||||
import arc.util.Timer;
|
import arc.util.Timer;
|
||||||
import arc.util.CommandHandler.*;
|
import arc.util.CommandHandler.*;
|
||||||
import arc.util.Timer.*;
|
import arc.util.Timer.*;
|
||||||
|
|||||||
Reference in New Issue
Block a user