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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2018-08-08 10:43:09 -04:00
parent 81c78eafa6 b27fefae88
commit a94998bd02
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
build.gradle
View File

@@ -50,7 +50,7 @@ allprojects {
output += '"' + other.name.substring("bundle".length() + 1, other.name.lastIndexOf('.')) + '",' output += '"' + other.name.substring("bundle".length() + 1, other.name.lastIndexOf('.')) + '",'
} }
output = (output.substring(0, output.size() - 1) + "]") output = (output.substring(0, output.size() - 1) + "]")
new File('core/assets/locales.json').text = output; new File(project(':core').projectDir, 'assets/locales.json').text = output;
} }
writeVersion = { writeVersion = {
@@ -130,12 +130,17 @@ project(":ios") {
dependencies { dependencies {
compile project(":core") compile project(":core")
implementation project(":kryonet") implementation project(":kryonet")
compileOnly project(":annotations")
compile "com.mobidevelop.robovm:robovm-rt:$roboVMVersion" compile "com.mobidevelop.robovm:robovm-rt:$roboVMVersion"
compile "com.mobidevelop.robovm:robovm-cocoatouch:$roboVMVersion" compile "com.mobidevelop.robovm:robovm-cocoatouch:$roboVMVersion"
compile "com.badlogicgames.gdx:gdx-backend-robovm:$gdxVersion" compile "com.badlogicgames.gdx:gdx-backend-robovm:$gdxVersion"
compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-ios" compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-ios"
} }
compileJava.options.compilerArgs += [
"-processor", "io.anuke.annotations.RemoteMethodAnnotationProcessor"
]
} }
project(":core") { project(":core") {

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

@@ -536,8 +536,8 @@ unit.drone.name=Drone
unit.drone.description=The starter drone unit. Spawns in the core by default. Automatically mines ores, collects items and repairs blocks. unit.drone.description=The starter drone unit. Spawns in the core by default. Automatically mines ores, collects items and repairs blocks.
unit.fabricator.name=Fabricator unit.fabricator.name=Fabricator
unit.fabricator.description=An advanced drone unit. Automatically mines ores, collects items and repairs blocks. Significantly more effective than a drone. unit.fabricator.description=An advanced drone unit. Automatically mines ores, collects items and repairs blocks. Significantly more effective than a drone.
unit.scout.name=Scout unit.dagger.name=Scout
unit.scout.description=A basic ground unit. Useful in massive swarms. unit.dagger.description=A basic ground unit. Useful in swarms.
unit.titan.name=Titan unit.titan.name=Titan
unit.titan.description=An advanced, armored ground unit. Attacks both ground and air targets. unit.titan.description=An advanced, armored ground unit. Attacks both ground and air targets.
unit.monsoon.name=Monsoon unit.monsoon.name=Monsoon

1
core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java
View File

@@ -128,6 +128,7 @@ public class CustomGameDialog extends FloatingDialog{
pane.setFadeScrollBars(false); pane.setFadeScrollBars(false);
table.row(); table.row();
for(GameMode mode : GameMode.values()){ for(GameMode mode : GameMode.values()){
if(mode.hidden) continue;
table.labelWrap("[accent]" + mode.toString() + ":[] [lightgray]" + mode.description()).width(400f); table.labelWrap("[accent]" + mode.toString() + ":[] [lightgray]" + mode.description()).width(400f);
table.row(); table.row();
} }

2
ios/robovm.properties
View File

@@ -2,5 +2,5 @@ app.version=4.0
app.id=io.anuke.mindustry app.id=io.anuke.mindustry
app.mainclass=io.anuke.mindustry.IOSLauncher app.mainclass=io.anuke.mindustry.IOSLauncher
app.executable=IOSLauncher app.executable=IOSLauncher
app.build=17 app.build=19
app.name=Mindustry app.name=Mindustry