Compare commits
137 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c678a5502d | ||
|
|
0ee35721b0 | ||
|
|
1932f9a9c3 | ||
|
|
8e85b71669 | ||
|
|
f439afae9e | ||
|
|
fdd749be18 | ||
|
|
666e3e51a3 | ||
|
|
b930d5a1f9 | ||
|
|
5c10a2662d | ||
|
|
214f451cc1 | ||
|
|
67b4fa6f68 | ||
|
|
aa3e7a8ef5 | ||
|
|
7bf6099528 | ||
|
|
e90a4eb71d | ||
|
|
7b83406ee4 | ||
|
|
c4157d2ec8 | ||
|
|
2bdfaef2d9 | ||
|
|
2b0fbd9904 | ||
|
|
0ffa0351b5 | ||
|
|
951cbf3d16 | ||
|
|
69454048ad | ||
|
|
c4ceb89240 | ||
|
|
4a638cba79 | ||
|
|
c209528271 | ||
|
|
0d1f590937 | ||
|
|
b59b839029 | ||
|
|
513243ba0f | ||
|
|
795e774119 | ||
|
|
d02d419729 | ||
|
|
518bffe644 | ||
|
|
88d1b31aff | ||
|
|
4db2dbff44 | ||
|
|
32ad577f6d | ||
|
|
3310f49f68 | ||
|
|
bf7803d554 | ||
|
|
c9bd253960 | ||
|
|
859591cea5 | ||
|
|
b99b13a6e4 | ||
|
|
c80be4940f | ||
|
|
52374ce06d | ||
|
|
5a594f7d9a | ||
|
|
aff87a26ce | ||
|
|
18aae0cfa5 | ||
|
|
6f0bc2ecf8 | ||
|
|
8d2a637bd8 | ||
|
|
54180c4768 | ||
|
|
4e22384ed1 | ||
|
|
029f801159 | ||
|
|
fd53671430 | ||
|
|
7b09548261 | ||
|
|
63e1311656 | ||
|
|
36a303a86f | ||
|
|
61f903dcf1 | ||
|
|
2a10562e9e | ||
|
|
d64796f32a | ||
|
|
f2d67d0a5d | ||
|
|
ad39a51fe8 | ||
|
|
14d0927fb6 | ||
|
|
1697465d0d | ||
|
|
e52965d039 | ||
|
|
a8d957bf7d | ||
|
|
b6b5343e04 | ||
|
|
d4c318438d | ||
|
|
d8d04f2ac3 | ||
|
|
1c38e73290 | ||
|
|
7fc6b9b940 | ||
|
|
ed50ed8550 | ||
|
|
fb4c65dae0 | ||
|
|
fc9543baa7 | ||
|
|
b0eaca091a | ||
|
|
aab13a5582 | ||
|
|
f852ba02d8 | ||
|
|
4aa074b9fc | ||
|
|
2f7503c752 | ||
|
|
d754593c2b | ||
|
|
07ea938885 | ||
|
|
ac87930672 | ||
|
|
3dfef06bba | ||
|
|
120faf3806 | ||
|
|
f51f04d170 | ||
|
|
ec7bb78ee4 | ||
|
|
5ae1e59b5c | ||
|
|
e3956ebcf2 | ||
|
|
bb75e8f2e0 | ||
|
|
a77b1416e5 | ||
|
|
121e0a433b | ||
|
|
988aee3078 | ||
|
|
2bb99bb100 | ||
|
|
4e7ddc7e71 | ||
|
|
174caef7ca | ||
|
|
d2bb3800e3 | ||
|
|
f0959ab356 | ||
|
|
2c5546c6fb | ||
|
|
a7a565b93e | ||
|
|
ed074bd08b | ||
|
|
d938b22729 | ||
|
|
bd88a2378f | ||
|
|
0371126ccf | ||
|
|
ab36b6a2e1 | ||
|
|
d43d4a1773 | ||
|
|
0837c476a1 | ||
|
|
77a41b1783 | ||
|
|
0d39400f8b | ||
|
|
d3c8678f80 | ||
|
|
b7008072f8 | ||
|
|
15737810f0 | ||
|
|
5036c57372 | ||
|
|
5799e6f567 | ||
|
|
310e8afc25 | ||
|
|
78215363dc | ||
|
|
4e873f8bf3 | ||
|
|
79dc116e6a | ||
|
|
a7480ae656 | ||
|
|
62e310a776 | ||
|
|
bb398a2f1e | ||
|
|
79ab2d122d | ||
|
|
3a2f73a176 | ||
|
|
217237b57e | ||
|
|
cb7b6eb3f8 | ||
|
|
6e21d7f560 | ||
|
|
09d905b96f | ||
|
|
8f29d4871d | ||
|
|
94f175e2cd | ||
|
|
5e15c5574a | ||
|
|
1c530a6c7a | ||
|
|
8fc0872b90 | ||
|
|
3021cc29da | ||
|
|
c77f51b7ae | ||
|
|
aa39d36663 | ||
|
|
40907db32d | ||
|
|
12bff75586 | ||
|
|
89a4e6506f | ||
|
|
22656a40b2 | ||
|
|
6fa9abd896 | ||
|
|
b7a0ebad17 | ||
|
|
f8526e1ac7 | ||
|
|
1fe30bc466 |
2
.gitignore
vendored
@@ -20,6 +20,8 @@ logs/
|
|||||||
/server/build/
|
/server/build/
|
||||||
/test_files/
|
/test_files/
|
||||||
/annotations/build/
|
/annotations/build/
|
||||||
|
/desktop-sdl/build/
|
||||||
|
desktop-sdl/build/
|
||||||
/android/assets/mindustry-maps/
|
/android/assets/mindustry-maps/
|
||||||
/android/assets/mindustry-saves/
|
/android/assets/mindustry-saves/
|
||||||
/core/assets/gifexport/
|
/core/assets/gifexport/
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||

