From 704b6e14b83fa04004beceff0264be28eb1080ce Mon Sep 17 00:00:00 2001
From: tobspr <>
Date: Sat, 30 May 2020 20:12:16 +0200
Subject: [PATCH] Minor fixes, update changelog, add experimental macosx and
 linux builds

---
 gulp/standalone.js                        | 4 ++--
 src/css/states/preload.scss               | 3 +++
 src/js/changelog.js                       | 5 ++++-
 src/js/core/config.js                     | 4 ++--
 src/js/game/hud/hud.js                    | 2 +-
 src/js/game/hud/parts/blueprint_placer.js | 5 ++++-
 6 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/gulp/standalone.js b/gulp/standalone.js
index 34001e07..e8a1e9be 100644
--- a/gulp/standalone.js
+++ b/gulp/standalone.js
@@ -182,10 +182,10 @@ function gulptasksStandalone($, gulp, buildFolder) {
         "standalone.package.prod",
         $.sequence("standalone.prepare", [
             "standalone.package.prod.win64",
-            // "standalone.package.prod.linux64",
+            "standalone.package.prod.linux64",
+            "standalone.package.prod.darwin64",
             // "standalone.package.prod.win32",
             // "standalone.package.prod.linux32",
-            // "standalone.package.prod.darwin64"
         ])
     );
 }
diff --git a/src/css/states/preload.scss b/src/css/states/preload.scss
index 68a268e1..9bd23358 100644
--- a/src/css/states/preload.scss
+++ b/src/css/states/preload.scss
@@ -36,6 +36,9 @@
                 @include S(padding, 1px, 2px);
                 @include S(margin-right, 3px);
             }
+            a {
+                color: $colorBlueBright;
+            }
         }
     }
 
diff --git a/src/js/changelog.js b/src/js/changelog.js
index 4d8844c8..81f2749a 100644
--- a/src/js/changelog.js
+++ b/src/js/changelog.js
@@ -3,9 +3,12 @@ export const CHANGELOG = [
         version: "1.1.2",
         date: "unreleased",
         entries: [
+            "The official trailer is now ready! Check it out <a href='https://www.youtube.com/watch?v=KyorY1uIqiQ' target='_blank'>here</a>!",
+            "The <a href='https://steam.shapez.io' target='_blank'>steam page</a> is now live!",
             "Allow hovering pinned shapes to enlarge them",
+            "Allow deselecting blueprints with right click and 'Q'",
             "Move default key for deleting from 'X' to 'DEL'",
-            "Show confirmation when deleting > 100 buildings",
+            "Show confirmation when deleting more than 100 buildings",
             "Reintroduce 'SPACE' keybinding to center on map",
             "Improved keybinding hints",
             "Fixed some keybindings showing as 'undefined'",
diff --git a/src/js/core/config.js b/src/js/core/config.js
index 5b802de3..05555793 100644
--- a/src/js/core/config.js
+++ b/src/js/core/config.js
@@ -83,7 +83,7 @@ export const globalConfig = {
 
     debug: {
         /* dev:start */
-        fastGameEnter: true,
+        // fastGameEnter: true,
         // noArtificialDelays: true,
         // disableSavegameWrite: true,
         // showEntityBounds: true,
@@ -105,7 +105,7 @@ export const globalConfig = {
         // testAds: true,
         // disableMapOverview: true,
         disableTutorialHints: true,
-        disableUpgradeNotification: true,
+        // disableUpgradeNotification: true,
         // instantBelts: true,
         // instantProcessors: true,
         // instantMiners: true,
diff --git a/src/js/game/hud/hud.js b/src/js/game/hud/hud.js
index b2472a68..e1f1dbbf 100644
--- a/src/js/game/hud/hud.js
+++ b/src/js/game/hud/hud.js
@@ -48,8 +48,8 @@ export class GameHUD {
         this.parts = {
             processingOverlay: new HUDProcessingOverlay(this.root),
             buildingsToolbar: new HUDBuildingsToolbar(this.root),
-            buildingPlacer: new HUDBuildingPlacer(this.root),
             blueprintPlacer: new HUDBlueprintPlacer(this.root),
+            buildingPlacer: new HUDBuildingPlacer(this.root),
             unlockNotification: new HUDUnlockNotification(this.root),
             gameMenu: new HUDGameMenu(this.root),
             massSelector: new HUDMassSelector(this.root),
diff --git a/src/js/game/hud/parts/blueprint_placer.js b/src/js/game/hud/parts/blueprint_placer.js
index b3b91a66..173d1809 100644
--- a/src/js/game/hud/parts/blueprint_placer.js
+++ b/src/js/game/hud/parts/blueprint_placer.js
@@ -1,4 +1,4 @@
-import { DrawParameters } from "../../../core/draw_parameters";
+//www.youtube.com/watch?v=KyorY1uIqiQimport { DrawParameters } from "../../../core/draw_parameters";
 import { STOP_PROPAGATION } from "../../../core/signal";
 import { TrackedState } from "../../../core/tracked_state";
 import { Vector } from "../../../core/vector";
@@ -36,6 +36,9 @@ export class HUDBlueprintPlacer extends BaseHUDPart {
             .getBinding(KEYMAPPINGS.placement.abortBuildingPlacement)
             .add(this.abortPlacement, this);
         keyActionMapper.getBinding(KEYMAPPINGS.placement.rotateWhilePlacing).add(this.rotateBlueprint, this);
+        keyActionMapper
+            .getBinding(KEYMAPPINGS.placement.abortBuildingPlacement)
+            .add(this.abortPlacement, this);
 
         this.root.camera.downPreHandler.add(this.onMouseDown, this);
         this.root.camera.movePreHandler.add(this.onMouseMove, this);