From cb60556ac0c8a347a9b043260f98d3e33dac8559 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 26 Aug 2019 12:23:09 -0400 Subject: [PATCH 1/3] Disabled structure mirroring --- core/src/io/anuke/mindustry/maps/filters/MirrorFilter.java | 4 +++- ios/build.gradle | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/core/src/io/anuke/mindustry/maps/filters/MirrorFilter.java b/core/src/io/anuke/mindustry/maps/filters/MirrorFilter.java index f3c9062b5e..27fc101b5e 100644 --- a/core/src/io/anuke/mindustry/maps/filters/MirrorFilter.java +++ b/core/src/io/anuke/mindustry/maps/filters/MirrorFilter.java @@ -33,7 +33,9 @@ public class MirrorFilter extends GenerateFilter{ mirror(v3, v1.x, v1.y, v2.x, v2.y); Tile tile = in.tile(v3.x, v3.y); in.floor = tile.floor(); - in.block = tile.block(); + if(!tile.block().synthetic()){ + in.block = tile.block(); + } in.ore = tile.overlay(); } } diff --git a/ios/build.gradle b/ios/build.gradle index 6fc88382bb..94e198be83 100644 --- a/ios/build.gradle +++ b/ios/build.gradle @@ -36,6 +36,12 @@ task copyAssets(){ } } +task deploy{ + dependsOn copyAssets + dependsOn createIPA +} + + build.dependsOn copyAssets launchIPhoneSimulator.dependsOn build From 600a2b5ad78d6abbfc2be4f89b1f6e391d9dc7df Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 26 Aug 2019 12:24:42 -0400 Subject: [PATCH 2/3] Fixed mend projector place offset --- .../io/anuke/mindustry/world/blocks/defense/MendProjector.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java b/core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java index 7721d95510..d2149dcbab 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java @@ -101,7 +101,7 @@ public class MendProjector extends Block{ @Override public void drawPlace(int x, int y, int rotation, boolean valid){ - Drawf.dashCircle(x * tilesize, y * tilesize, range, Pal.accent); + Drawf.dashCircle(x * tilesize + offset(), y * tilesize + offset(), range, Pal.accent); } @Override From 1dfa0d08dead019780dd0688a57ecfd45a32fc0c Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 26 Aug 2019 16:55:22 -0400 Subject: [PATCH 3/3] Testing out Github Actions workflow --- .github/workflows/gradle.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/workflows/gradle.yml diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml new file mode 100644 index 0000000000..b23caac61e --- /dev/null +++ b/.github/workflows/gradle.yml @@ -0,0 +1,17 @@ +name: Java CI + +on: [push] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + - name: Set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: Run unit tests with gradle + run: ./gradlew test