diff --git a/.travis.yml b/.travis.yml
index c7003323..85abbc20 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -111,7 +111,7 @@ jobs:
env: YARN_GPG=no
before_install:
- choco install git-lfs -y -f || echo "0" # choco fails but git-lfs is still installed
- - choco install ffmpeg
+ - choco install ffmpeg --version=4.2.3
- export PATH=/C/ProgramData/chocolatey/lib/ffmpeg/tools/ffmpeg/bin:$PATH
- wget https://github.com/moiamond/docker-ffmpeg-base-windowsservercore/raw/master/System32/avicap32.dll -P /C/Windows/System32/
- wget https://github.com/moiamond/docker-ffmpeg-base-windowsservercore/raw/master/System32/msvfw32.dll -P /C/Windows/System32/
@@ -129,7 +129,7 @@ jobs:
env: YARN_GPG=no
before_install:
- choco install git-lfs -y -f || echo "0" # choco fails but git-lfs is still installed
- - choco install ffmpeg
+ - choco install ffmpeg --version=4.2.3
- choco install wget
- export PATH=/C/ProgramData/chocolatey/lib/ffmpeg/tools/ffmpeg/bin:$PATH
- wget https://github.com/moiamond/docker-ffmpeg-base-windowsservercore/raw/master/System32/avicap32.dll -P /C/Windows/System32/
diff --git a/README.md b/README.md
index 97087812..5a5847aa 100644
--- a/README.md
+++ b/README.md
@@ -17,8 +17,9 @@ Your goal is to produce shapes by cutting, rotating, merging and painting parts
- Run `git lfs pull` to download sound assets
- Make sure `ffmpeg` is on your path
- Install Node.js and Yarn
-- Run `yarn` in the root folder, then run `yarn` in the `gulp/` folder
-- Cd into `gulp` and run `yarn gulp` - it should now open in your browser
+- Run `yarn` in the root folder
+- Cd into `gulp` folder
+- Run `yarn` and then `yarn gulp` - it should now open in your browser
**Notice**: This will produce a debug build with several debugging flags enabled. If you want to disable them, modify `config.js`.
diff --git a/artwork/.gitignore b/artwork/.gitignore
deleted file mode 100644
index fc14a67a..00000000
--- a/artwork/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-trailer/
\ No newline at end of file
diff --git a/artwork/README.md b/artwork/README.md
new file mode 100644
index 00000000..dab59a98
--- /dev/null
+++ b/artwork/README.md
@@ -0,0 +1,3 @@
+The artwork can be found here:
+
+https://github.com/tobspr/shapez.io-artwork
diff --git a/artwork/buildings/RGB_Icon.psd b/artwork/buildings/RGB_Icon.psd
deleted file mode 100644
index ded296c4..00000000
--- a/artwork/buildings/RGB_Icon.psd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5c424731dff98885b13a360f42933bc0f43635e9b69b62950c4befbfbd21663e
-size 230312
diff --git a/artwork/buildings/belt.psd b/artwork/buildings/belt.psd
deleted file mode 100644
index 980c52d9..00000000
--- a/artwork/buildings/belt.psd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:377f61c6947953c3df4f944397e51c87d318f80bb91ba4913de4a1da7f94a7cc
-size 379425
diff --git a/artwork/buildings/belt_minimap_shapes.psd b/artwork/buildings/belt_minimap_shapes.psd
deleted file mode 100644
index 6da7cd72..00000000
--- a/artwork/buildings/belt_minimap_shapes.psd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:98d30b113681fcf248ec6c81b53d89fb8006e414ec68862b452a23c216ebfe85
-size 22652
diff --git a/artwork/buildings/buildings_1x1.psd b/artwork/buildings/buildings_1x1.psd
deleted file mode 100644
index c4b1abc3..00000000
--- a/artwork/buildings/buildings_1x1.psd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a83f85517a44fa590a7a5e72b90736ba52065712e537f9eaa0d53aefd6a42457
-size 765795
diff --git a/artwork/buildings/buildings_2x1.psd b/artwork/buildings/buildings_2x1.psd
deleted file mode 100644
index 117507a9..00000000
--- a/artwork/buildings/buildings_2x1.psd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7d05e340acb18f7b6b6f05fa7536f14179cda54a9ead0923fbb8e39c68da148c
-size 703229
diff --git a/artwork/buildings/buildings_2x2.psd b/artwork/buildings/buildings_2x2.psd
deleted file mode 100644
index 00f31093..00000000
--- a/artwork/buildings/buildings_2x2.psd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9d8a4254944d83882513a062e77406419d94c3058a7ad657a5a318d45cc5443f
-size 902131
diff --git a/artwork/buildings/buildings_3x3.psd b/artwork/buildings/buildings_3x3.psd
deleted file mode 100644
index 73ad2e91..00000000
--- a/artwork/buildings/buildings_3x3.psd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:573954846ee7adff355373ed22ce4cef90c5a1d4b7af928944c2110f6b5120f5
-size 595603
diff --git a/artwork/buildings/buildings_4x1.psd b/artwork/buildings/buildings_4x1.psd
deleted file mode 100644
index ffd3decb..00000000
--- a/artwork/buildings/buildings_4x1.psd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cc99dc14248306295ce17761c0cadf369a713ed65e864554e374d20ea9d571af
-size 778507
diff --git a/artwork/buildings/extractor.psd b/artwork/buildings/extractor.psd
deleted file mode 100644
index c0dfd420..00000000
--- a/artwork/buildings/extractor.psd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4a4dd431e7ff12f72eb54545c10ba1d5e6dd16119fe1430864a4e449391adebb
-size 216421
diff --git a/artwork/buildings/hub.psd b/artwork/buildings/hub.psd
deleted file mode 100644
index d025b0c4..00000000
--- a/artwork/buildings/hub.psd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:95a342ce958586280b9ebc69a41d5cc950915b787de83ddaf101dbb852bdaf86
-size 1179560
diff --git a/artwork/gamedistribution/1280x550.jpg b/artwork/gamedistribution/1280x550.jpg
deleted file mode 100644
index 9f5c0f44..00000000
Binary files a/artwork/gamedistribution/1280x550.jpg and /dev/null differ
diff --git a/artwork/gamedistribution/1280x550.png b/artwork/gamedistribution/1280x550.png
deleted file mode 100644
index 5086af18..00000000
Binary files a/artwork/gamedistribution/1280x550.png and /dev/null differ
diff --git a/artwork/gamedistribution/1280x720.jpg b/artwork/gamedistribution/1280x720.jpg
deleted file mode 100644
index ea2bb545..00000000
Binary files a/artwork/gamedistribution/1280x720.jpg and /dev/null differ
diff --git a/artwork/gamedistribution/1280x720.png b/artwork/gamedistribution/1280x720.png
deleted file mode 100644
index 191fe91a..00000000
Binary files a/artwork/gamedistribution/1280x720.png and /dev/null differ
diff --git a/artwork/gamedistribution/1280x720.psd b/artwork/gamedistribution/1280x720.psd
deleted file mode 100644
index f6bae3e1..00000000
--- a/artwork/gamedistribution/1280x720.psd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ccae5926d00eee9dd0686b1d415f30e302c53e25d8ca1c9d5517347510cea2b5
-size 11758220
diff --git a/artwork/gamedistribution/512x340.jpg b/artwork/gamedistribution/512x340.jpg
deleted file mode 100644
index d34f34af..00000000
Binary files a/artwork/gamedistribution/512x340.jpg and /dev/null differ
diff --git a/artwork/gamedistribution/512x340.png b/artwork/gamedistribution/512x340.png
deleted file mode 100644
index 33eb371c..00000000
Binary files a/artwork/gamedistribution/512x340.png and /dev/null differ
diff --git a/artwork/gamedistribution/512x384.jpg b/artwork/gamedistribution/512x384.jpg
deleted file mode 100644
index 77d3b3ad..00000000
Binary files a/artwork/gamedistribution/512x384.jpg and /dev/null differ
diff --git a/artwork/gamedistribution/512x384.png b/artwork/gamedistribution/512x384.png
deleted file mode 100644
index 65fd95c4..00000000
Binary files a/artwork/gamedistribution/512x384.png and /dev/null differ
diff --git a/artwork/gamedistribution/512x384.psd b/artwork/gamedistribution/512x384.psd
deleted file mode 100644
index 4c4429de..00000000
--- a/artwork/gamedistribution/512x384.psd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3ac7dc426f618215bf8e62526dfe38d8076c439849ef341f5545561c551625d4
-size 10266632
diff --git a/artwork/gamedistribution/512x512.jpg b/artwork/gamedistribution/512x512.jpg
deleted file mode 100644
index db293db4..00000000
Binary files a/artwork/gamedistribution/512x512.jpg and /dev/null differ
diff --git a/artwork/gamedistribution/512x512.png b/artwork/gamedistribution/512x512.png
deleted file mode 100644
index 81c8b737..00000000
Binary files a/artwork/gamedistribution/512x512.png and /dev/null differ
diff --git a/artwork/gamedistribution/iframe/index.html b/artwork/gamedistribution/iframe/index.html
deleted file mode 100644
index ac308b68..00000000
--- a/artwork/gamedistribution/iframe/index.html
+++ /dev/null
@@ -1,85 +0,0 @@
-
-
-
- shapez.io
-
-
-
-
-
-
-
-
-
diff --git a/artwork/gamedistribution/iframe/manifest.json b/artwork/gamedistribution/iframe/manifest.json
deleted file mode 100644
index 539af604..00000000
--- a/artwork/gamedistribution/iframe/manifest.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "name": "shapez.io",
- "short_name": "shapez.io",
- "start_url": "index.html",
- "display": "standalone",
- "background_color": "#222428",
- "description": "shapez.io"
-}
diff --git a/artwork/icon-standalone.ico b/artwork/icon-standalone.ico
deleted file mode 100644
index 54721ebf..00000000
Binary files a/artwork/icon-standalone.ico and /dev/null differ
diff --git a/artwork/icon-standalone.png b/artwork/icon-standalone.png
deleted file mode 100644
index 44994cc9..00000000
Binary files a/artwork/icon-standalone.png and /dev/null differ
diff --git a/artwork/icon-standalone.psd b/artwork/icon-standalone.psd
deleted file mode 100644
index a972d472..00000000
--- a/artwork/icon-standalone.psd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1a0062684305ff8ac875812f39e565fe00f27b537212b2ad70d68c27fb2ae6f8
-size 224962
diff --git a/artwork/icon.ico b/artwork/icon.ico
deleted file mode 100644
index 4ec3676d..00000000
Binary files a/artwork/icon.ico and /dev/null differ
diff --git a/artwork/icon.png b/artwork/icon.png
deleted file mode 100644
index 64c36eb8..00000000
Binary files a/artwork/icon.png and /dev/null differ
diff --git a/artwork/icon.psd b/artwork/icon.psd
deleted file mode 100644
index 1e9a7eae..00000000
--- a/artwork/icon.psd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:22b15510bbe17ebe46b899952fe7cb260271c103e66759544aef0a7fa963d319
-size 209192
diff --git a/artwork/installer/installer.ifp b/artwork/installer/installer.ifp
deleted file mode 100644
index 98c09a1e..00000000
Binary files a/artwork/installer/installer.ifp and /dev/null differ
diff --git a/artwork/installer/wizard.bmp b/artwork/installer/wizard.bmp
deleted file mode 100644
index ae9c43b6..00000000
Binary files a/artwork/installer/wizard.bmp and /dev/null differ
diff --git a/artwork/installer/wizard.psd b/artwork/installer/wizard.psd
deleted file mode 100644
index 9e74b727..00000000
--- a/artwork/installer/wizard.psd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f3fa43e6a02c92ac66717aaedde15c41b6694c390165c52a43e5b794b73bc895
-size 1091078
diff --git a/artwork/intial_concept/README.md b/artwork/intial_concept/README.md
deleted file mode 100644
index 012abdee..00000000
--- a/artwork/intial_concept/README.md
+++ /dev/null
@@ -1 +0,0 @@
-This is the initial concept which I made and was the birth of shapez.io
diff --git a/artwork/intial_concept/concept-v2.png b/artwork/intial_concept/concept-v2.png
deleted file mode 100644
index 2072fc47..00000000
Binary files a/artwork/intial_concept/concept-v2.png and /dev/null differ
diff --git a/artwork/intial_concept/concept.png b/artwork/intial_concept/concept.png
deleted file mode 100644
index 3c8468df..00000000
Binary files a/artwork/intial_concept/concept.png and /dev/null differ
diff --git a/artwork/intial_concept/concept.psd b/artwork/intial_concept/concept.psd
deleted file mode 100644
index b1f2218d..00000000
--- a/artwork/intial_concept/concept.psd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3c5b380e08ed27a1d7c47f2e7c686963a1837bfebce29cce180a741674eb4800
-size 1533043
diff --git a/artwork/itch.io/background.jpg b/artwork/itch.io/background.jpg
deleted file mode 100644
index 524b6358..00000000
Binary files a/artwork/itch.io/background.jpg and /dev/null differ
diff --git a/artwork/itch.io/banner.png b/artwork/itch.io/banner.png
deleted file mode 100644
index 17488ee2..00000000
Binary files a/artwork/itch.io/banner.png and /dev/null differ
diff --git a/artwork/itch.io/banner.psd b/artwork/itch.io/banner.psd
deleted file mode 100644
index c4203db4..00000000
--- a/artwork/itch.io/banner.psd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c334d77dabdc40fef4ece56ccef9eaa59b5b6b9381817c234f9bf07d00e676e5
-size 12721033
diff --git a/artwork/itch.io/bg.png b/artwork/itch.io/bg.png
deleted file mode 100644
index 425e94d8..00000000
Binary files a/artwork/itch.io/bg.png and /dev/null differ
diff --git a/artwork/itch.io/full-page.psd b/artwork/itch.io/full-page.psd
deleted file mode 100644
index e33a1b91..00000000
--- a/artwork/itch.io/full-page.psd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:965ea97e2390927132f2463118ec7b8dd874b838fc770dc7f0ee76bb48ef0527
-size 21376906
diff --git a/artwork/itch.io/screenshots/1.png b/artwork/itch.io/screenshots/1.png
deleted file mode 100644
index 75214ff7..00000000
Binary files a/artwork/itch.io/screenshots/1.png and /dev/null differ
diff --git a/artwork/itch.io/screenshots/10.png b/artwork/itch.io/screenshots/10.png
deleted file mode 100644
index 87308cee..00000000
Binary files a/artwork/itch.io/screenshots/10.png and /dev/null differ
diff --git a/artwork/itch.io/screenshots/11.png b/artwork/itch.io/screenshots/11.png
deleted file mode 100644
index d2de5570..00000000
Binary files a/artwork/itch.io/screenshots/11.png and /dev/null differ
diff --git a/artwork/itch.io/screenshots/2.png b/artwork/itch.io/screenshots/2.png
deleted file mode 100644
index 9dd0fc6f..00000000
Binary files a/artwork/itch.io/screenshots/2.png and /dev/null differ
diff --git a/artwork/itch.io/screenshots/3.png b/artwork/itch.io/screenshots/3.png
deleted file mode 100644
index af0d0ab3..00000000
Binary files a/artwork/itch.io/screenshots/3.png and /dev/null differ
diff --git a/artwork/itch.io/screenshots/4.png b/artwork/itch.io/screenshots/4.png
deleted file mode 100644
index f4e34386..00000000
Binary files a/artwork/itch.io/screenshots/4.png and /dev/null differ
diff --git a/artwork/itch.io/screenshots/5.png b/artwork/itch.io/screenshots/5.png
deleted file mode 100644
index b456d816..00000000
Binary files a/artwork/itch.io/screenshots/5.png and /dev/null differ
diff --git a/artwork/itch.io/screenshots/6.png b/artwork/itch.io/screenshots/6.png
deleted file mode 100644
index bdbbaccf..00000000
Binary files a/artwork/itch.io/screenshots/6.png and /dev/null differ
diff --git a/artwork/itch.io/screenshots/7.png b/artwork/itch.io/screenshots/7.png
deleted file mode 100644
index 0df86bcc..00000000
Binary files a/artwork/itch.io/screenshots/7.png and /dev/null differ
diff --git a/artwork/itch.io/screenshots/8.png b/artwork/itch.io/screenshots/8.png
deleted file mode 100644
index 1b3bbdc2..00000000
Binary files a/artwork/itch.io/screenshots/8.png and /dev/null differ
diff --git a/artwork/itch.io/screenshots/9.png b/artwork/itch.io/screenshots/9.png
deleted file mode 100644
index d9ada467..00000000
Binary files a/artwork/itch.io/screenshots/9.png and /dev/null differ
diff --git a/artwork/logo.png b/artwork/logo.png
deleted file mode 100644
index 75dd3a35..00000000
Binary files a/artwork/logo.png and /dev/null differ
diff --git a/artwork/logo.psd b/artwork/logo.psd
deleted file mode 100644
index 04575aa1..00000000
--- a/artwork/logo.psd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:16f131c43e555211929bfd90468c554416acf9a54f2172dd377bbe4f02b43227
-size 228133
diff --git a/artwork/promo/yorgio-promo.png b/artwork/promo/yorgio-promo.png
deleted file mode 100644
index 60ebd785..00000000
Binary files a/artwork/promo/yorgio-promo.png and /dev/null differ
diff --git a/artwork/promo/yorgio-promo.psd b/artwork/promo/yorgio-promo.psd
deleted file mode 100644
index 589bdaa4..00000000
--- a/artwork/promo/yorgio-promo.psd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ab0287f69a54c57e725e239a1a6ef35c79d60f4217184fcde7b27ab4d1c0ef60
-size 8866812
diff --git a/artwork/reddit/banner.png b/artwork/reddit/banner.png
deleted file mode 100644
index 3982791f..00000000
Binary files a/artwork/reddit/banner.png and /dev/null differ
diff --git a/artwork/steam/184x69.png b/artwork/steam/184x69.png
deleted file mode 100644
index 6e0a3c0a..00000000
Binary files a/artwork/steam/184x69.png and /dev/null differ
diff --git a/artwork/steam/1920x620.png b/artwork/steam/1920x620.png
deleted file mode 100644
index 7f659383..00000000
Binary files a/artwork/steam/1920x620.png and /dev/null differ
diff --git a/artwork/steam/1920x620.psd b/artwork/steam/1920x620.psd
deleted file mode 100644
index fd66178b..00000000
--- a/artwork/steam/1920x620.psd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b909ed70673b45c3f651a6325f5d0c27d1bfd982bfbc41f964075135c6fede76
-size 23705912
diff --git a/artwork/steam/231x87.png b/artwork/steam/231x87.png
deleted file mode 100644
index 73d17031..00000000
Binary files a/artwork/steam/231x87.png and /dev/null differ
diff --git a/artwork/steam/32x32.png b/artwork/steam/32x32.png
deleted file mode 100644
index 4c1cca09..00000000
Binary files a/artwork/steam/32x32.png and /dev/null differ
diff --git a/artwork/steam/32x32.psd b/artwork/steam/32x32.psd
deleted file mode 100644
index 9a3c3914..00000000
--- a/artwork/steam/32x32.psd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f09b39f525b2d1ed094ceec73b792ce75d593e769254154cf32f4df2a429f2ba
-size 52046
diff --git a/artwork/steam/444x208.png b/artwork/steam/444x208.png
deleted file mode 100644
index e0e7216d..00000000
Binary files a/artwork/steam/444x208.png and /dev/null differ
diff --git a/artwork/steam/460x215.png b/artwork/steam/460x215.png
deleted file mode 100644
index 69f58a94..00000000
Binary files a/artwork/steam/460x215.png and /dev/null differ
diff --git a/artwork/steam/460x215.psd b/artwork/steam/460x215.psd
deleted file mode 100644
index 4833668b..00000000
--- a/artwork/steam/460x215.psd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:12df556b43bb303aa0318a6adff70ff3acd9ac68693ebabf3fab094efecca810
-size 6757896
diff --git a/artwork/steam/600x900.png b/artwork/steam/600x900.png
deleted file mode 100644
index 3064b240..00000000
Binary files a/artwork/steam/600x900.png and /dev/null differ
diff --git a/artwork/steam/600x900.psd b/artwork/steam/600x900.psd
deleted file mode 100644
index b0bffc9e..00000000
--- a/artwork/steam/600x900.psd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:42015852b1abec0541c10f71acdde226170b60de7b7737282485b738022d8982
-size 11018053
diff --git a/artwork/steam/616x353.png b/artwork/steam/616x353.png
deleted file mode 100644
index 58f9352e..00000000
Binary files a/artwork/steam/616x353.png and /dev/null differ
diff --git a/artwork/steam/616x353.psd b/artwork/steam/616x353.psd
deleted file mode 100644
index ba232882..00000000
--- a/artwork/steam/616x353.psd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5a5a83129016b75d11af487f42b4bee3d85a48d2894b681d076724c9512aeb31
-size 10334692
diff --git a/artwork/steam/640x360.png b/artwork/steam/640x360.png
deleted file mode 100644
index 5f70fb36..00000000
Binary files a/artwork/steam/640x360.png and /dev/null differ
diff --git a/artwork/steam/640x360.psd b/artwork/steam/640x360.psd
deleted file mode 100644
index 958e9e03..00000000
--- a/artwork/steam/640x360.psd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:20ca95838254a46d4c23f4c24b7877eaad60aa1aeed3df087b242f389e428774
-size 156876
diff --git a/artwork/steam/announcement-cover.png b/artwork/steam/announcement-cover.png
deleted file mode 100644
index 60af9100..00000000
Binary files a/artwork/steam/announcement-cover.png and /dev/null differ
diff --git a/artwork/steam/announcement.png b/artwork/steam/announcement.png
deleted file mode 100644
index cc0861db..00000000
Binary files a/artwork/steam/announcement.png and /dev/null differ
diff --git a/artwork/steam/announcement.psd b/artwork/steam/announcement.psd
deleted file mode 100644
index 518a49ac..00000000
--- a/artwork/steam/announcement.psd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ae83b8805191eeba13016e40216fc4781ac3958e6886769ce8677ea28370d13e
-size 239706
diff --git a/artwork/steam/devlog.png b/artwork/steam/devlog.png
deleted file mode 100644
index 9abdefe1..00000000
Binary files a/artwork/steam/devlog.png and /dev/null differ
diff --git a/artwork/steam/devlog.psd b/artwork/steam/devlog.psd
deleted file mode 100644
index 7cd9b0a7..00000000
--- a/artwork/steam/devlog.psd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:40d458f800344d819ad4d3f38943f53f399258369ee5c20f6583d1b49847465f
-size 188255
diff --git a/artwork/steam/screenshots/1.png b/artwork/steam/screenshots/1.png
deleted file mode 100644
index ff85b1dc..00000000
Binary files a/artwork/steam/screenshots/1.png and /dev/null differ
diff --git a/artwork/steam/screenshots/10.png b/artwork/steam/screenshots/10.png
deleted file mode 100644
index f7afe0a8..00000000
Binary files a/artwork/steam/screenshots/10.png and /dev/null differ
diff --git a/artwork/steam/screenshots/11.png b/artwork/steam/screenshots/11.png
deleted file mode 100644
index 6ef87b38..00000000
Binary files a/artwork/steam/screenshots/11.png and /dev/null differ
diff --git a/artwork/steam/screenshots/2.png b/artwork/steam/screenshots/2.png
deleted file mode 100644
index fd3b5d1c..00000000
Binary files a/artwork/steam/screenshots/2.png and /dev/null differ
diff --git a/artwork/steam/screenshots/3.png b/artwork/steam/screenshots/3.png
deleted file mode 100644
index 4b6e5d6a..00000000
Binary files a/artwork/steam/screenshots/3.png and /dev/null differ
diff --git a/artwork/steam/screenshots/4.png b/artwork/steam/screenshots/4.png
deleted file mode 100644
index 4ee5bfdc..00000000
Binary files a/artwork/steam/screenshots/4.png and /dev/null differ
diff --git a/artwork/steam/screenshots/5.png b/artwork/steam/screenshots/5.png
deleted file mode 100644
index cb2fa743..00000000
Binary files a/artwork/steam/screenshots/5.png and /dev/null differ
diff --git a/artwork/steam/screenshots/6.png b/artwork/steam/screenshots/6.png
deleted file mode 100644
index e0182e70..00000000
Binary files a/artwork/steam/screenshots/6.png and /dev/null differ
diff --git a/artwork/steam/screenshots/7.png b/artwork/steam/screenshots/7.png
deleted file mode 100644
index 9da8d817..00000000
Binary files a/artwork/steam/screenshots/7.png and /dev/null differ
diff --git a/artwork/steam/screenshots/8.png b/artwork/steam/screenshots/8.png
deleted file mode 100644
index f09363f7..00000000
Binary files a/artwork/steam/screenshots/8.png and /dev/null differ
diff --git a/artwork/steam/screenshots/9.png b/artwork/steam/screenshots/9.png
deleted file mode 100644
index 9bf9534f..00000000
Binary files a/artwork/steam/screenshots/9.png and /dev/null differ
diff --git a/artwork/steam/store_page_gif.gif b/artwork/steam/store_page_gif.gif
deleted file mode 100644
index 1491fb0a..00000000
Binary files a/artwork/steam/store_page_gif.gif and /dev/null differ
diff --git a/artwork/thirdparty/armorgames/162x100.png b/artwork/thirdparty/armorgames/162x100.png
deleted file mode 100644
index aede09f3..00000000
Binary files a/artwork/thirdparty/armorgames/162x100.png and /dev/null differ
diff --git a/artwork/thirdparty/armorgames/162x100.psd b/artwork/thirdparty/armorgames/162x100.psd
deleted file mode 100644
index c0c4160f..00000000
--- a/artwork/thirdparty/armorgames/162x100.psd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f119ae5afd23eb038b9cb55699ea02b5908c8c4d67a0b06e91934ca41eb123fa
-size 143528
diff --git a/artwork/thirdparty/armorgames/620x320.png b/artwork/thirdparty/armorgames/620x320.png
deleted file mode 100644
index 8f0ff84d..00000000
Binary files a/artwork/thirdparty/armorgames/620x320.png and /dev/null differ
diff --git a/artwork/thirdparty/armorgames/620x320.psd b/artwork/thirdparty/armorgames/620x320.psd
deleted file mode 100644
index b0e3df6b..00000000
--- a/artwork/thirdparty/armorgames/620x320.psd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1c1b98562af8362919fe67e90fbf18033ef48ca3b394072f08ab2b3e2711a594
-size 1440735
diff --git a/artwork/thirdparty/armorgames/icon.png b/artwork/thirdparty/armorgames/icon.png
deleted file mode 100644
index 4d78ff80..00000000
Binary files a/artwork/thirdparty/armorgames/icon.png and /dev/null differ
diff --git a/artwork/thirdparty/armorgames/icon.psd b/artwork/thirdparty/armorgames/icon.psd
deleted file mode 100644
index 1cca09a5..00000000
--- a/artwork/thirdparty/armorgames/icon.psd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1d523d3aff76713cbce90986d86e33d1b937ccefadbd6958e2d90b25cd6ed47b
-size 40609
diff --git a/artwork/thirdparty/armorgames/index.html b/artwork/thirdparty/armorgames/index.html
deleted file mode 100644
index 2b2da26d..00000000
--- a/artwork/thirdparty/armorgames/index.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
- shapez.io
-
-
-
-
-
- You will be redirected soon
-
-
diff --git a/artwork/thirdparty/armorgames/index.zip b/artwork/thirdparty/armorgames/index.zip
deleted file mode 100644
index 02aa81f0..00000000
Binary files a/artwork/thirdparty/armorgames/index.zip and /dev/null differ
diff --git a/artwork/thirdparty/iogames.space/thumb.png b/artwork/thirdparty/iogames.space/thumb.png
deleted file mode 100644
index 9f36f7b2..00000000
Binary files a/artwork/thirdparty/iogames.space/thumb.png and /dev/null differ
diff --git a/artwork/thirdparty/iogames.space/thumb.psd b/artwork/thirdparty/iogames.space/thumb.psd
deleted file mode 100644
index 93d392df..00000000
--- a/artwork/thirdparty/iogames.space/thumb.psd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fb09261c4d8f26cbf3c79f9e283a59d2bf9b54c8f360794a4696644edbcbcaa9
-size 8895432
diff --git a/artwork/thirdparty/kongregate/icon.png b/artwork/thirdparty/kongregate/icon.png
deleted file mode 100644
index dc742197..00000000
Binary files a/artwork/thirdparty/kongregate/icon.png and /dev/null differ
diff --git a/artwork/thirdparty/kongregate/icon.psd b/artwork/thirdparty/kongregate/icon.psd
deleted file mode 100644
index 25835670..00000000
--- a/artwork/thirdparty/kongregate/icon.psd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:406ddccda44fd026d5a435ff80c418fa007f0252fb5ac13165514d5da9186065
-size 10271381
diff --git a/artwork/thirdparty/kongregate/iframe.html b/artwork/thirdparty/kongregate/iframe.html
deleted file mode 100644
index 6b741420..00000000
--- a/artwork/thirdparty/kongregate/iframe.html
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
- Iframe test
-
-
-
-
-
diff --git a/artwork/thirdparty/kongregate/index.html b/artwork/thirdparty/kongregate/index.html
deleted file mode 100644
index ce19f275..00000000
--- a/artwork/thirdparty/kongregate/index.html
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
- Redirecting to shapez.io
-
-
-
-
- Redirecting you to
- shapez.io
-
-
diff --git a/artwork/thirdparty/miniclip/150x110.psd b/artwork/thirdparty/miniclip/150x110.psd
deleted file mode 100644
index e4677214..00000000
--- a/artwork/thirdparty/miniclip/150x110.psd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:525a1f60529723c8e534233adbbbd8ff8c6d5fec25360f35c77f787166fb0526
-size 7666025
diff --git a/artwork/thirdparty/miniclip/216x287.psd b/artwork/thirdparty/miniclip/216x287.psd
deleted file mode 100644
index 1e535a14..00000000
--- a/artwork/thirdparty/miniclip/216x287.psd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:064c6e73648537b2c6225784dd56ed37bdf46c5e3b1106e05278243f1d86cb8d
-size 1136861
diff --git a/artwork/thirdparty/miniclip/444x287.psd b/artwork/thirdparty/miniclip/444x287.psd
deleted file mode 100644
index ced5937b..00000000
--- a/artwork/thirdparty/miniclip/444x287.psd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0989c0e5d438247599f37e6c5bda458ff4bd0dcda5b7a0e5c392c2a98ac14c80
-size 9068311
diff --git a/artwork/thirdparty/miniclip/512x512.psd b/artwork/thirdparty/miniclip/512x512.psd
deleted file mode 100644
index b4efeec9..00000000
--- a/artwork/thirdparty/miniclip/512x512.psd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:aad36634a8b25092fab68560668c56abeac1ef4f5f0f52e805cc5e2a6c4ca6bb
-size 2535755
diff --git a/artwork/thirdparty/miniclip/70x59.psd b/artwork/thirdparty/miniclip/70x59.psd
deleted file mode 100644
index fa13ab2d..00000000
--- a/artwork/thirdparty/miniclip/70x59.psd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:23c3cb1a03dd1986d5dc7385762bbbf000b1b5adc5c1b5f202d79651aaae8fc7
-size 801189
diff --git a/artwork/thirdparty/miniclip/shapezio-miniclip-assets.zip b/artwork/thirdparty/miniclip/shapezio-miniclip-assets.zip
deleted file mode 100644
index 53b2b380..00000000
Binary files a/artwork/thirdparty/miniclip/shapezio-miniclip-assets.zip and /dev/null differ
diff --git a/artwork/thirdparty/miniclip/shapezio__150x110.png b/artwork/thirdparty/miniclip/shapezio__150x110.png
deleted file mode 100644
index c4696af6..00000000
Binary files a/artwork/thirdparty/miniclip/shapezio__150x110.png and /dev/null differ
diff --git a/artwork/thirdparty/miniclip/shapezio__216x287.png b/artwork/thirdparty/miniclip/shapezio__216x287.png
deleted file mode 100644
index eba64e2c..00000000
Binary files a/artwork/thirdparty/miniclip/shapezio__216x287.png and /dev/null differ
diff --git a/artwork/thirdparty/miniclip/shapezio__444x287.png b/artwork/thirdparty/miniclip/shapezio__444x287.png
deleted file mode 100644
index 335fd664..00000000
Binary files a/artwork/thirdparty/miniclip/shapezio__444x287.png and /dev/null differ
diff --git a/artwork/thirdparty/miniclip/shapezio__512x512.png b/artwork/thirdparty/miniclip/shapezio__512x512.png
deleted file mode 100644
index 81c8b737..00000000
Binary files a/artwork/thirdparty/miniclip/shapezio__512x512.png and /dev/null differ
diff --git a/artwork/thirdparty/miniclip/shapezio__70x59.png b/artwork/thirdparty/miniclip/shapezio__70x59.png
deleted file mode 100644
index a982eaf3..00000000
Binary files a/artwork/thirdparty/miniclip/shapezio__70x59.png and /dev/null differ
diff --git a/artwork/tutorial_videos/level_1.webm b/artwork/tutorial_videos/level_1.webm
deleted file mode 100644
index c14a3918..00000000
--- a/artwork/tutorial_videos/level_1.webm
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bc60f1f38c775874047967fea3b81350b8b62496fd276e89227ce3b3bd8f593b
-size 1038054
diff --git a/artwork/tutorial_videos/level_10.webm b/artwork/tutorial_videos/level_10.webm
deleted file mode 100644
index aa1124a3..00000000
--- a/artwork/tutorial_videos/level_10.webm
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:db8026c2a132c9d2f016986dc7a66127254c725c068eaae60909ddff6d50a210
-size 2397175
diff --git a/artwork/tutorial_videos/level_11.webm b/artwork/tutorial_videos/level_11.webm
deleted file mode 100644
index 29a782a7..00000000
--- a/artwork/tutorial_videos/level_11.webm
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ce02cec04d080b2114822e9241a9baa073a56f38dd0c52e235373fd8ae2f856d
-size 1105340
diff --git a/artwork/tutorial_videos/level_2.webm b/artwork/tutorial_videos/level_2.webm
deleted file mode 100644
index 775c8629..00000000
--- a/artwork/tutorial_videos/level_2.webm
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:68e0987d534972b90a40b814180c19eb69100a8661295388c4237cbb3ee3b907
-size 2029655
diff --git a/artwork/tutorial_videos/level_3.webm b/artwork/tutorial_videos/level_3.webm
deleted file mode 100644
index c20b650a..00000000
--- a/artwork/tutorial_videos/level_3.webm
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2afc6b142575631260ef546c4e47e444cb47bf20668635d69babe77d7771e71f
-size 1651886
diff --git a/artwork/tutorial_videos/level_4.webm b/artwork/tutorial_videos/level_4.webm
deleted file mode 100644
index a0fe2602..00000000
--- a/artwork/tutorial_videos/level_4.webm
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0790736c943db421ec09cef70df722dbd7c3ff25dbad8cfd711a68c4b4806dcd
-size 1467335
diff --git a/artwork/tutorial_videos/level_5.webm b/artwork/tutorial_videos/level_5.webm
deleted file mode 100644
index 60292038..00000000
--- a/artwork/tutorial_videos/level_5.webm
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0c8e8f9ebb7523c50d7a8797ec1830c1669bd4dbe233295274b17c08ba52cdf5
-size 2063527
diff --git a/artwork/tutorial_videos/level_6.webm b/artwork/tutorial_videos/level_6.webm
deleted file mode 100644
index 6ba82c0c..00000000
--- a/artwork/tutorial_videos/level_6.webm
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:95a9f337551e9c9a0064f28ac20cf51f6a76f9f44e0163b458db9dacc36feaa4
-size 3892951
diff --git a/artwork/tutorial_videos/level_7.webm b/artwork/tutorial_videos/level_7.webm
deleted file mode 100644
index 55b5f70b..00000000
--- a/artwork/tutorial_videos/level_7.webm
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:25d07f2a8facbd7faf8710ed86e882743bfc46dece51d80ee959be239dd0f482
-size 3188174
diff --git a/artwork/tutorial_videos/level_9.webm b/artwork/tutorial_videos/level_9.webm
deleted file mode 100644
index 40e240e2..00000000
--- a/artwork/tutorial_videos/level_9.webm
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a996fc3605f4ef180a7985f2a74621510489cc88b2b8a97a9dc1bd19566383b7
-size 1727787
diff --git a/artwork/twitch/box-image.jpg b/artwork/twitch/box-image.jpg
deleted file mode 100644
index 90526447..00000000
Binary files a/artwork/twitch/box-image.jpg and /dev/null differ
diff --git a/artwork/twitch/box-image.psd b/artwork/twitch/box-image.psd
deleted file mode 100644
index ea3443fe..00000000
--- a/artwork/twitch/box-image.psd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e0cd2d82917e470202d38d32277f7519ccfd1821cb21791266539ddf07486d1b
-size 7314327
diff --git a/artwork/ui/building_tutorials.psd b/artwork/ui/building_tutorials.psd
deleted file mode 100644
index 5d35a9f4..00000000
--- a/artwork/ui/building_tutorials.psd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e519ee86412cc34446e2315e6c4ffa9aa93aaa034e511dc6d80d92e5bb953d3f
-size 14461756
diff --git a/artwork/ui/debug_arrows.psd b/artwork/ui/debug_arrows.psd
deleted file mode 100644
index e9421289..00000000
--- a/artwork/ui/debug_arrows.psd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c5502e112c14310aa90e0137b8153b7acecf91e9c0311191b903d87bb10b99a1
-size 26245
diff --git a/artwork/ui/ejector_arrow.psd b/artwork/ui/ejector_arrow.psd
deleted file mode 100644
index c6b201ac..00000000
--- a/artwork/ui/ejector_arrow.psd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2628ddad3e861d403ceee1d8f736f11d8c79d2ab597ae9e7939fed6f9dc5fc69
-size 65914
diff --git a/artwork/ui/get_on_steam.psd b/artwork/ui/get_on_steam.psd
deleted file mode 100644
index 36a11a89..00000000
--- a/artwork/ui/get_on_steam.psd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:27d142e1f200f474af2cb622774248f42225c45836ce5d0b0badd5c17b78ae86
-size 198569
diff --git a/artwork/ui/storage_overlay.psd b/artwork/ui/storage_overlay.psd
deleted file mode 100644
index 78052848..00000000
--- a/artwork/ui/storage_overlay.psd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c289cd61980aaf502fe4eda8591b2a2684137c85ca37d927598f916449f70de4
-size 38930
diff --git a/artwork/ui/toolbar-icons.psd b/artwork/ui/toolbar-icons.psd
deleted file mode 100644
index 9b453e15..00000000
--- a/artwork/ui/toolbar-icons.psd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:27c8d1eaa48beb7187e37244bd6ef7f43429be84ac88fffa96a4d72eb0e6565b
-size 158809
diff --git a/artwork/ui/toolbar_background.psd b/artwork/ui/toolbar_background.psd
deleted file mode 100644
index d4dc44b0..00000000
--- a/artwork/ui/toolbar_background.psd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bcde4f1a9e2a7b1ec77f904fe248a9cabfeed9eec9aea31d25627a46da1f8b7f
-size 48317
diff --git a/artwork/ui/vignette.psd b/artwork/ui/vignette.psd
deleted file mode 100644
index 6769736c..00000000
--- a/artwork/ui/vignette.psd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b9b171450a2713faaa0eb41ea052da8ee67d4ded246b01ec92f322a25b989a51
-size 113869
diff --git a/artwork/wires/prefab.png b/artwork/wires/prefab.png
deleted file mode 100644
index 99df19b8..00000000
Binary files a/artwork/wires/prefab.png and /dev/null differ
diff --git a/artwork/wires/prefab.psd b/artwork/wires/prefab.psd
deleted file mode 100644
index 71c38097..00000000
--- a/artwork/wires/prefab.psd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:498dea7314b8720c40dcd8bdd64b1b4a7a35259b2ffe7e896fc3db22878d6414
-size 1954036
diff --git a/gulp/ftp.js b/gulp/ftp.js
index 2d342ac4..d41bccb6 100644
--- a/gulp/ftp.js
+++ b/gulp/ftp.js
@@ -15,6 +15,11 @@ function gulptasksFTP($, gulp, buildFolder) {
];
const credentials = {
+ alpha: {
+ host: process.env.SHAPEZ_CLI_SERVER_HOST,
+ user: process.env.SHAPEZ_CLI_ALPHA_FTP_USER,
+ pass: process.env.SHAPEZ_CLI_ALPHA_FTP_PW,
+ },
staging: {
host: process.env.SHAPEZ_CLI_SERVER_HOST,
user: process.env.SHAPEZ_CLI_STAGING_FTP_USER,
@@ -51,7 +56,7 @@ function gulptasksFTP($, gulp, buildFolder) {
path.join(buildFolder, "!**/index.html"),
];
- for (const deployEnv of ["prod", "staging"]) {
+ for (const deployEnv of ["alpha", "prod", "staging"]) {
const deployCredentials = credentials[deployEnv];
gulp.task(`ftp.upload.${deployEnv}.game`, () => {
diff --git a/gulp/gulpfile.js b/gulp/gulpfile.js
index f2fdd9d4..0db3f729 100644
--- a/gulp/gulpfile.js
+++ b/gulp/gulpfile.js
@@ -36,12 +36,12 @@ const $ = require("gulp-load-plugins")({
const envVars = [
"SHAPEZ_CLI_SERVER_HOST",
// "SHAPEZ_CLI_PHONEGAP_KEY",
+ "SHAPEZ_CLI_ALPHA_FTP_USER",
+ "SHAPEZ_CLI_ALPHA_FTP_PW",
"SHAPEZ_CLI_STAGING_FTP_USER",
"SHAPEZ_CLI_STAGING_FTP_PW",
"SHAPEZ_CLI_LIVE_FTP_USER",
"SHAPEZ_CLI_LIVE_FTP_PW",
- // "SHAPEZ_CLI_TRANSREPORT_FTP_USER",
- // "SHAPEZ_CLI_TRANSREPORT_FTP_PW",
];
for (let i = 0; i < envVars.length; ++i) {
@@ -104,11 +104,14 @@ gulp.task("utils.requireCleanWorkingTree", cb => {
let output = $.trim(execSync("git status -su").toString("ascii")).replace(/\r/gi, "").split("\n");
// Filter files which are OK to be untracked
- output = output.filter(x => x.indexOf(".local.js") < 0);
+ output = output
+ .map(x => x.replace(/[\r\n]+/gi, ""))
+ .filter(x => x.indexOf(".local.js") < 0)
+ .filter(x => x.length > 0);
if (output.length > 0) {
console.error("\n\nYou have unstaged changes, please commit everything first!");
console.error("Unstaged files:");
- console.error(output.join("\n"));
+ console.error(output.map(x => "'" + x + "'").join("\n"));
process.exit(1);
}
cb();
@@ -297,6 +300,10 @@ gulp.task(
);
// Deploying!
+gulp.task(
+ "main.deploy.alpha",
+ gulp.series("utils.requireCleanWorkingTree", "build.staging", "ftp.upload.alpha")
+);
gulp.task(
"main.deploy.staging",
gulp.series("utils.requireCleanWorkingTree", "build.staging", "ftp.upload.staging")
diff --git a/gulp/standalone.js b/gulp/standalone.js
index f5126780..c4f33417 100644
--- a/gulp/standalone.js
+++ b/gulp/standalone.js
@@ -158,8 +158,11 @@ function gulptasksStandalone($, gulp, buildFolder) {
fs.writeFileSync(path.join(appPath, ".itch.toml"), tomlFile);
- if (platform === "linux" || platform === "darwin") {
- fs.writeFileSync(path.join(appPath, "play.sh"), "#!/usr/bin/env bash\n./shapezio\n");
+ if (platform === "linux") {
+ fs.writeFileSync(
+ path.join(appPath, "play.sh"),
+ '#!/usr/bin/env bash\n./shapezio --no-sandbox "$@"\n'
+ );
fs.chmodSync(path.join(appPath, "play.sh"), 0o775);
} else if (platform === "win32") {
// Optional: Create a playable copy. Shouldn't be required
@@ -175,6 +178,43 @@ function gulptasksStandalone($, gulp, buildFolder) {
// "start shapezio --local --dev --disable-direct-composition --in-process-gpu\r\n"
// );
}
+
+ if (platform === "darwin") {
+ // Clear up framework folders
+ fs.writeFileSync(
+ path.join(appPath, "play.sh"),
+ '#!/usr/bin/env bash\n./shapez.io-standalone.app/Contents/MacOS/shapezio --no-sandbox "$@"\n'
+ );
+ fs.chmodSync(path.join(appPath, "play.sh"), 0o775);
+ fs.chmodSync(
+ path.join(appPath, "shapez.io-standalone.app", "Contents", "MacOS", "shapezio"),
+ 0o775
+ );
+
+ const finalPath = path.join(appPath, "shapez.io-standalone.app");
+
+ const frameworksDir = path.join(finalPath, "Contents", "Frameworks");
+ const frameworkFolders = fs
+ .readdirSync(frameworksDir)
+ .filter(fname => fname.endsWith(".framework"));
+
+ for (let i = 0; i < frameworkFolders.length; ++i) {
+ const folderName = frameworkFolders[i];
+ const frameworkFolder = path.join(frameworksDir, folderName);
+ console.log(" -> ", frameworkFolder);
+
+ const filesToDelete = fs
+ .readdirSync(frameworkFolder)
+ .filter(fname => fname.toLowerCase() !== "versions");
+ filesToDelete.forEach(fname => {
+ console.log(" -> Deleting", fname);
+ fs.unlinkSync(path.join(frameworkFolder, fname));
+ });
+
+ const frameworkSourceDir = path.join(frameworkFolder, "Versions", "A");
+ fse.copySync(frameworkSourceDir, frameworkFolder);
+ }
+ }
});
cb();
diff --git a/gulp/webpack.production.config.js b/gulp/webpack.production.config.js
index f80a69d2..1b89283f 100644
--- a/gulp/webpack.production.config.js
+++ b/gulp/webpack.production.config.js
@@ -105,6 +105,8 @@ module.exports = ({
passes: 2,
module: true,
pure_funcs: [
+ "Math.radians",
+ "Math.degrees",
"Math.round",
"Math.ceil",
"Math.floor",
@@ -119,21 +121,6 @@ module.exports = ({
"Math.sign",
"Math.pow",
"Math.atan2",
-
- "Math_round",
- "Math_ceil",
- "Math_floor",
- "Math_sqrt",
- "Math_hypot",
- "Math_abs",
- "Math_max",
- "Math_min",
- "Math_sin",
- "Math_cos",
- "Math_tan",
- "Math_sign",
- "Math_pow",
- "Math_atan2",
],
toplevel: true,
unsafe_math: true,
@@ -215,6 +202,13 @@ module.exports = ({
end: "dev:end",
},
},
+ {
+ loader: "webpack-strip-block",
+ options: {
+ start: "wires:start",
+ end: "wires:end",
+ },
+ },
],
},
{
@@ -238,7 +232,6 @@ module.exports = ({
pattern: /globalConfig\.beltSpeedItemsPerSecond/g,
replacement: () => "2.0",
},
- { pattern: /globalConfig\.itemSpacingOnBelts/g, replacement: () => "0.63" },
{ pattern: /globalConfig\.debug/g, replacement: () => "''" },
],
}),
diff --git a/res/ui/building_icons/advanced_processor.png b/res/ui/building_icons/advanced_processor.png
new file mode 100644
index 00000000..c1423b09
Binary files /dev/null and b/res/ui/building_icons/advanced_processor.png differ
diff --git a/res/ui/building_icons/wire.png b/res/ui/building_icons/wire.png
new file mode 100644
index 00000000..e6ccb3a6
Binary files /dev/null and b/res/ui/building_icons/wire.png differ
diff --git a/res/ui/building_icons/wire_crossings.png b/res/ui/building_icons/wire_crossings.png
new file mode 100644
index 00000000..29ea7123
Binary files /dev/null and b/res/ui/building_icons/wire_crossings.png differ
diff --git a/res/ui/languages/zh-TW.svg b/res/ui/languages/zh-TW.svg
index f89219a0..c3dab661 100644
--- a/res/ui/languages/zh-TW.svg
+++ b/res/ui/languages/zh-TW.svg
@@ -1,14 +1,15 @@
-