diff --git a/Makefile b/Makefile index 62c2c3b..2e9b647 100644 --- a/Makefile +++ b/Makefile @@ -33,6 +33,15 @@ else sh -x ./scripts/release.sh endif +release: + meson compile -j 10 -C builddir +ifeq '$(OS)' 'Windows_NT' + powershell -executionpolicy bypass .\scripts\release.ps1 +else + sh -x ./scripts/release.sh +endif + + debug_build: meson setup --wipe builddir -Db_ndebug=true --buildtype debugoptimized meson compile -j 10 -C builddir diff --git a/assets/config.json b/assets/config.json index 5f215ef..5bd3245 100644 --- a/assets/config.json +++ b/assets/config.json @@ -5,7 +5,7 @@ "ui_click": "assets/sounds/ui_click.ogg", "ui_hover": "assets/sounds/ui_hover.ogg", "walk": "assets/sounds/walk.ogg", - "test_story": "assets/sounds/test_story.ogg", + "intro_story": "assets/sounds/intro_story.ogg", "sword_hit_1": "assets/sounds/sword_hit_1.ogg", "sword_hit_2": "assets/sounds/sword_hit_2.ogg", "punch_cartoony": "assets/sounds/punch_cartoony.ogg", @@ -94,8 +94,8 @@ }, "intro_story": {"path": "assets/stories/intro_story.png", - "frame_width": 1280, - "frame_height": 720 + "frame_width": 3840, + "frame_height": 2160 }, "win_story": {"path": "assets/stories/win_story.png", diff --git a/assets/sounds/intro_story.ogg b/assets/sounds/intro_story.ogg new file mode 100644 index 0000000..ddeed50 Binary files /dev/null and b/assets/sounds/intro_story.ogg differ diff --git a/assets/stories.json b/assets/stories.json index e662743..4aa6bac 100644 --- a/assets/stories.json +++ b/assets/stories.json @@ -2,25 +2,24 @@ "intro_story": {"_type": "Storyboard", "image": "intro_story", - "audio": "test_story", + "audio": "intro_story", "layout": [ - "[a|b|c1]", - "[d|e|c2]", + "[a|b|e]", + "[c|d|f]", "[g|h|i]" ], "beats": [ - ["00:00", "a","pan", "60"], - ["00:01", "b","shake", "30"], - ["00:5", "g","pan", "60"], - ["00:6", "h","pan", "60"], - ["00:7", "h","bounce", "60"], - ["00:8", "c1","pan", "60"], - ["00:9", "c2","pan", "60"], - ["00:10", "d","bounce", "60"], - ["00:11", "e","shake", "60"], - ["00:12", "i","pan", "60"], - ["00:13", "i","shake", "60"], - ["00:14", "i","bounce", "60"] + ["00:00", "a","pan","60"], + ["00:03", "b","pan","60"], + ["00:06", "d","pan","60"], + ["00:08", "c","pan","60"], + ["00:11", "e","pan","60"], + ["00:14", "d","pan","60"], + ["00:16", "e","pan","60"], + ["00:18", "f","bounce","60"], + ["00:20", "g","bounce","60"], + ["00:23", "h","pan","60"], + ["00:30", "i","pan","60"] ] }, "win_story": diff --git a/assets/stories/intro_story.png b/assets/stories/intro_story.png index 2c049ad..27da9f6 100644 Binary files a/assets/stories/intro_story.png and b/assets/stories/intro_story.png differ