Compare commits
106 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a3c6e3f1df | ||
|
|
9f57278644 | ||
|
|
afc35cf623 | ||
|
|
6d8523054b | ||
|
|
fdecd55278 | ||
|
|
7e7f95916b | ||
|
|
ab52c65dcf | ||
|
|
ed4d0eb5d0 | ||
|
|
4bc9143306 | ||
|
|
a4f558c77a | ||
|
|
e4f226a9c5 | ||
|
|
c7d34049fa | ||
|
|
ee06e620c6 | ||
|
|
b48110db3b | ||
|
|
8413046dd8 | ||
|
|
83a5a82e18 | ||
|
|
771c5fbe3d | ||
|
|
74f16d0137 | ||
|
|
5d5d354f7d | ||
|
|
8f5f27755d | ||
|
|
4cb92cdb06 | ||
|
|
9e067ebdd6 | ||
|
|
fd5fcc9928 | ||
|
|
c0b2abb5fd | ||
|
|
2c8620a75c | ||
|
|
62f6ed0878 | ||
|
|
886b62bbad | ||
|
|
4bd58589fc | ||
|
|
0ce4144767 | ||
|
|
cde945f40e | ||
|
|
e2126a2693 | ||
|
|
c9f6d92bef | ||
|
|
fbf4c411c1 | ||
|
|
ce5218db58 | ||
|
|
e2ea7f9b87 | ||
|
|
94d9f04814 | ||
|
|
c86dbac04a | ||
|
|
f36eed32b9 | ||
|
|
cd752209ad | ||
|
|
fe37d619b9 | ||
|
|
043f4688ef | ||
|
|
949f171579 | ||
|
|
87d586a30e | ||
|
|
783f453da3 | ||
|
|
6dcf889ffe | ||
|
|
8d44879cc6 | ||
|
|
e7b813962d | ||
|
|
22fadab3b3 | ||
|
|
91741ec29c | ||
|
|
8269d842ce | ||
|
|
d038bdb6ce | ||
|
|
6cef301b94 | ||
|
|
e7ffbd817c | ||
|
|
97067a6ee2 | ||
|
|
7d1a8f5404 | ||
|
|
43bcf0cf3b | ||
|
|
71751ee18d | ||
|
|
ed105b102d | ||
|
|
f2662045ed | ||
|
|
ecb77b0283 | ||
|
|
4d4869842e | ||
|
|
47300b42b0 | ||
|
|
609565af5f | ||
|
|
0c75f920de | ||
|
|
e7b51f313b | ||
|
|
e8204fc983 | ||
|
|
aa69af64fb | ||
|
|
41f734b04d | ||
|
|
8ad6f3abcc | ||
|
|
e4875903f1 | ||
|
|
0a04de04f1 | ||
|
|
20427fdffa | ||
|
|
0fd0abc6c0 | ||
|
|
70f7fc29d4 | ||
|
|
b0c1aff783 | ||
|
|
4909c28ed9 | ||
|
|
9e6745f691 | ||
|
|
6c3ccb259f | ||
|
|
6c8d80777c | ||
|
|
2db61f93ac | ||
|
|
ad059cbc38 | ||
|
|
87e7e04c5e | ||
|
|
c083d059c9 | ||
|
|
ebd44d3b60 | ||
|
|
51f5d04889 | ||
|
|
0f4d574115 | ||
|
|
1feb4a5e6d | ||
|
|
f861b75c7d | ||
|
|
3530ca8989 | ||
|
|
6b074ed4b2 | ||
|
|
671823b4fa | ||
|
|
8ceebf1546 | ||
|
|
376495836a | ||
|
|
98212df076 | ||
|
|
1316c9235a | ||
|
|
a0905d5695 | ||
|
|
2a35e22dd2 | ||
|
|
f86a07daee | ||
|
|
997628622a | ||
|
|
563e015c92 | ||
|
|
64533de597 | ||
|
|
3776b99c39 | ||
|
|
6f07576748 | ||
|
|
550a11962e | ||
|
|
6d01193e1e | ||
|
|
8c3d6d05ab |
1
.gitignore
vendored
@@ -28,6 +28,7 @@ logs/
|
|||||||
/ios/src/io/anuke/mindustry/gen/
|
/ios/src/io/anuke/mindustry/gen/
|
||||||
/core/src/io/anuke/mindustry/gen/
|
/core/src/io/anuke/mindustry/gen/
|
||||||
ios/robovm.properties
|
ios/robovm.properties
|
||||||
|
packr-out/
|
||||||
config/
|
config/
|
||||||
*.gif
|
*.gif
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
jdk:
|
jdk:
|
||||||
- openjdk8
|
- openjdk8
|
||||||
script:
|
script:
|
||||||
|
- "git clone --depth=1 --branch=master https://github.com/Anuken/Arc ../Arc"
|
||||||
- "./gradlew test"
|
- "./gradlew test"
|
||||||
- "./gradlew desktop:dist -Pbuildversion=${TRAVIS_TAG:1}"
|
- "./gradlew desktop:dist -Pbuildversion=${TRAVIS_TAG:1}"
|
||||||
- "./gradlew server:dist -Pbuildversion=${TRAVIS_TAG:1}"
|
- "./gradlew server:dist -Pbuildversion=${TRAVIS_TAG:1}"
|
||||||
|
|||||||
@@ -29,6 +29,10 @@ _Building:_ `./gradlew desktop:dist`
|
|||||||
|
|
||||||
Server builds are bundled with each released build (in Releases). If you'd rather compile on your own, replace 'desktop' with 'server', e.g. `gradlew server:dist`.
|
Server builds are bundled with each released build (in Releases). If you'd rather compile on your own, replace 'desktop' with 'server', e.g. `gradlew server:dist`.
|
||||||
|
|
||||||
|
##### Troubleshooting
|
||||||
|
|
||||||
|
If the terminal returns `Permission denied` or `Command not found` on Mac/Linux, run `chmod +x ./gradlew` before running `./gradlew`. *This is a one-time procedure.*
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
Gradle may take up to several minutes to download files. Be patient. <br>
|
Gradle may take up to several minutes to download files. Be patient. <br>
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ buildscript {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:3.3.1'
|
classpath 'com.android.tools.build:gradle:3.3.2'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 76 KiB |
|
Before Width: | Height: | Size: 911 B After Width: | Height: | Size: 21 KiB |
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 23 KiB |
|
Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 6.5 KiB |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 7.1 KiB |
|
Before Width: | Height: | Size: 4.6 KiB After Width: | Height: | Size: 8.4 KiB |
|
Before Width: | Height: | Size: 6.1 KiB After Width: | Height: | Size: 7.6 KiB |
|
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 4.1 KiB |
|
Before Width: | Height: | Size: 553 B After Width: | Height: | Size: 4.1 KiB |
|
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 5.2 KiB |
|
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 4.3 KiB |
|
Before Width: | Height: | Size: 5.4 KiB After Width: | Height: | Size: 9.8 KiB |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 9.8 KiB |
|
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 8.1 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 9.0 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 4.1 KiB After Width: | Height: | Size: 20 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 19 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 23 KiB |
|
Before Width: | Height: | Size: 4.0 KiB After Width: | Height: | Size: 27 KiB |
|
Before Width: | Height: | Size: 5.1 KiB After Width: | Height: | Size: 28 KiB |
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 28 KiB |
@@ -100,7 +100,7 @@ public class AndroidLauncher extends AndroidApplication{
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void beginForceLandscape(){
|
public void beginForceLandscape(){
|
||||||
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
|
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -178,12 +178,14 @@ public class AndroidLauncher extends AndroidApplication{
|
|||||||
ui.showError("$save.import.invalid");
|
ui.showError("$save.import.invalid");
|
||||||
}
|
}
|
||||||
}else if(map){ //open map
|
}else if(map){ //open map
|
||||||
|
FileHandle file = Core.files.local("temp-map." + mapExtension);
|
||||||
|
file.write(inStream, false);
|
||||||
Core.app.post(() -> {
|
Core.app.post(() -> {
|
||||||
System.out.println("Opening map.");
|
System.out.println("Opening map.");
|
||||||
if(!ui.editor.isShown()){
|
if(!ui.editor.isShown()){
|
||||||
ui.editor.show();
|
ui.editor.show();
|
||||||
}
|
}
|
||||||
ui.editor.beginEditMap(inStream);
|
ui.editor.beginEditMap(file);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ buildscript{
|
|||||||
dependencies{
|
dependencies{
|
||||||
classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.5'
|
classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.5'
|
||||||
classpath "com.badlogicgames.gdx:gdx-tools:1.9.9"
|
classpath "com.badlogicgames.gdx:gdx-tools:1.9.9"
|
||||||
|
classpath "com.badlogicgames.packr:packr:2.1-SNAPSHOT"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -28,11 +29,11 @@ allprojects{
|
|||||||
arcHash = null
|
arcHash = null
|
||||||
|
|
||||||
debugged = {
|
debugged = {
|
||||||
return new File(projectDir.parent, '../debug').exists() && System.properties["release"] == null
|
return new File(projectDir.parent, '../debug').exists() && !project.hasProperty("release")
|
||||||
}
|
}
|
||||||
|
|
||||||
localArc = {
|
localArc = {
|
||||||
return (System.properties["release"] == null || System.properties["release"] == "false") && new File(projectDir.parent, '../Arc').exists()
|
return (!project.hasProperty("release")) && new File(projectDir.parent, '../Arc').exists()
|
||||||
}
|
}
|
||||||
|
|
||||||
getArcHash = {
|
getArcHash = {
|
||||||
|
|||||||
BIN
core/assets-raw/fonts/NanumBarunGothic.ttf
Normal file
BIN
core/assets-raw/fonts/OpenSansEmoji.ttf
Normal file
BIN
core/assets-raw/fonts/font_latin.ttf
Normal file
|
Before Width: | Height: | Size: 405 B After Width: | Height: | Size: 405 B |
|
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 354 B |
|
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 168 B |
|
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 155 B |
|
Before Width: | Height: | Size: 5.1 KiB After Width: | Height: | Size: 291 B |
|
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 170 B |
|
Before Width: | Height: | Size: 5.6 KiB After Width: | Height: | Size: 294 B |
BIN
core/assets-raw/sprites/blocks/environment/darksand1.png
Normal file
|
After Width: | Height: | Size: 94 B |
BIN
core/assets-raw/sprites/blocks/environment/darksand2.png
Normal file
|
After Width: | Height: | Size: 105 B |
BIN
core/assets-raw/sprites/blocks/environment/darksand3.png
Normal file
|
After Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 195 B |
|
Before Width: | Height: | Size: 578 B |
|
Before Width: | Height: | Size: 189 B After Width: | Height: | Size: 190 B |
|
Before Width: | Height: | Size: 121 B After Width: | Height: | Size: 121 B |
|
Before Width: | Height: | Size: 118 B After Width: | Height: | Size: 118 B |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 127 B |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 125 B |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 129 B |
|
Before Width: | Height: | Size: 1005 B After Width: | Height: | Size: 100 B |
|
Before Width: | Height: | Size: 999 B After Width: | Height: | Size: 100 B |
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 100 B |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 135 B |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 132 B |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 132 B |
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 97 B |
|
Before Width: | Height: | Size: 1015 B After Width: | Height: | Size: 90 B |
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 112 B |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 116 B |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 120 B |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 114 B |
|
Before Width: | Height: | Size: 1018 B After Width: | Height: | Size: 105 B |
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 115 B |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 121 B |
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 115 B |
BIN
core/assets-raw/sprites/blocks/environment/moss1.png
Normal file
|
After Width: | Height: | Size: 106 B |
BIN
core/assets-raw/sprites/blocks/environment/moss2.png
Normal file
|
After Width: | Height: | Size: 102 B |
BIN
core/assets-raw/sprites/blocks/environment/moss3.png
Normal file
|
After Width: | Height: | Size: 104 B |
8
core/assets-raw/sprites/blocks/environment/pack.json
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
{
|
||||||
|
duplicatePadding: true,
|
||||||
|
combineSubdirectories: true,
|
||||||
|
flattenPaths: true,
|
||||||
|
maxWidth: 2048,
|
||||||
|
maxHeight: 2048,
|
||||||
|
fast: true,
|
||||||
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
{
|
||||||
|
duplicatePadding: true,
|
||||||
|
combineSubdirectories: true,
|
||||||
|
flattenPaths: true,
|
||||||
|
maxWidth: 1024,
|
||||||
|
maxHeight: 1024,
|
||||||
|
fast: true,
|
||||||
|
}
|
||||||
|
Before Width: | Height: | Size: 128 B After Width: | Height: | Size: 143 B |
|
Before Width: | Height: | Size: 92 B After Width: | Height: | Size: 96 B |
|
Before Width: | Height: | Size: 103 B After Width: | Height: | Size: 107 B |
|
Before Width: | Height: | Size: 92 B After Width: | Height: | Size: 96 B |
BIN
core/assets-raw/sprites/blocks/environment/sandrocks-large.png
Normal file
|
After Width: | Height: | Size: 195 B |
BIN
core/assets-raw/sprites/blocks/environment/sandrocks1.png
Normal file
|
After Width: | Height: | Size: 122 B |
BIN
core/assets-raw/sprites/blocks/environment/sandrocks2.png
Normal file
|
After Width: | Height: | Size: 119 B |
|
Before Width: | Height: | Size: 132 B After Width: | Height: | Size: 132 B |
|
Before Width: | Height: | Size: 129 B After Width: | Height: | Size: 129 B |
BIN
core/assets-raw/sprites/blocks/environment/shale1.png
Normal file
|
After Width: | Height: | Size: 109 B |
BIN
core/assets-raw/sprites/blocks/environment/shale2.png
Normal file
|
After Width: | Height: | Size: 106 B |
BIN
core/assets-raw/sprites/blocks/environment/shale3.png
Normal file
|
After Width: | Height: | Size: 106 B |
|
Before Width: | Height: | Size: 182 B After Width: | Height: | Size: 182 B |
|
Before Width: | Height: | Size: 117 B After Width: | Height: | Size: 117 B |
|
Before Width: | Height: | Size: 117 B After Width: | Height: | Size: 117 B |
BIN
core/assets-raw/sprites/blocks/environment/snowrock1.png
Normal file
|
After Width: | Height: | Size: 153 B |
BIN
core/assets-raw/sprites/blocks/environment/snowrock2.png
Normal file
|
After Width: | Height: | Size: 149 B |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 170 B |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 117 B |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 113 B |
BIN
core/assets-raw/sprites/blocks/environment/spore-moss1.png
Normal file
|
After Width: | Height: | Size: 116 B |
BIN
core/assets-raw/sprites/blocks/environment/spore-moss2.png
Normal file
|
After Width: | Height: | Size: 106 B |
BIN
core/assets-raw/sprites/blocks/environment/spore-moss3.png
Normal file
|
After Width: | Height: | Size: 121 B |
BIN
core/assets-raw/sprites/blocks/environment/sporerocks-large.png
Normal file
|
After Width: | Height: | Size: 234 B |
BIN
core/assets-raw/sprites/blocks/environment/sporerocks1.png
Normal file
|
After Width: | Height: | Size: 147 B |