Compare commits
60 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8bc59fb67c | ||
|
|
ab5319f3d1 | ||
|
|
6128df0062 | ||
|
|
142938cdca | ||
|
|
b32efe129e | ||
|
|
2b20272a61 | ||
|
|
d9ef79a7b5 | ||
|
|
576f0be4ab | ||
|
|
47099a8a9b | ||
|
|
04dfda0c55 | ||
|
|
b6df916700 | ||
|
|
e239406199 | ||
|
|
266744b1dd | ||
|
|
ab716e96e2 | ||
|
|
649d527dcf | ||
|
|
c5e7ddaf7a | ||
|
|
b2a4cb42cf | ||
|
|
3fc5941f54 | ||
|
|
741360022b | ||
|
|
86e2f62aed | ||
|
|
e552915637 | ||
|
|
98a51c1f61 | ||
|
|
aa84eefa8f | ||
|
|
22e12ce3e5 | ||
|
|
f4a82b5c01 | ||
|
|
60520ea855 | ||
|
|
b70a0869cd | ||
|
|
7bdd21bb75 | ||
|
|
0dd3736f2a | ||
|
|
deb2d30706 | ||
|
|
c416e1546d | ||
|
|
6d3a67ae59 | ||
|
|
6b60147152 | ||
|
|
8c91aca838 | ||
|
|
b47e282747 | ||
|
|
134d0e7e4a | ||
|
|
26b596760b | ||
|
|
8a5e15e82d | ||
|
|
ffb5eee62a | ||
|
|
387d9b39da | ||
|
|
43b5cb62bb | ||
|
|
580923a646 | ||
|
|
06444f497b | ||
|
|
1676ad5f1b | ||
|
|
478d86677d | ||
|
|
c5e0db8de9 | ||
|
|
228690b400 | ||
|
|
8e95be0ac2 | ||
|
|
5e848ecbb3 | ||
|
|
0f32d3f619 | ||
|
|
f5f30d6026 | ||
|
|
e6e5b95adc | ||
|
|
990adcd3b3 | ||
|
|
56ff5689f4 | ||
|
|
6f589b5c84 | ||
|
|
cddd7e0e94 | ||
|
|
ecd117cd58 | ||
|
|
695ccfcc4d | ||
|
|
62dbce089f | ||
|
|
d3922905c9 |
37
.travis.yml
@@ -5,27 +5,24 @@ script:
|
|||||||
- "./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}"
|
||||||
- git config --global user.name "Wiki Updater"
|
|
||||||
- git clone --depth=1 --branch=master https://github.com/MindustryGame/wiki ../wiki
|
|
||||||
- git clone --depth=1 --branch=master https://github.com/Anuken/Mindustry-Wiki-Generator ../Mindustry-Wiki-Generator
|
|
||||||
- cd ../Mindustry-Wiki-Generator
|
|
||||||
- "./gradlew run"
|
|
||||||
- cd ../wiki
|
|
||||||
- git add .
|
|
||||||
- git commit -m "Update to match commit ${TRAVIS_COMMIT}"
|
|
||||||
- git push https://Anuken:${GH_PUSH_TOKEN}@github.com/MindustryGame/wiki
|
|
||||||
deploy:
|
deploy:
|
||||||
provider: releases
|
- provider: releases
|
||||||
skip_cleanup: true
|
skip_cleanup: true
|
||||||
draft: false
|
draft: false
|
||||||
api_key:
|
api_key:
|
||||||
secure: Cv5wFtWt62/A24EvSEQvMow7gKPbZ3oATEFPuSghhB2TQz1dA40Zee3Qvk4LFlpLrhYo4K0ZSczCZRGpR+hCd8+Dpww52bheYEvWuh3ZQfvu/fXtEx2j5PwP1qMpmIgSxETV/gkD7l9FImdh0VzktYiAvQfmi0bEocG9/D4QwjFpNat7iwBdcMiw1MvAygpdIWRsjiw0RKlB2mWarmoHhQ7Gu7qlU3j50uaEvcrtmU0pBUPggNQwQRv32i9NPvNFxrqqlUjDLIS8JFea99zCkp8BwYqbEvBIMzd+Qip1/stLJJA3+cDUClbsDtg8rAVetzpOrdLEEBmqShFe5MDl2yEHcsgpN9CFsyTaUfvB3P3rVjizvycMm42IsUkXQiarm5xTQ/TIA8Rd8AHiSKuweNCg1Fd5SFaRtKy8JVLXuxyfUccmyje6hhz2L4lS2Wfj3mAG7sqZUCXhWP79EKdGkiPOjKv4CwXEKmuH3BMVqPlNUZJr9Eg3sV1FG0h2l+MVOOnR635qdUbb49sYojYxVruMLX0BH1c4ZCu230m8CUoWA1Em1QNI75ya7+9Y5T6AsgWDVpBvdUo9fWNbdp+VQ0GskFQsJD5wtnxbcbHeFiERAgGBm7z6qt9u9LrQpBH+dsW52ADvYsu3L4nQEa+sdMHwTTwmGY+iUvsxu0DqxGg=
|
secure: Cv5wFtWt62/A24EvSEQvMow7gKPbZ3oATEFPuSghhB2TQz1dA40Zee3Qvk4LFlpLrhYo4K0ZSczCZRGpR+hCd8+Dpww52bheYEvWuh3ZQfvu/fXtEx2j5PwP1qMpmIgSxETV/gkD7l9FImdh0VzktYiAvQfmi0bEocG9/D4QwjFpNat7iwBdcMiw1MvAygpdIWRsjiw0RKlB2mWarmoHhQ7Gu7qlU3j50uaEvcrtmU0pBUPggNQwQRv32i9NPvNFxrqqlUjDLIS8JFea99zCkp8BwYqbEvBIMzd+Qip1/stLJJA3+cDUClbsDtg8rAVetzpOrdLEEBmqShFe5MDl2yEHcsgpN9CFsyTaUfvB3P3rVjizvycMm42IsUkXQiarm5xTQ/TIA8Rd8AHiSKuweNCg1Fd5SFaRtKy8JVLXuxyfUccmyje6hhz2L4lS2Wfj3mAG7sqZUCXhWP79EKdGkiPOjKv4CwXEKmuH3BMVqPlNUZJr9Eg3sV1FG0h2l+MVOOnR635qdUbb49sYojYxVruMLX0BH1c4ZCu230m8CUoWA1Em1QNI75ya7+9Y5T6AsgWDVpBvdUo9fWNbdp+VQ0GskFQsJD5wtnxbcbHeFiERAgGBm7z6qt9u9LrQpBH+dsW52ADvYsu3L4nQEa+sdMHwTTwmGY+iUvsxu0DqxGg=
|
||||||
file:
|
file:
|
||||||
- desktop/build/libs/desktop-release.jar
|
- desktop/build/libs/desktop-release.jar
|
||||||
- server/build/libs/server-release.jar
|
- server/build/libs/server-release.jar
|
||||||
on:
|
on:
|
||||||
repo: Anuken/Mindustry
|
repo: Anuken/Mindustry
|
||||||
tags: true
|
tags: true
|
||||||
|
- provider: script
|
||||||
|
script: bash update_wiki.sh
|
||||||
|
on:
|
||||||
|
repo: Anuken/Mindustry
|
||||||
|
tags: true
|
||||||
env:
|
env:
|
||||||
global:
|
global:
|
||||||
secure: TqlUl/ojjkCMVOGbCTKz7Cnr4F08UyWzY/CiJ0vvUOGJGZ1qm7XavAlDf5XT0egU4mvr37THubFO8vojbqmrmy0oZnYh3njKFA8axgyZ8PyKkjGHOfd0i6qyEWsOr9H90/2X8r3LwEeLaDFyHpu3wljIGBjweg53g2qwmDwCFa9UR80FJZ+xDB+rD6B3cXT0DTEkCoLZXLqXm0Y3HvBdSuBL1LR/FNb2BSxNq+tNLGiz1kdQZV5erausbbZypBoGxzz63xAnyz2kkFz73A8xQYVTzGbFodTPz7HM13GVZ5s43I03Y+HYyHBgBaSLziO2hi2kzVJccOwzBp7wS4fs1MqsFY5+IeWJ9k+hm89NiYT7+6zlEgoUMlIniny1qLqWTzx7btUeuC/y/h5TVBNgaV+z0jmHycHfeSyq5I+vmX4J8qe3wmaN8TcdqYKU5nIznOTk3CM5Fzu0Bs9vkCkOxmormmcjMFW1RbdOLc/hpZWZggsBA88sNEAI8eq+r5QEeqzeCx8YKoZDjdrsqvgLMc3El3gS9oMGxkn0Y/TEcqs9Tc4BXtTkqIA68hD0DYzlAxYjVbbkAI9Hh9lHNvV3Dr/oCkGXQ/HflM143kj1L3tSBZpqeqQE2XhngB5nqpS3OZTmZbMTQ8qD2luU18yaTGMLF5tJS/fdKPRx0gQ1kL8=
|
secure: TqlUl/ojjkCMVOGbCTKz7Cnr4F08UyWzY/CiJ0vvUOGJGZ1qm7XavAlDf5XT0egU4mvr37THubFO8vojbqmrmy0oZnYh3njKFA8axgyZ8PyKkjGHOfd0i6qyEWsOr9H90/2X8r3LwEeLaDFyHpu3wljIGBjweg53g2qwmDwCFa9UR80FJZ+xDB+rD6B3cXT0DTEkCoLZXLqXm0Y3HvBdSuBL1LR/FNb2BSxNq+tNLGiz1kdQZV5erausbbZypBoGxzz63xAnyz2kkFz73A8xQYVTzGbFodTPz7HM13GVZ5s43I03Y+HYyHBgBaSLziO2hi2kzVJccOwzBp7wS4fs1MqsFY5+IeWJ9k+hm89NiYT7+6zlEgoUMlIniny1qLqWTzx7btUeuC/y/h5TVBNgaV+z0jmHycHfeSyq5I+vmX4J8qe3wmaN8TcdqYKU5nIznOTk3CM5Fzu0Bs9vkCkOxmormmcjMFW1RbdOLc/hpZWZggsBA88sNEAI8eq+r5QEeqzeCx8YKoZDjdrsqvgLMc3El3gS9oMGxkn0Y/TEcqs9Tc4BXtTkqIA68hD0DYzlAxYjVbbkAI9Hh9lHNvV3Dr/oCkGXQ/HflM143kj1L3tSBZpqeqQE2XhngB5nqpS3OZTmZbMTQ8qD2luU18yaTGMLF5tJS/fdKPRx0gQ1kL8=
|
||||||
|
|||||||
14
build.gradle
@@ -35,7 +35,7 @@ allprojects{
|
|||||||
}
|
}
|
||||||
|
|
||||||
getArcHash = {
|
getArcHash = {
|
||||||
//get latest commit hash from gtihub since JITPack's '-snapshot' version doesn't work correctly
|
//get latest commit hash from github since JITPack's '-snapshot' version doesn't work correctly
|
||||||
if(arcHash == null){
|
if(arcHash == null){
|
||||||
try{
|
try{
|
||||||
arcHash = 'git ls-remote https://github.com/Anuken/Arc.git'.execute().text.split("\t")[0]
|
arcHash = 'git ls-remote https://github.com/Anuken/Arc.git'.execute().text.split("\t")[0]
|
||||||
@@ -172,12 +172,12 @@ project(":ios"){
|
|||||||
project(":core"){
|
project(":core"){
|
||||||
apply plugin: "java"
|
apply plugin: "java"
|
||||||
|
|
||||||
task finish{
|
task preGen{
|
||||||
generateLocales()
|
generateLocales()
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies{
|
dependencies{
|
||||||
if(System.properties["user.name"] == "anuke" && !System.properties["os.name"].contains("Mac")){
|
if(System.properties["user.name"] == "anuke"){
|
||||||
task cleanGen{
|
task cleanGen{
|
||||||
doFirst{
|
doFirst{
|
||||||
delete{
|
delete{
|
||||||
@@ -202,6 +202,8 @@ project(":core"){
|
|||||||
compileJava.finalizedBy(copyGen)
|
compileJava.finalizedBy(copyGen)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
compileJava.dependsOn(preGen)
|
||||||
|
|
||||||
compile arcModule("arc-core")
|
compile arcModule("arc-core")
|
||||||
compile arcModule("extensions:freetype")
|
compile arcModule("extensions:freetype")
|
||||||
compile arcModule("extensions:arcnet")
|
compile arcModule("extensions:arcnet")
|
||||||
@@ -244,6 +246,12 @@ project(":tools"){
|
|||||||
|
|
||||||
dependencies{
|
dependencies{
|
||||||
compile project(":core")
|
compile project(":core")
|
||||||
|
|
||||||
|
//for render tests
|
||||||
|
compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
|
||||||
|
compile "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-desktop"
|
||||||
|
|
||||||
|
compile arcModule("backends:backend-lwjgl3")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 199 B After Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 224 B After Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 203 B After Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 358 B After Width: | Height: | Size: 4.5 KiB |
|
Before Width: | Height: | Size: 389 B After Width: | Height: | Size: 4.5 KiB |
|
Before Width: | Height: | Size: 174 B After Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 253 B After Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 268 B After Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 347 B After Width: | Height: | Size: 5.3 KiB |
|
Before Width: | Height: | Size: 347 B After Width: | Height: | Size: 5.5 KiB |
|
Before Width: | Height: | Size: 125 B After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 138 B After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 201 B After Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 165 B After Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 165 B After Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 175 B After Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 197 B After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 127 B After Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 155 B After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 295 B After Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 461 B After Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 276 B After Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 273 B After Width: | Height: | Size: 2.5 KiB |
|
Before Width: | Height: | Size: 278 B After Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 427 B After Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 291 B After Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 111 B After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 464 B After Width: | Height: | Size: 2.4 KiB |
|
Before Width: | Height: | Size: 541 B After Width: | Height: | Size: 2.6 KiB |
|
Before Width: | Height: | Size: 310 B After Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 331 B After Width: | Height: | Size: 2.5 KiB |
|
Before Width: | Height: | Size: 294 B After Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 280 B After Width: | Height: | Size: 2.4 KiB |
|
Before Width: | Height: | Size: 317 B After Width: | Height: | Size: 2.4 KiB |
|
Before Width: | Height: | Size: 196 B After Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 339 B After Width: | Height: | Size: 2.8 KiB |
|
Before Width: | Height: | Size: 567 B After Width: | Height: | Size: 4.6 KiB |
|
Before Width: | Height: | Size: 889 B After Width: | Height: | Size: 5.3 KiB |
|
Before Width: | Height: | Size: 167 B |
|
Before Width: | Height: | Size: 114 B |
|
Before Width: | Height: | Size: 160 B |
|
Before Width: | Height: | Size: 141 B |
|
Before Width: | Height: | Size: 151 B |
|
Before Width: | Height: | Size: 156 B |
|
Before Width: | Height: | Size: 139 B |
|
Before Width: | Height: | Size: 148 B After Width: | Height: | Size: 3.7 KiB |
|
Before Width: | Height: | Size: 114 B |
|
Before Width: | Height: | Size: 191 B |
|
Before Width: | Height: | Size: 181 B |
|
Before Width: | Height: | Size: 157 B After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 129 B After Width: | Height: | Size: 129 B |
|
Before Width: | Height: | Size: 107 B |
|
Before Width: | Height: | Size: 141 B After Width: | Height: | Size: 107 B |
BIN
core/assets-raw/sprites/ui/icons/icon-defense.png
Normal file
|
After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 135 B After Width: | Height: | Size: 3.5 KiB |
BIN
core/assets-raw/sprites/ui/icons/icon-distribution.png
Normal file
|
After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 143 B After Width: | Height: | Size: 3.6 KiB |
|
Before Width: | Height: | Size: 136 B After Width: | Height: | Size: 2.5 KiB |
BIN
core/assets-raw/sprites/ui/icons/icon-effect.png
Normal file
|
After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 120 B |
|
Before Width: | Height: | Size: 126 B After Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 172 B |
|
Before Width: | Height: | Size: 143 B After Width: | Height: | Size: 3.0 KiB |
|
Before Width: | Height: | Size: 133 B After Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 123 B |
|
Before Width: | Height: | Size: 113 B |
|
Before Width: | Height: | Size: 118 B After Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 138 B After Width: | Height: | Size: 2.6 KiB |
|
Before Width: | Height: | Size: 91 B |
|
Before Width: | Height: | Size: 110 B After Width: | Height: | Size: 110 B |
|
Before Width: | Height: | Size: 161 B After Width: | Height: | Size: 161 B |
|
Before Width: | Height: | Size: 139 B After Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 126 B After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 120 B |
|
Before Width: | Height: | Size: 119 B After Width: | Height: | Size: 2.4 KiB |
|
Before Width: | Height: | Size: 115 B |
|
Before Width: | Height: | Size: 95 B |
|
Before Width: | Height: | Size: 103 B |
|
Before Width: | Height: | Size: 104 B |
|
Before Width: | Height: | Size: 107 B |
|
Before Width: | Height: | Size: 135 B After Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 131 B After Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 231 B |
|
Before Width: | Height: | Size: 98 B |
BIN
core/assets-raw/sprites/ui/icons/icon-power.png
Normal file
|
After Width: | Height: | Size: 3.5 KiB |
|
Before Width: | Height: | Size: 152 B After Width: | Height: | Size: 152 B |
|
Before Width: | Height: | Size: 127 B After Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 120 B After Width: | Height: | Size: 3.9 KiB |
|
Before Width: | Height: | Size: 138 B After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 150 B After Width: | Height: | Size: 4.5 KiB |
|
Before Width: | Height: | Size: 118 B |
|
Before Width: | Height: | Size: 117 B |
|
Before Width: | Height: | Size: 250 B |
BIN
core/assets-raw/sprites/ui/icons/icon-turret.png
Normal file
|
After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 126 B After Width: | Height: | Size: 1.3 KiB |
BIN
core/assets-raw/sprites/ui/icons/icon-units.png
Normal file
|
After Width: | Height: | Size: 1.5 KiB |