mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-20 20:57:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

Added camera movement while paused

Browse Source
This commit is contained in:
Anuken
2019-12-29 15:40:56 -05:00
parent 6edcbb9120
commit 811c22b84e
5 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/mindustry/core/Renderer.java
View File

@ -123,12 +123,14 @@ public class Renderer implements ApplicationListener{
if(player.isDead()){
TileEntity core = player.getClosestCore();
if(core != null && player.spawner == null){
if(core != null){
if(player.spawner == null){
camera.position.lerpDelta(core.x, core.y, 0.08f);
}else if(core != null){
}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);
}

4
core/src/mindustry/input/DesktopInput.java
View File

@ -136,9 +136,9 @@ public class DesktopInput extends InputHandler{
ui.listfrag.toggle();
}
if(player.getClosestCore() == null && !ui.chatfrag.shown()){
if((player.getClosestCore() == null || state.isPaused()) && !ui.chatfrag.shown()){
//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));
}

2
core/src/mindustry/ui/fragments/ScriptConsoleFragment.java
View File

@ -53,7 +53,7 @@ public class ScriptConsoleFragment extends Table{
clearChatInput();
}
return shown;
return shown && Vars.net.active();
});
update(() -> {

2
gradle.properties
View File

@ -1,3 +1,3 @@
org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=fe82ca9037028044764cc4b02fdbf851e3d09f78
archash=14b6027d79cda5e02d74a7c2f85eb7e768c7abeb

4
server/src/mindustry/server/ServerControl.java
View File

@ -1,11 +1,11 @@
package mindustry.server;
import arc.*;
import arc.files.*;
import arc.struct.*;
import arc.struct.Array.*;
import arc.files.*;
import arc.util.*;
import arc.util.ArcAnnotate.*;
import arc.util.*;
import arc.util.Timer;
import arc.util.CommandHandler.*;
import arc.util.Timer.*;