diff --git a/.gitattributes b/.gitattributes index d899f655..841e34e8 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,3 @@ *.wav filter=lfs diff=lfs merge=lfs -text +*.webm filter=lfs diff=lfs merge=lfs -text +*.mp3 filter=lfs diff=lfs merge=lfs -text diff --git a/res/bg_render.webm b/res/bg_render.webm index 86ed678e..bda0db6b 100644 Binary files a/res/bg_render.webm and b/res/bg_render.webm differ diff --git a/res/videos/level_1.webm b/res/videos/level_1.webm index f5962a97..c14a3918 100644 Binary files a/res/videos/level_1.webm and b/res/videos/level_1.webm differ diff --git a/res/videos/level_2.webm b/res/videos/level_2.webm index 5cf00271..775c8629 100644 Binary files a/res/videos/level_2.webm and b/res/videos/level_2.webm differ diff --git a/res/videos/level_3.webm b/res/videos/level_3.webm new file mode 100644 index 00000000..c20b650a --- /dev/null +++ b/res/videos/level_3.webm @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2afc6b142575631260ef546c4e47e444cb47bf20668635d69babe77d7771e71f +size 1651886 diff --git a/res/videos/level_4.webm b/res/videos/level_4.webm new file mode 100644 index 00000000..a0fe2602 --- /dev/null +++ b/res/videos/level_4.webm @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0790736c943db421ec09cef70df722dbd7c3ff25dbad8cfd711a68c4b4806dcd +size 1467335 diff --git a/res/videos/level_5.webm b/res/videos/level_5.webm new file mode 100644 index 00000000..60292038 --- /dev/null +++ b/res/videos/level_5.webm @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0c8e8f9ebb7523c50d7a8797ec1830c1669bd4dbe233295274b17c08ba52cdf5 +size 2063527 diff --git a/res/videos/level_6.webm b/res/videos/level_6.webm new file mode 100644 index 00000000..6ba82c0c --- /dev/null +++ b/res/videos/level_6.webm @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:95a9f337551e9c9a0064f28ac20cf51f6a76f9f44e0163b458db9dacc36feaa4 +size 3892951 diff --git a/res/videos/level_7.webm b/res/videos/level_7.webm new file mode 100644 index 00000000..55b5f70b --- /dev/null +++ b/res/videos/level_7.webm @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:25d07f2a8facbd7faf8710ed86e882743bfc46dece51d80ee959be239dd0f482 +size 3188174 diff --git a/res_raw/sounds/music/menu.mp3 b/res_raw/sounds/music/menu.mp3 index 8fdd13eb..87864f71 100644 Binary files a/res_raw/sounds/music/menu.mp3 and b/res_raw/sounds/music/menu.mp3 differ diff --git a/res_raw/sounds/music/theme.mp3 b/res_raw/sounds/music/theme.mp3 index 485a553a..66b78e55 100644 Binary files a/res_raw/sounds/music/theme.mp3 and b/res_raw/sounds/music/theme.mp3 differ diff --git a/src/css/ingame_hud/watermark.scss b/src/css/ingame_hud/watermark.scss index 207c043b..4d0e83a2 100644 --- a/src/css/ingame_hud/watermark.scss +++ b/src/css/ingame_hud/watermark.scss @@ -3,10 +3,10 @@ background: uiResource("get_on_itch_io.svg") center center / contain no-repeat; @include S(width, 110px); @include S(height, 40px); - @include S(top, 5px); + @include S(top, 10px); pointer-events: all; cursor: pointer; - @include S(left, 200px); + @include S(left, 160px); transition: all 0.12s ease-in; transition-property: opacity, transform; diff --git a/src/js/core/config.js b/src/js/core/config.js index 68ec8d00..7a43ffed 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, diff --git a/src/js/game/hud/parts/tutorial_hints.js b/src/js/game/hud/parts/tutorial_hints.js index d5e4061a..5cdc8519 100644 --- a/src/js/game/hud/parts/tutorial_hints.js +++ b/src/js/game/hud/parts/tutorial_hints.js @@ -1,13 +1,12 @@ -import { BaseHUDPart } from "../base_hud_part"; -import { makeDiv } from "../../../core/utils"; import { cachebust } from "../../../core/cachebust"; -import { DynamicDomAttach } from "../dynamic_dom_attach"; import { InputReceiver } from "../../../core/input_receiver"; -import { KeyActionMapper, KEYMAPPINGS } from "../../key_action_mapper"; -import { tutorialGoals } from "../../tutorial_goals"; import { TrackedState } from "../../../core/tracked_state"; +import { makeDiv } from "../../../core/utils"; +import { KeyActionMapper, KEYMAPPINGS } from "../../key_action_mapper"; +import { BaseHUDPart } from "../base_hud_part"; +import { DynamicDomAttach } from "../dynamic_dom_attach"; -const maxTutorialVideo = 2; +const maxTutorialVideo = 7; export class HUDPartTutorialHints extends BaseHUDPart { createElements(parent) { diff --git a/src/js/game/hud/parts/watermark.js b/src/js/game/hud/parts/watermark.js index 989ea64c..94df6257 100644 --- a/src/js/game/hud/parts/watermark.js +++ b/src/js/game/hud/parts/watermark.js @@ -23,20 +23,21 @@ export class HUDWatermark extends BaseHUDPart { */ drawOverlays(parameters) { const w = this.root.gameWidth; + const x = 280 * this.root.app.getEffectiveUiScale(); parameters.context.fillStyle = "#f77"; parameters.context.font = "bold " + this.root.app.getEffectiveUiScale() * 17 + "px GameFont"; - parameters.context.textAlign = "center"; - parameters.context.fillText("DEMO VERSION", w / 2, this.root.app.getEffectiveUiScale() * 35); + // parameters.context.textAlign = "center"; + parameters.context.fillText("DEMO VERSION", x, this.root.app.getEffectiveUiScale() * 27); parameters.context.font = "bold " + this.root.app.getEffectiveUiScale() * 12 + "px GameFont"; - parameters.context.textAlign = "center"; + // parameters.context.textAlign = "center"; parameters.context.fillText( "Please consider to buy the full version!", - w / 2, - this.root.app.getEffectiveUiScale() * 55 + x, + this.root.app.getEffectiveUiScale() * 45 ); - parameters.context.textAlign = "left"; + // parameters.context.textAlign = "left"; } }