Merge branch 'master' of https://github.com/tobspr/shapez.io

src/js/changelog.js

@@ -15,7 +15,6 @@ export const CHANGELOG = [
             "Improve visibility of shape background in dark mode",
             "Added sound when destroying a building",
             "Update tutorial image for tier 2 tunnels to explain mix/match (by jimmyshadow1)",
-            "Prevent default actions on all keybindings in the web version so you don't accidentally use builtin browser shortcuts",
         ],
     },
     {

src/js/core/input_distributor.js

@@ -191,7 +191,17 @@ export class InputDistributor {
      */
     handleKeyMouseDown(event) {
         const keyCode = event instanceof MouseEvent ? event.button + 1 : event.keyCode;
+        if (
+            keyCode === 4 || // MB4
+            keyCode === 5 || // MB5
+            keyCode === 9 || // TAB
+            keyCode === 16 || // SHIFT
+            keyCode === 17 || // CTRL
+            keyCode === 18 || // ALT
+            (keyCode >= 112 && keyCode < 122) // F1 - F10
+        ) {
             event.preventDefault();
+        }
 
         const isInitial = !this.keysDown.has(keyCode);
         this.keysDown.add(keyCode);

src/js/game/hub_goals.js

@@ -275,7 +275,7 @@ export class HubGoals extends BasicSerializableObject {
      * @param {string} upgradeId
      * @returns {boolean}
      */
-    tryUnlockUgprade(upgradeId) {
+    tryUnlockUpgrade(upgradeId) {
         if (!this.canUnlockUpgrade(upgradeId)) {
             return false;
         }