|

|
||||||
|
|
||||||
[](https://travis-ci.org/Anuken/Mindustry)
|
[](https://travis-ci.org/Anuken/Mindustry)
|
||||||
[](https://discord.gg/mindustry)
|
[](https://discord.gg/mindustry)
|
||||||
|
|||||||
@@ -146,7 +146,7 @@ public class AndroidLauncher extends AndroidApplication{
|
|||||||
InputStream inStream;
|
InputStream inStream;
|
||||||
if(myFile != null) inStream = new FileInputStream(myFile);
|
if(myFile != null) inStream = new FileInputStream(myFile);
|
||||||
else inStream = getContentResolver().openInputStream(uri);
|
else inStream = getContentResolver().openInputStream(uri);
|
||||||
Core.app.post(() -> {
|
Core.app.post(() -> Core.app.post(() -> {
|
||||||
if(save){ //open save
|
if(save){ //open save
|
||||||
System.out.println("Opening save.");
|
System.out.println("Opening save.");
|
||||||
FileHandle file = Core.files.local("temp-save." + saveExtension);
|
FileHandle file = Core.files.local("temp-save." + saveExtension);
|
||||||
@@ -172,7 +172,7 @@ public class AndroidLauncher extends AndroidApplication{
|
|||||||
ui.editor.beginEditMap(file);
|
ui.editor.beginEditMap(file);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
}));
|
||||||
}
|
}
|
||||||
}catch(IOException e){
|
}catch(IOException e){
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
|
|||||||
23
build.gradle
@@ -9,7 +9,7 @@ buildscript{
|
|||||||
|
|
||||||
dependencies{
|
dependencies{
|
||||||
classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.6'
|
classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.6'
|
||||||
classpath "com.badlogicgames.gdx:gdx-tools:1.9.9"
|
classpath "com.badlogicgames.gdx:gdx-tools:1.9.10"
|
||||||
classpath "com.badlogicgames.packr:packr:2.1-SNAPSHOT"
|
classpath "com.badlogicgames.packr:packr:2.1-SNAPSHOT"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -22,7 +22,7 @@ allprojects{
|
|||||||
versionModifier = 'beta'
|
versionModifier = 'beta'
|
||||||
if(!project.hasProperty("versionType")) versionType = 'official'
|
if(!project.hasProperty("versionType")) versionType = 'official'
|
||||||
appName = 'Mindustry'
|
appName = 'Mindustry'
|
||||||
gdxVersion = '1.9.9'
|
gdxVersion = '1.9.10'
|
||||||
roboVMVersion = '2.3.6'
|
roboVMVersion = '2.3.6'
|
||||||
arcHash = null
|
arcHash = null
|
||||||
|
|
||||||
@@ -134,6 +134,23 @@ project(":desktop"){
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
project(":desktop-sdl"){
|
||||||
|
apply plugin: "java"
|
||||||
|
|
||||||
|
dependencies{
|
||||||
|
compile project(":core")
|
||||||
|
compile project(":net")
|
||||||
|
|
||||||
|
if(debugged()) compile project(":debug")
|
||||||
|
|
||||||
|
compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
|
||||||
|
compile "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-desktop"
|
||||||
|
|
||||||
|
compile arcModule("backends:backend-sdl")
|
||||||
|
compile 'com.github.MinnDevelopment:java-discord-rpc:v2.0.2'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
project(":ios"){
|
project(":ios"){
|
||||||
apply plugin: "java"
|
apply plugin: "java"
|
||||||
apply plugin: "robovm"
|
apply plugin: "robovm"
|
||||||
@@ -251,7 +268,7 @@ project(":tools"){
|
|||||||
compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
|
compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
|
||||||
compile "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-desktop"
|
compile "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-desktop"
|
||||||
|
|
||||||
compile arcModule("backends:backend-lwjgl3")
|
compile arcModule("backends:backend-sdl")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 265 B After Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 3.6 KiB |
|
Before Width: | Height: | Size: 276 B After Width: | Height: | Size: 2.9 KiB |
|
Before Width: | Height: | Size: 254 B After Width: | Height: | Size: 3.0 KiB |
|
Before Width: | Height: | Size: 219 B After Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 504 B After Width: | Height: | Size: 4.7 KiB |
|
Before Width: | Height: | Size: 236 B After Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 244 B After Width: | Height: | Size: 2.4 KiB |
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 2.0 KiB |
|
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 2.0 KiB |
|
Before Width: | Height: | Size: 6.1 KiB After Width: | Height: | Size: 5.8 KiB |
|
Before Width: | Height: | Size: 474 B After Width: | Height: | Size: 3.8 KiB |
|
Before Width: | Height: | Size: 243 B After Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 231 B After Width: | Height: | Size: 2.1 KiB |
BIN
core/assets-raw/sprites/blocks/environment/sand-boulder1.png
Normal file
|
After Width: | Height: | Size: 2.9 KiB |
BIN
core/assets-raw/sprites/blocks/environment/sand-boulder2.png
Normal file
|
After Width: | Height: | Size: 2.8 KiB |
|
Before Width: | Height: | Size: 637 B After Width: | Height: | Size: 4.8 KiB |
|
Before Width: | Height: | Size: 261 B After Width: | Height: | Size: 2.4 KiB |
|
Before Width: | Height: | Size: 243 B After Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 238 B After Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 218 B After Width: | Height: | Size: 2.1 KiB |
BIN
core/assets-raw/sprites/blocks/environment/snow-pine.png
Normal file
|
After Width: | Height: | Size: 6.5 KiB |
|
Before Width: | Height: | Size: 468 B After Width: | Height: | Size: 3.9 KiB |
|
Before Width: | Height: | Size: 224 B After Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 226 B After Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 232 B After Width: | Height: | Size: 5.4 KiB |
|
Before Width: | Height: | Size: 246 B After Width: | Height: | Size: 5.8 KiB |
|
Before Width: | Height: | Size: 259 B After Width: | Height: | Size: 6.1 KiB |
|
Before Width: | Height: | Size: 4.8 KiB After Width: | Height: | Size: 4.9 KiB |
|
Before Width: | Height: | Size: 589 B After Width: | Height: | Size: 3.4 KiB |
|
Before Width: | Height: | Size: 266 B After Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 234 B After Width: | Height: | Size: 1.8 KiB |
|
After Width: | Height: | Size: 9.1 KiB |
|
Before Width: | Height: | Size: 9.0 KiB After Width: | Height: | Size: 8.9 KiB |
|
After Width: | Height: | Size: 6.2 KiB |
|
Before Width: | Height: | Size: 5.3 KiB After Width: | Height: | Size: 6.0 KiB |
|
Before Width: | Height: | Size: 71 B After Width: | Height: | Size: 71 B |
|
Before Width: | Height: | Size: 299 B |
|
Before Width: | Height: | Size: 312 B After Width: | Height: | Size: 4.4 KiB |
|
Before Width: | Height: | Size: 340 B After Width: | Height: | Size: 5.8 KiB |
|
Before Width: | Height: | Size: 466 B After Width: | Height: | Size: 7.6 KiB |
|
Before Width: | Height: | Size: 409 B After Width: | Height: | Size: 6.6 KiB |
|
Before Width: | Height: | Size: 384 B After Width: | Height: | Size: 5.5 KiB |
|
Before Width: | Height: | Size: 543 B After Width: | Height: | Size: 7.3 KiB |
|
Before Width: | Height: | Size: 452 B After Width: | Height: | Size: 6.6 KiB |
|
Before Width: | Height: | Size: 429 B After Width: | Height: | Size: 5.6 KiB |
@@ -1,8 +0,0 @@
|
|||||||
{
|
|
||||||
duplicatePadding: true,
|
|
||||||
combineSubdirectories: true,
|
|
||||||
flattenPaths: true,
|
|
||||||
maxWidth: 1024,
|
|
||||||
maxHeight: 1024,
|
|
||||||
fast: true
|
|
||||||
}
|
|
||||||
|
Before Width: | Height: | Size: 70 B |
|
Before Width: | Height: | Size: 206 B After Width: | Height: | Size: 3.0 KiB |
|
Before Width: | Height: | Size: 197 B After Width: | Height: | Size: 6.0 KiB |
|
Before Width: | Height: | Size: 183 B After Width: | Height: | Size: 2.7 KiB |
|
Before Width: | Height: | Size: 181 B After Width: | Height: | Size: 2.6 KiB |
|
Before Width: | Height: | Size: 162 B After Width: | Height: | Size: 2.9 KiB |
|
Before Width: | Height: | Size: 182 B After Width: | Height: | Size: 3.3 KiB |
|
Before Width: | Height: | Size: 202 B After Width: | Height: | Size: 4.8 KiB |
BIN
core/assets-raw/sprites/ui/button-red.9.png
Normal file
|
After Width: | Height: | Size: 6.1 KiB |
|
Before Width: | Height: | Size: 169 B After Width: | Height: | Size: 3.3 KiB |
|
Before Width: | Height: | Size: 182 B After Width: | Height: | Size: 4.1 KiB |
|
Before Width: | Height: | Size: 191 B After Width: | Height: | Size: 3.5 KiB |
|
Before Width: | Height: | Size: 119 B After Width: | Height: | Size: 3.7 KiB |
|
Before Width: | Height: | Size: 208 B After Width: | Height: | Size: 3.1 KiB |
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 202 B After Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 218 B After Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 225 B After Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 196 B After Width: | Height: | Size: 2.0 KiB |
|
Before Width: | Height: | Size: 207 B |
|
Before Width: | Height: | Size: 5.0 KiB |
|
Before Width: | Height: | Size: 202 B |
|
Before Width: | Height: | Size: 207 B |
|
Before Width: | Height: | Size: 239 B After Width: | Height: | Size: 4.9 KiB |
|
Before Width: | Height: | Size: 143 B |
BIN
core/assets-raw/sprites/ui/flat-down-base.9.png
Normal file
|
After Width: | Height: | Size: 3.5 KiB |
BIN
core/assets-raw/sprites/ui/icons/icon-changelog.png
Normal file
|
After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 129 B After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 2.5 KiB |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 3.2 KiB |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 161 B After Width: | Height: | Size: 2.7 KiB |
|
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.4 KiB |
BIN
core/assets-raw/sprites/ui/icons/icon-mode-attack.png
Normal file
|
After Width: | Height: | Size: 1.3 KiB |
BIN
core/assets-raw/sprites/ui/icons/icon-mode-pvp.png
Normal file
|
After Width: | Height: | Size: 1.3 KiB |
BIN
core/assets-raw/sprites/ui/icons/icon-mode-survival.png
Normal file
|
After Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 3.5 KiB |
|
Before Width: | Height: | Size: 152 B After Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 2.4 KiB |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 148 B After Width: | Height: | Size: 2.9 KiB |
|
Before Width: | Height: | Size: 240 B After Width: | Height: | Size: 4.0 KiB |
|
Before Width: | Height: | Size: 142 B After Width: | Height: | Size: 3.3 KiB |
|
Before Width: | Height: | Size: 8.9 KiB |
@@ -2,7 +2,7 @@
|
|||||||
duplicatePadding: true,
|
duplicatePadding: true,
|
||||||
combineSubdirectories: true,
|
combineSubdirectories: true,
|
||||||
flattenPaths: true,
|
flattenPaths: true,
|
||||||
maxWidth: 1024,
|
maxWidth: 2048,
|
||||||
maxHeight: 1024,
|
maxHeight: 2048,
|
||||||
fast: true
|
fast: true
|
||||||
}
|
}
|
||||||