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

Travis testing

Browse Source
This commit is contained in:
Anuken
2019-09-12 17:19:01 -04:00
parent fb4faa15bb
commit 2231062c19
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -10,6 +10,8 @@ script:
- git clone --depth=1 --branch=master https://github.com/Anuken/MindustryBuilds ../MindustryBuilds - git clone --depth=1 --branch=master https://github.com/Anuken/MindustryBuilds ../MindustryBuilds
- cd ../MindustryBuilds - cd ../MindustryBuilds
- echo ${TRAVIS_BUILD_NUMBER} > version.txt - echo ${TRAVIS_BUILD_NUMBER} > version.txt
- TEST_TAG=v9999
- echo versionName=4-fdroid-${TEST_TAG}$'\n'versionCode=${TEST_TAG:1} > version_fdroid.txt
- git add . - git add .
- git commit -m "Updating to build ${TRAVIS_BUILD_NUMBER}" - git commit -m "Updating to build ${TRAVIS_BUILD_NUMBER}"
- git tag ${TRAVIS_BUILD_NUMBER} - git tag ${TRAVIS_BUILD_NUMBER}

BIN
core/assets/maps/stainedMountains.msav
View File

Binary file not shown.

2
core/src/io/anuke/mindustry/core/Renderer.java
View File

@@ -267,7 +267,7 @@ public class Renderer implements ApplicationListener{
} }
overlays.drawBottom(); overlays.drawBottom();
playerGroup.draw(p -> true, Player::drawBuildRequests); playerGroup.draw(p -> p.isLocal, Player::drawBuildRequests);
if(shieldGroup.countInBounds() > 0){ if(shieldGroup.countInBounds() > 0){
if(settings.getBool("animatedshields") && Shaders.shield != null){ if(settings.getBool("animatedshields") && Shaders.shield != null){

9
core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java
View File

@@ -11,7 +11,6 @@ import io.anuke.mindustry.entities.type.*;
import io.anuke.mindustry.game.EventType.*; import io.anuke.mindustry.game.EventType.*;
import io.anuke.mindustry.gen.*; import io.anuke.mindustry.gen.*;
import io.anuke.mindustry.graphics.*; import io.anuke.mindustry.graphics.*;
import io.anuke.mindustry.net.Net;
import io.anuke.mindustry.type.*; import io.anuke.mindustry.type.*;
import io.anuke.mindustry.world.*; import io.anuke.mindustry.world.*;
import io.anuke.mindustry.world.blocks.*; import io.anuke.mindustry.world.blocks.*;
@@ -138,10 +137,10 @@ public class CoreBlock extends StorageBlock{
} }
public class CoreEntity extends TileEntity implements SpawnerTrait{ public class CoreEntity extends TileEntity implements SpawnerTrait{
public Player spawnPlayer; protected Player spawnPlayer;
float progress; protected float progress;
float time; protected float time;
float heat; protected float heat;
@Override @Override
public boolean hasUnit(Unit unit){ public boolean hasUnit(Unit unit){