From c3a50e00a0e66b0d88eaebbdbba81dd4f73deabe Mon Sep 17 00:00:00 2001 From: huulong Date: Thu, 17 Dec 2020 20:18:21 +0100 Subject: [PATCH 1/3] [PROJECT] Added sublime command to build full game without running it --- sonic-2d-tech-demo.sublime-project | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/sonic-2d-tech-demo.sublime-project b/sonic-2d-tech-demo.sublime-project index 438dc0a3..cb3bfa8b 100644 --- a/sonic-2d-tech-demo.sublime-project +++ b/sonic-2d-tech-demo.sublime-project @@ -198,6 +198,29 @@ } ] }, + { + "name": "Game: build full game", + "working_dir": "${project_path}", + "shell": true, + "cmd": ["./build_and_install_all_cartridges.sh debug"], + "file_regex": "(.*\\.sh)(?:\\: line )([\\d]+)(?:\\:)([\\d]+)? (.*)", + "syntax": "Packages/Python/Python.sublime-syntax", + "variants": + [ + { + "name": "debug", + "cmd": ["./build_and_install_all_cartridges.sh debug"] + }, + { + "name": "cheat", + "cmd": ["./build_and_install_all_cartridges.sh cheat"] + }, + { + "name": "release", + "cmd": ["./build_and_install_all_cartridges.sh release"] + } + ] + }, { "name": "Game: build itests titlemenu", "working_dir": "${project_path}", From 32b310aed9a581f102ee5dbd280f9ca3821c6764 Mon Sep 17 00:00:00 2001 From: huulong Date: Thu, 17 Dec 2020 20:21:58 +0100 Subject: [PATCH 2/3] [EXPORT] Fixed missing data in PICO-8 export and Travis release: - fixed PICO-8 export script not taking data BGM and data runtime into account - PICO-8 export also puts png and web exports in proper folders, ready for zipping - fixed Travis release not exporting data BGM cartridge with the rest (preventing reload of Angel Island BGM) --- .travis.yml | 2 +- export_cartridge_release.p8 | 27 +++++++++++++++++++++------ 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0f04af51..41ef6542 100644 --- a/.travis.yml +++ b/.travis.yml @@ -80,7 +80,7 @@ script: before_deploy: # zip multiple cartridges (including data) into one distributable archive - - cp data/data_stage*.p8 "build/v${BUILD_VERSION}_release" + - cp data/data_*.p8 "build/v${BUILD_VERSION}_release" - pushd "build/v${BUILD_VERSION}_release" - zip -r "picosonic_v${BUILD_VERSION}_release_cartridges.zip" . - popd diff --git a/export_cartridge_release.p8 b/export_cartridge_release.p8 index b40902cf..6f7f25ae 100644 --- a/export_cartridge_release.p8 +++ b/export_cartridge_release.p8 @@ -16,23 +16,34 @@ local entry_cartridge = "picosonic_titlemenu.p8" local additional_cartridges_list = { "picosonic_ingame.p8", "picosonic_stage_clear.p8", + "data_bgm1.p8", "data_stage1_00.p8", "data_stage1_10.p8", "data_stage1_20.p8", - "data_stage1_01.p8", "data_stage1_11.p8", "data_stage1_21.p8" + "data_stage1_01.p8", "data_stage1_11.p8", "data_stage1_21.p8", + "data_stage1_runtime.p8" } --- first, load the additional cartridges just to save them as png cartridges --- before we load the entry cartridge --- the metadata label is used automatically +-- prepare folder for png cartridges +mkdir("picosonic_v5.0_release.png") + +-- load each additional cartridge to save it as png cartridge +-- in folder created above +-- the metadata label is used automatically for each for cartridge_name in all(additional_cartridges_list) do load(cartridge_name) + + cd("picosonic_v5.0_release.png") save(cartridge_name..".png") + cd("..") end --- second, load the entry cartridge (titlemenu) +-- load the entry cartridge (titlemenu) last, since we're going to use it for export +-- just after load(entry_cartridge) --- save png cartridge +-- save as png cartridge +cd("picosonic_v5.0_release.png") save(entry_cartridge..".png") +cd("..") -- concatenate cartridge names with space separator with a very simplified version -- of string.lua > joinstr_table that doesn't mind about adding an initial space @@ -48,4 +59,8 @@ end -- on pink (color 14) background => -c 14 -- and most importantly we pass ingame, stage_clear and data files as additional cartridges export("picosonic_v5.0_release.bin "..additional_cartridges_string.." -i 160 -s 2 -c 14") + +mkdir("picosonic_v5.0_release.web") +cd("picosonic_v5.0_release.web") export("picosonic_v5.0_release.html "..additional_cartridges_string.." -i 160 -s 2 -c 14") +cd("..") From 2a1f0587c90c4390f295de088d2df50c45051120 Mon Sep 17 00:00:00 2001 From: huulong Date: Thu, 17 Dec 2020 20:28:10 +0100 Subject: [PATCH 3/3] [VERSION] Bumped to v5.1 --- CHANGELOG.md | 9 +++++++-- README.md | 2 +- build_itest.sh | 2 +- build_pico8_utests.sh | 2 +- build_single_cartridge.sh | 2 +- export_cartridge_release.p8 | 16 ++++++++-------- install_single_cartridge.sh | 2 +- run_cartridge.sh | 2 +- run_itest.sh | 2 +- run_pico8_utests.sh | 2 +- 10 files changed, 23 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b06d7f83..a1bc40b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [5.1] - 2020-12-17 +### Changed +- Audio: fixed Travis release for GitHub forgetting to upload BGM cartridge (a glitchy version of Green Hill Zone was played instead of Angel Island) + ## [5.0] - 2020-12-10 ### Added - Title: added title background showing "Pico Island" with water shimmer animation, pico-sonic logo, Sonic 3 (not 3 & Knuckles) intro jingle, and title menu showing after a short time @@ -197,8 +201,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Game: in-game: debug character flies X/Y on directional input, go back to title menu on reach goal - Test: all busted unit tests in separator folder tests -[Unreleased]: https://github.com/hsandt/sonic-pico8/compare/v5.0...HEAD -[5.0]: https://github.com/hsandt/sonic-pico8/compare/v4.2...v4.3 +[Unreleased]: https://github.com/hsandt/sonic-pico8/compare/v5.1...HEAD +[5.1]: https://github.com/hsandt/sonic-pico8/compare/v5.0...v5.1 +[5.0]: https://github.com/hsandt/sonic-pico8/compare/v4.2...v5.0 [4.2]: https://github.com/hsandt/sonic-pico8/compare/v4.1...v4.2 [4.1]: https://github.com/hsandt/sonic-pico8/compare/v4.0...v4.1 [4.0]: https://github.com/hsandt/sonic-pico8/compare/v3.1...v4.0 diff --git a/README.md b/README.md index 1e02b740..403dd453 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Works with PICO-8 0.2.0i and 0.2.1b. ## Features -Version: 5.0 +Version: 5.1 ### Physics diff --git a/build_itest.sh b/build_itest.sh index 536a6aa2..248f316e 100755 --- a/build_itest.sh +++ b/build_itest.sh @@ -16,7 +16,7 @@ build_output_path="$(dirname "$0")/build" author="leyn" title="pico sonic itests (all)" cartridge_stem="picosonic_itest_all" -version="5.0" +version="5.1" config='itest' # symbols='assert,log,visual_logger,tuner,profiler,mouse,itest' # cheat needed to set debug motion mode diff --git a/build_pico8_utests.sh b/build_pico8_utests.sh index b87c4aee..aad24187 100755 --- a/build_pico8_utests.sh +++ b/build_pico8_utests.sh @@ -16,7 +16,7 @@ build_output_path="$(dirname "$0")/build" author="leyn" title="pico sonic - pico8 utests (all)" cartridge_stem="picosonic_pico8_utests_all" -version="5.0" +version="5.1" config='debug' symbols='assert,tostring,dump,log,p8utest' diff --git a/build_single_cartridge.sh b/build_single_cartridge.sh index da62b988..6a619945 100755 --- a/build_single_cartridge.sh +++ b/build_single_cartridge.sh @@ -14,7 +14,7 @@ data_path="$(dirname "$0")/data" author="leyn" title="pico sonic" cartridge_stem="picosonic" -version="5.0" +version="5.1" help() { echo "Build a PICO-8 cartridge with the passed config." diff --git a/export_cartridge_release.p8 b/export_cartridge_release.p8 index 6f7f25ae..7f2cfe95 100644 --- a/export_cartridge_release.p8 +++ b/export_cartridge_release.p8 @@ -9,7 +9,7 @@ __lua__ -- Note that it will not warn if cartridge is not found. -- Paths are relative to PICO-8 carts directory. -cd("picosonic/v5.0_release") +cd("picosonic/v5.1_release") local entry_cartridge = "picosonic_titlemenu.p8" @@ -23,7 +23,7 @@ local additional_cartridges_list = { } -- prepare folder for png cartridges -mkdir("picosonic_v5.0_release.png") +mkdir("picosonic_v5.1_release.png") -- load each additional cartridge to save it as png cartridge -- in folder created above @@ -31,7 +31,7 @@ mkdir("picosonic_v5.0_release.png") for cartridge_name in all(additional_cartridges_list) do load(cartridge_name) - cd("picosonic_v5.0_release.png") + cd("picosonic_v5.1_release.png") save(cartridge_name..".png") cd("..") end @@ -41,7 +41,7 @@ end load(entry_cartridge) -- save as png cartridge -cd("picosonic_v5.0_release.png") +cd("picosonic_v5.1_release.png") save(entry_cartridge..".png") cd("..") @@ -58,9 +58,9 @@ end -- with top-left at sprite 160 (run1) => -i 160 -- on pink (color 14) background => -c 14 -- and most importantly we pass ingame, stage_clear and data files as additional cartridges -export("picosonic_v5.0_release.bin "..additional_cartridges_string.." -i 160 -s 2 -c 14") +export("picosonic_v5.1_release.bin "..additional_cartridges_string.." -i 160 -s 2 -c 14") -mkdir("picosonic_v5.0_release.web") -cd("picosonic_v5.0_release.web") -export("picosonic_v5.0_release.html "..additional_cartridges_string.." -i 160 -s 2 -c 14") +mkdir("picosonic_v5.1_release.web") +cd("picosonic_v5.1_release.web") +export("picosonic_v5.1_release.html "..additional_cartridges_string.." -i 160 -s 2 -c 14") cd("..") diff --git a/install_single_cartridge.sh b/install_single_cartridge.sh index f255448b..8ff91aa4 100755 --- a/install_single_cartridge.sh +++ b/install_single_cartridge.sh @@ -26,7 +26,7 @@ fi # Configuration: cartridge cartridge_stem="picosonic" -version="5.0" +version="5.1" cartridge_suffix="$1"; shift config="$1"; shift diff --git a/run_cartridge.sh b/run_cartridge.sh index 65262fad..764449f0 100755 --- a/run_cartridge.sh +++ b/run_cartridge.sh @@ -11,7 +11,7 @@ # Configuration: cartridge cartridge_stem="picosonic" -version="5.0" +version="5.1" # shift allows to pass extra arguments as $@ cartridge_suffix="$1"; shift diff --git a/run_itest.sh b/run_itest.sh index 919037a0..c0d7f0e6 100755 --- a/run_itest.sh +++ b/run_itest.sh @@ -9,7 +9,7 @@ # Configuration: cartridge cartridge_stem="picosonic_itest_all" -version="5.0" +version="5.1" cartridge_suffix="$1"; shift diff --git a/run_pico8_utests.sh b/run_pico8_utests.sh index 5ed36d0a..5f5c2c62 100755 --- a/run_pico8_utests.sh +++ b/run_pico8_utests.sh @@ -5,7 +5,7 @@ # Configuration: cartridge cartridge_stem="picosonic_pico8_utests_all" -version="5.0" +version="5.1" run_cmd="pico8 -run build/${cartridge_stem}_v${version}_debug.p8 -screenshot_scale 4 -gif_scale 4 $@"