Mascali
/
shapez
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

Minor fixes, update changelog, add experimental macosx and linux builds

This commit is contained in:
tobspr 2020-05-30 20:12:16 +02:00
parent 02fb6d53b5
commit 704b6e14b8
6 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gulp/standalone.js
View File

@ -182,10 +182,10 @@ function gulptasksStandalone($, gulp, buildFolder) {
"standalone.package.prod", "standalone.package.prod",
$.sequence("standalone.prepare", [ $.sequence("standalone.prepare", [
"standalone.package.prod.win64", "standalone.package.prod.win64",
// "standalone.package.prod.linux64", "standalone.package.prod.linux64",
"standalone.package.prod.darwin64",
// "standalone.package.prod.win32", // "standalone.package.prod.win32",
// "standalone.package.prod.linux32", // "standalone.package.prod.linux32",
// "standalone.package.prod.darwin64"
]) ])
); );
} }

3
src/css/states/preload.scss
View File

@ -36,6 +36,9 @@
@include S(padding, 1px, 2px); @include S(padding, 1px, 2px);
@include S(margin-right, 3px); @include S(margin-right, 3px);
} }
a {
color: $colorBlueBright;
}
} }
} }

5
src/js/changelog.js
View File

@ -3,9 +3,12 @@ export const CHANGELOG = [
version: "1.1.2", version: "1.1.2",
date: "unreleased", date: "unreleased",
entries: [ 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 hovering pinned shapes to enlarge them",
"Allow deselecting blueprints with right click and 'Q'",
"Move default key for deleting from 'X' to 'DEL'", "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", "Reintroduce 'SPACE' keybinding to center on map",
"Improved keybinding hints", "Improved keybinding hints",
"Fixed some keybindings showing as 'undefined'", "Fixed some keybindings showing as 'undefined'",

4
src/js/core/config.js
View File

@ -83,7 +83,7 @@ export const globalConfig = {
debug: { debug: {
/* dev:start */ /* dev:start */
fastGameEnter: true, // fastGameEnter: true,
// noArtificialDelays: true, // noArtificialDelays: true,
// disableSavegameWrite: true, // disableSavegameWrite: true,
// showEntityBounds: true, // showEntityBounds: true,
@ -105,7 +105,7 @@ export const globalConfig = {
// testAds: true, // testAds: true,
// disableMapOverview: true, // disableMapOverview: true,
disableTutorialHints: true, disableTutorialHints: true,
disableUpgradeNotification: true, // disableUpgradeNotification: true,
// instantBelts: true, // instantBelts: true,
// instantProcessors: true, // instantProcessors: true,
// instantMiners: true, // instantMiners: true,

2
src/js/game/hud/hud.js
View File

@ -48,8 +48,8 @@ export class GameHUD {
this.parts = { this.parts = {
processingOverlay: new HUDProcessingOverlay(this.root), processingOverlay: new HUDProcessingOverlay(this.root),
buildingsToolbar: new HUDBuildingsToolbar(this.root), buildingsToolbar: new HUDBuildingsToolbar(this.root),
buildingPlacer: new HUDBuildingPlacer(this.root),
blueprintPlacer: new HUDBlueprintPlacer(this.root), blueprintPlacer: new HUDBlueprintPlacer(this.root),
buildingPlacer: new HUDBuildingPlacer(this.root),
unlockNotification: new HUDUnlockNotification(this.root), unlockNotification: new HUDUnlockNotification(this.root),
gameMenu: new HUDGameMenu(this.root), gameMenu: new HUDGameMenu(this.root),
massSelector: new HUDMassSelector(this.root), massSelector: new HUDMassSelector(this.root),

5
src/js/game/hud/parts/blueprint_placer.js
View File

@ -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 { STOP_PROPAGATION } from "../../../core/signal";
import { TrackedState } from "../../../core/tracked_state"; import { TrackedState } from "../../../core/tracked_state";
import { Vector } from "../../../core/vector"; import { Vector } from "../../../core/vector";
@ -36,6 +36,9 @@ export class HUDBlueprintPlacer extends BaseHUDPart {
.getBinding(KEYMAPPINGS.placement.abortBuildingPlacement) .getBinding(KEYMAPPINGS.placement.abortBuildingPlacement)
.add(this.abortPlacement, this); .add(this.abortPlacement, this);
keyActionMapper.getBinding(KEYMAPPINGS.placement.rotateWhilePlacing).add(this.rotateBlueprint, 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.downPreHandler.add(this.onMouseDown, this);
this.root.camera.movePreHandler.add(this.onMouseMove, this); this.root.camera.movePreHandler.add(this.onMouseMove, this);