Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Anuken
2020-02-23 20:14:38 -05:00
parent 7f53328f52 c989504bf6
commit cfbe631e66
18 changed files with 55 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/ui/Links.java
View File

@@ -16,7 +16,7 @@ public class Links{
new LinkEntry("changelog", "https://github.com/Anuken/Mindustry/releases", Icon.list, Pal.accent.cpy()),
new LinkEntry("trello", "https://trello.com/b/aE2tcUwF", Icon.trello, Color.valueOf("026aa7")),
new LinkEntry("wiki", "https://mindustrygame.github.io/wiki/", Icon.book, Color.valueOf("0f142f")),
new LinkEntry("feathub", "https://feathub.com/Anuken/Mindustry/", Icon.add, Color.valueOf("ebebeb")),
new LinkEntry("feathub", "https://github.com/Anuken/Mindustry-Suggestions/issues/new/choose/", Icon.add, Color.valueOf("ebebeb")),
new LinkEntry("reddit", "https://www.reddit.com/r/Mindustry/", Icon.redditAlien, Color.valueOf("ee593b")),
new LinkEntry("itch.io", "https://anuke.itch.io/mindustry", Icon.itchio, Color.valueOf("fa5c5c")),
new LinkEntry("google-play", "https://play.google.com/store/apps/details?id=io.anuke.mindustry", Icon.googleplay, Color.valueOf("689f38")),

1
core/src/mindustry/ui/dialogs/CustomRulesDialog.java
View File

@@ -172,6 +172,7 @@ public class CustomRulesDialog extends FloatingDialog{
number("$rules.enemycorebuildradius", f -> rules.enemyCoreBuildRadius = f * tilesize, () -> Math.min(rules.enemyCoreBuildRadius / tilesize, 200));
title("$rules.title.experimental");
number("$rules.solarpowermultiplier", f -> rules.solarPowerMultiplier = f, () -> rules.solarPowerMultiplier);
check("$rules.lighting", b -> rules.lighting = b, () -> rules.lighting);
main.addButton(b -> {

2
core/src/mindustry/ui/dialogs/PlanetDialog.java
View File

@@ -28,6 +28,7 @@ public class PlanetDialog extends FloatingDialog{
private final VertexBatch3D batch = new VertexBatch3D(false, true, 0);
private float lastX, lastY;
private Sector selected;
public PlanetDialog(){
super("", Styles.fullDialog);
@@ -93,6 +94,7 @@ public class PlanetDialog extends FloatingDialog{
planet.mesh.render(cam.combined());
outline.render(cam.combined());
//dftactgrp sqlrpgle
Ptile tile = outline.getTile(cam.getPickRay(Core.input.mouseX(), Core.input.mouseY()));
if(tile != null){
float length = 0.1f;