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

stop

Browse Source
This commit is contained in:
Anuken
2020-04-25 12:30:18 -04:00
parent 81af481d3a
commit 838e12cc0a
4 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/assets/bundles/bundle.properties
View File

@ -640,7 +640,7 @@ setting.linear.name = Linear Filtering
setting.hints.name = Hints setting.hints.name = Hints
setting.flow.name = Display Resource Flow Rate[scarlet] (experimental) setting.flow.name = Display Resource Flow Rate[scarlet] (experimental)
setting.buildautopause.name = Auto-Pause Building setting.buildautopause.name = Auto-Pause Building
setting.animatedwater.name = Animated Water setting.animatedwater.name = Animated Fluids
setting.animatedshields.name = Animated Shields setting.animatedshields.name = Animated Shields
setting.antialias.name = Antialias[lightgray] (requires restart)[] setting.antialias.name = Antialias[lightgray] (requires restart)[]
setting.playerindicators.name = Player Indicators setting.playerindicators.name = Player Indicators

10
core/src/mindustry/core/Control.java
View File

@ -377,6 +377,16 @@ public class Control implements ApplicationListener, Loadable{
Core.app.post(() -> Core.app.post(this::playTutorial)); Core.app.post(() -> Core.app.post(this::playTutorial));
} }
if(!OS.prop("user.name").equals("anuke") && !OS.hasEnv("iknowwhatimdoing")){
app.post(() -> app.post(() -> {
FloatingDialog dialog = new FloatingDialog("Don't play 6.0");
dialog.cont.add("6.0 is not ready for testing. Don't play it, and don't report any issues with it.\n[scarlet]This dialog cannot be closed. If you know what you're doing, you should know how to disable it.")
.grow().wrap().get().setAlignment(Align.center);
dialog.setFillParent(true);
dialog.show();
}));
}
//display UI scale changed dialog //display UI scale changed dialog
if(Core.settings.getBool("uiscalechanged", false)){ if(Core.settings.getBool("uiscalechanged", false)){
Core.app.post(() -> Core.app.post(() -> { Core.app.post(() -> Core.app.post(() -> {

3
core/src/mindustry/world/blocks/units/UnitFactory.java
View File

@ -149,6 +149,7 @@ public class UnitFactory extends Block{
if(currentPlan != -1){ if(currentPlan != -1){
UnitPlan plan = plans[currentPlan]; UnitPlan plan = plans[currentPlan];
Draw.draw(Layer.blockOver, () -> {
TextureRegion region = plan.unit.icon(Cicon.full); TextureRegion region = plan.unit.icon(Cicon.full);
Shaders.build.region = region; Shaders.build.region = region;
@ -167,8 +168,10 @@ public class UnitFactory extends Block{
Lines.lineAngleCenter(x + Mathf.sin(time, 20f, Vars.tilesize / 2f * size - 2f), y, 90, size * Vars.tilesize - 4f); Lines.lineAngleCenter(x + Mathf.sin(time, 20f, Vars.tilesize / 2f * size - 2f), y, 90, size * Vars.tilesize - 4f);
Draw.reset(); Draw.reset();
});
} }
Draw.z(Layer.blockOver);
Draw.rect(topRegion, x, y); Draw.rect(topRegion, x, y);
} }

2
gradle.properties
View File

@ -1,3 +1,3 @@
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=907d6db786c2629697cbfd3863ce0edd23a179f1 archash=1a08af7c65c887436d305a69928d9845ccfa3874