Merge pull request #14 from tobspr/master

Update

.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/

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`.
 

artwork/.gitignore

@@ -1 +0,0 @@
-trailer/

artwork/README.md

@@ -0,0 +1,3 @@
+The artwork can be found here:
+
+https://github.com/tobspr/shapez.io-artwork

artwork/buildings/RGB_Icon.psd

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5c424731dff98885b13a360f42933bc0f43635e9b69b62950c4befbfbd21663e
-size 230312

artwork/buildings/belt.psd

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:377f61c6947953c3df4f944397e51c87d318f80bb91ba4913de4a1da7f94a7cc
-size 379425

artwork/buildings/belt_minimap_shapes.psd

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:98d30b113681fcf248ec6c81b53d89fb8006e414ec68862b452a23c216ebfe85
-size 22652

artwork/buildings/buildings_1x1.psd

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a83f85517a44fa590a7a5e72b90736ba52065712e537f9eaa0d53aefd6a42457
-size 765795

artwork/buildings/buildings_2x1.psd

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7d05e340acb18f7b6b6f05fa7536f14179cda54a9ead0923fbb8e39c68da148c
-size 703229

artwork/buildings/buildings_2x2.psd

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9d8a4254944d83882513a062e77406419d94c3058a7ad657a5a318d45cc5443f
-size 902131

artwork/buildings/buildings_3x3.psd

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:573954846ee7adff355373ed22ce4cef90c5a1d4b7af928944c2110f6b5120f5
-size 595603

artwork/buildings/buildings_4x1.psd

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cc99dc14248306295ce17761c0cadf369a713ed65e864554e374d20ea9d571af
-size 778507

artwork/buildings/extractor.psd

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4a4dd431e7ff12f72eb54545c10ba1d5e6dd16119fe1430864a4e449391adebb
-size 216421

artwork/buildings/hub.psd

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:95a342ce958586280b9ebc69a41d5cc950915b787de83ddaf101dbb852bdaf86
-size 1179560

artwork/gamedistribution/1280x720.psd

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ccae5926d00eee9dd0686b1d415f30e302c53e25d8ca1c9d5517347510cea2b5
-size 11758220

artwork/gamedistribution/512x384.psd

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3ac7dc426f618215bf8e62526dfe38d8076c439849ef341f5545561c551625d4
-size 10266632

artwork/gamedistribution/iframe/index.html

@@ -1,85 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <title>shapez.io</title>
-        <script type="text/javascript">
-            function postToGameFrame(msg) {
-                var handle = document.getElementById("gameframe");
-                if (handle) {
-                    handle.contentWindow.postMessage(msg, "*");
-                }
-            }
-
-            window.addEventListener("message", function (event) {
-                if (event.data === "shapezio://gd.game_loaded") {
-                    console.log("Game loaded");
-                }
-
-                if (event.data === "shapezio://gd.show_ad") {
-                    console.log("Got ad message");
-                    gdsdk.showAd();
-                }
-            });
-
-            window["GD_OPTIONS"] = {
-                gameId: "ac8e6fc04a6f46f990ac6a317bb4d74e",
-                onEvent: function (event) {
-                    switch (event.name) {
-                        case "SDK_GAME_START":
-                            console.log("GDSDK: ad finished");
-                            postToGameFrame("shapezio://gd.ad_finished");
-                            setTimeout(function () {
-                                document.getElementById("gameframe").focus();
-                                console.log("(GD-PARENT_FRAME) successfully focused frame");
-                            }, 500);
-                            break;
-                        case "SDK_GAME_PAUSE":
-                            // pause game logic / mute audio
-                            console.log("GDSDK: ad started");
-                            postToGameFrame("shapezio://gd.ad_started");
-                            break;
-                    }
-                },
-            };
-
-            (function (d, s, id) {
-                var js,
-                    fjs = d.getElementsByTagName(s)[0];
-                if (d.getElementById(id)) return;
-                js = d.createElement(s);
-                js.id = id;
-                js.src = "https://html5.api.gamedistribution.com/main.min.js";
-                fjs.parentNode.insertBefore(js, fjs);
-            })(document, "script", "gamedistribution-jssdk");
-        </script>
-
-        <style>
-            body {
-                background: #222428;
-                text-align: center;
-                font-family: Arial;
-                color: #eee;
-            }
-
-            #gameframe {
-                position: fixed;
-                top: 0;
-                left: 0;
-                width: 100%;
-                height: 100%;
-                border: 0;
-                display: block;
-                z-index: 1;
-            }
-        </style>
-    </head>
-
-    <body style="background: #333;">
-        <iframe
-            onclick="this.focus()"
-            src="https://shapez.io?embed=gamedistribution"
-            id="gameframe"
-            allowfullscreen
-        ></iframe>
-    </body>
-</html>

artwork/gamedistribution/iframe/manifest.json

@@ -1,8 +0,0 @@
-{
-    "name": "shapez.io",
-    "short_name": "shapez.io",
-    "start_url": "index.html",
-    "display": "standalone",
-    "background_color": "#222428",
-    "description": "shapez.io"
-}

artwork/icon-standalone.psd

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1a0062684305ff8ac875812f39e565fe00f27b537212b2ad70d68c27fb2ae6f8
-size 224962

artwork/icon.psd

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:22b15510bbe17ebe46b899952fe7cb260271c103e66759544aef0a7fa963d319
-size 209192

artwork/installer/wizard.psd

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f3fa43e6a02c92ac66717aaedde15c41b6694c390165c52a43e5b794b73bc895
-size 1091078

artwork/intial_concept/README.md

@@ -1 +0,0 @@
-This is the initial concept which I made and was the birth of shapez.io

artwork/intial_concept/concept.psd

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3c5b380e08ed27a1d7c47f2e7c686963a1837bfebce29cce180a741674eb4800
-size 1533043

artwork/itch.io/banner.psd

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c334d77dabdc40fef4ece56ccef9eaa59b5b6b9381817c234f9bf07d00e676e5
-size 12721033

artwork/itch.io/full-page.psd

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:965ea97e2390927132f2463118ec7b8dd874b838fc770dc7f0ee76bb48ef0527
-size 21376906

artwork/logo.psd

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:16f131c43e555211929bfd90468c554416acf9a54f2172dd377bbe4f02b43227
-size 228133

artwork/promo/yorgio-promo.psd

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ab0287f69a54c57e725e239a1a6ef35c79d60f4217184fcde7b27ab4d1c0ef60
-size 8866812

artwork/steam/1920x620.psd

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b909ed70673b45c3f651a6325f5d0c27d1bfd982bfbc41f964075135c6fede76
-size 23705912

artwork/steam/32x32.psd

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f09b39f525b2d1ed094ceec73b792ce75d593e769254154cf32f4df2a429f2ba
-size 52046

artwork/steam/460x215.psd

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:12df556b43bb303aa0318a6adff70ff3acd9ac68693ebabf3fab094efecca810
-size 6757896

artwork/steam/600x900.psd

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:42015852b1abec0541c10f71acdde226170b60de7b7737282485b738022d8982
-size 11018053

artwork/steam/616x353.psd

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5a5a83129016b75d11af487f42b4bee3d85a48d2894b681d076724c9512aeb31
-size 10334692

artwork/steam/640x360.psd

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:20ca95838254a46d4c23f4c24b7877eaad60aa1aeed3df087b242f389e428774
-size 156876

artwork/steam/announcement.psd

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ae83b8805191eeba13016e40216fc4781ac3958e6886769ce8677ea28370d13e
-size 239706

artwork/steam/devlog.psd

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:40d458f800344d819ad4d3f38943f53f399258369ee5c20f6583d1b49847465f
-size 188255

artwork/thirdparty/armorgames/162x100.psd

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f119ae5afd23eb038b9cb55699ea02b5908c8c4d67a0b06e91934ca41eb123fa
-size 143528

artwork/thirdparty/armorgames/620x320.psd

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1c1b98562af8362919fe67e90fbf18033ef48ca3b394072f08ab2b3e2711a594
-size 1440735

artwork/thirdparty/armorgames/icon.psd

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1d523d3aff76713cbce90986d86e33d1b937ccefadbd6958e2d90b25cd6ed47b
-size 40609