From 09b42f3f08076da07be91fd897c8e36c4a4f49c0 Mon Sep 17 00:00:00 2001 From: Eric Date: Fri, 11 Oct 2024 23:56:17 -0400 Subject: [PATCH 01/25] Rewrite CHANGELOG.md for v0.5.2 --- CHANGELOG.md | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 44aa4a4865..b61cb8f881 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,40 +5,45 @@ 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). ## [0.5.2] - 2024-10-11 +### Added +- Added InverseDotsShader that emulates flash selections ([097dbf5](https://github.com/FunkinCrew/Funkin/commit/097dbf5bb4346d431d8ca9f0ec4bc5b5e6f4523f)) - by @ninjamuffin99 +- Added a new reworked Stage Editor ([27a0b44](https://github.com/FunkinCrew/Funkin/pull/3482/commits/27a0b4426f86f04362f97e16e2eff580c9402f34)) - by @JustKolosaki +- Added the `color` attribute to stage prop JSON data to allow them to be tinted without code. ([27a0b44](https://github.com/FunkinCrew/Funkin/pull/3482/commits/27a0b4426f86f04362f97e16e2eff580c9402f34)) - by @JustKolosaki +- Added the `angle` attribute to stage prop JSON data to allow them to be rotated without code. ([27a0b44](https://github.com/FunkinCrew/Funkin/pull/3482/commits/27a0b4426f86f04362f97e16e2eff580c9402f34)) - by @JustKolosaki +- Added the `blend` attribute to the stage prop JSON data to allow blend modes to be applied without code. ([27a0b44](https://github.com/FunkinCrew/Funkin/pull/3482/commits/27a0b4426f86f04362f97e16e2eff580c9402f34)) - by @JustKolosaki ### Changed - (docs) Delete Modding.md since we have a separate modding documentation ([a42240e](https://github.com/FunkinCrew/Funkin/commit/a42240e6a595d33034f2c887bf38a350d1fa0f15)) - by @AbnormalPoof in [#3651](https://github.com/FunkinCrew/Funkin/pull/3651) - (docs) Create a git cliff template for easier changelog stuff ([91b4544](https://github.com/FunkinCrew/Funkin/commit/91b4544f7ebc51485e3e28c3d716ba6ee69ad885)) - by @ninjamuffin99 in [#3652](https://github.com/FunkinCrew/Funkin/pull/3652) -- Added InverseDotsShader that emulates flash selections ([097dbf5](https://github.com/FunkinCrew/Funkin/commit/097dbf5bb4346d431d8ca9f0ec4bc5b5e6f4523f)) - by @ninjamuffin99 - (docs) Add additional `variation` input parameter to `Save.hasBeatenSong()` to allow usage of the function by inputting a variation id ([4fa9a0d](https://github.com/FunkinCrew/Funkin/commit/4fa9a0daaa67e0977460b147bd1f74a118e3e2a5)) - by @ninjamuffin99 - (docs) Added modding docs link in readme ([4b54118](https://github.com/FunkinCrew/Funkin/commit/4b54118731e26118111e06558ae4853c577fe4bb)) - by @Cartridge-Man -- Fix some misspellings and grammar in code documentation ([2175bea](https://github.com/FunkinCrew/Funkin/commit/2175beaa651e009332202985be4b7eb4ed36e5a4)) - by @Hundrec +- (docs) Fix some misspellings and grammar in code documentation ([2175bea](https://github.com/FunkinCrew/Funkin/commit/2175beaa651e009332202985be4b7eb4ed36e5a4)) - by @Hundrec - (docs) Improvements to Github Issues templates ([399869c](https://github.com/FunkinCrew/Funkin/commit/399869cdccc9c5ac27cecfbcdc33c3d7eb4b348c)) - by @Hundrec in [#3458](https://github.com/FunkinCrew/Funkin/pull/3458) - Fix some misspellings and grammar in code documentation ([6df80ba](https://github.com/FunkinCrew/Funkin/commit/6df80ba69d0e24269f40471f83462cab7d5e13cf)) - by @Hundrec in [#3477](https://github.com/FunkinCrew/Funkin/pull/3477) - (docs) Improvements to Github Issues templates ([67f7b63](https://github.com/FunkinCrew/Funkin/commit/67f7b638fb76840b868cbfa70a1c6063577984c5)) - by @Hundrec ### Fixed +- Fix the user song offsets being applied incorrectly, causing stuttering or skipping ([410cfe9](https://github.com/FunkinCrew/Funkin/commit/410cfe972d6df9de4d4d128375cf8380c4f06d92)) - by @JustKolosaki +- Fixed issues with variation / difficulty loading for Freeplay Menu which caused some songs to disappear ([c0314c8](https://github.com/FunkinCrew/Funkin/commit/c0314c85ecd5116641aff3de8e9153f7fe48e79c)) - by @ninjamuffin99 +- Picos songs now display properly on the Freeplay Menu ([1d2bd61](https://github.com/FunkinCrew/Funkin/commit/1d2bd61119e5f418df7f11d7ef2a0fdedee17d3d)) - by @ninjamuffin99 +- Exiting the chart editor doesn't crash the game anymore ([f52472a](https://github.com/FunkinCrew/Funkin/commit/f52472a4767388b22cfbab0f5f7860f6e6762856)) - by @EliteMasterEric and @ianharrigan - Disable flickering when changing FPS in the options menu ([b2647fe](https://github.com/FunkinCrew/Funkin/commit/b2647fe09f5281ce7074b26d47bc1524764168ee)) - by @lemz1 in [#3629](https://github.com/FunkinCrew/Funkin/pull/3629) - Anti alias / smooth the volume sound tray ([e66290c](https://github.com/FunkinCrew/Funkin/commit/e66290c55f7141402223644f06ec8a69edeee089)) - by @Kn1ghtNight in [#2853](https://github.com/FunkinCrew/Funkin/pull/2853) - Don't restart the FreeplayState song preview when changing the difficulty within the same variation ([903b3fc](https://github.com/FunkinCrew/Funkin/commit/903b3fc59905a70802618a1cd67407722ea956ed)) - by @JustKolosaki in [#3587](https://github.com/FunkinCrew/Funkin/pull/3587) -- Exiting the chart editor doesn't crash the game anymore ([f52472a](https://github.com/FunkinCrew/Funkin/commit/f52472a4767388b22cfbab0f5f7860f6e6762856)) - by @EliteMasterEric - Character Select cursor moves properly at lower framerates ([ab5bda3](https://github.com/FunkinCrew/Funkin/commit/ab5bda3ee573a6e03595ec6941e6de38df851889)) - by @ninjamuffin99 in [#3507](https://github.com/FunkinCrew/Funkin/pull/3507) - Stopped allowing F1 to create more than one help dialog window in the Charting Editor ([777978f](https://github.com/FunkinCrew/Funkin/commit/777978f5a544e1b7c89b47dcc365f734eb6d0df1)) - by @amyspark-ng - Main menu music doesn't cut out when switching states anymore. ([711e0a6](https://github.com/FunkinCrew/Funkin/commit/711e0a6b7547eb04113e9318dab900f01ad576a5)) - by @EliteMasterEric in [#3530](https://github.com/FunkinCrew/Funkin/pull/3530) - The dialog now shows up on the animation debugger view ([1fde59f](https://github.com/FunkinCrew/Funkin/commit/1fde59f999eac94eb10fc22094885de2f5310705)) - by @EliteMasterEric - Center preloader 'fnf' and 'dsp' text so it doesn't clip anymore ([165ad60](https://github.com/FunkinCrew/Funkin/commit/165ad6015539a295e9eefdaef291c312e9566b26)) - by @Burgerballs in [#3567](https://github.com/FunkinCrew/Funkin/pull/3567) - `Song.getFirstValidVariation()` now properly takes into account multiple variations/difficulty input ([d2e2987](https://github.com/FunkinCrew/Funkin/commit/d2e29879fe2acc6febfe0f335f655b741d630c34)) - by @ninjamuffin99 in [#3506](https://github.com/FunkinCrew/Funkin/pull/3506) -- (freeplay) Proper variation / difficulty loading for Freeplay Menu ([c0314c8](https://github.com/FunkinCrew/Funkin/commit/c0314c85ecd5116641aff3de8e9153f7fe48e79c)) - by @ninjamuffin99 -- Picos songs properly load on freeplay ([1d2bd61](https://github.com/FunkinCrew/Funkin/commit/1d2bd61119e5f418df7f11d7ef2a0fdedee17d3d)) - by @ninjamuffin99 - (debug) No more fullscreening when typing "F" in the flixel debugger console ([29b6763](https://github.com/FunkinCrew/Funkin/commit/29b6763290df05d42039806f3d142740568c80f0)) - by @ninjamuffin99 -- Fix the user song offsets being applied incorrectly ([410cfe9](https://github.com/FunkinCrew/Funkin/commit/410cfe972d6df9de4d4d128375cf8380c4f06d92)) - by @JustKolosaki - Fix crash in LatencyState when exiting / cleaning up state data ([39b1a42](https://github.com/FunkinCrew/Funkin/commit/39b1a42cfeafe2b7be8b66e2fe529e853d9ae197)) - by @lemz1 -- Add additional classes to Polymod Blacklist ([b0b73c8](https://github.com/FunkinCrew/Funkin/commit/b0b73c83994f33118c6a69550da9ec8ec1c07adc)) - by @EliteMasterEric +- Add additional classes to Polymod blacklist for security ([b0b73c8](https://github.com/FunkinCrew/Funkin/commit/b0b73c83994f33118c6a69550da9ec8ec1c07adc)) - by @EliteMasterEric - Stop allowing inputs after selecting a character ([dbf66ac](https://github.com/FunkinCrew/Funkin/commit/dbf66ac250137262866d75f7c1387645b35d88d0)) - by @ACrazyTown -- Fixed an issue where the player and girlfriend would disappear or overlap themselves in Character Select (community fix by gamerbross) -- Fixed an issue where the game would show the wrong girlfriend in Character Select (community fix by gamerbross) -- Fixed an issue where the cursor wouldn't update properly in Character Select (community fix by gamerbross) -- Fixed an issue where the player would display double after entering character select or when spamming buttons (community fix by gamerbross) +- Fixed an issue where the player and girlfriend would disappear or overlap themselves in Character Select (community fix by @gamerbross) +- Fixed an issue where the game would show the wrong girlfriend in Character Select (community fix by @gamerbross) +- Fixed an issue where the cursor wouldn't update properly in Character Select (community fix by @gamerbross) +- Fixed an issue where the player would display double after entering character select or when spamming buttons (community fix by @gamerbross) ## New Contributors for 0.5.2 * @Kn1ghtNight made their first contribution in [#2853](https://github.com/FunkinCrew/Funkin/pull/2853) From c0b15ec066940fcb8cb8acbd76a1ba7f1ba1c1a7 Mon Sep 17 00:00:00 2001 From: Hundrec Date: Wed, 23 Oct 2024 14:30:52 -0700 Subject: [PATCH 02/25] [docs] Add missing changes and links to Changelog (#3655) * changelog sweep * Resolve a few conflicts * Resolve more conflicts * DadBattle * Re-add @ianharrigan * Add links to 0.5.0 * Add links and contributors to 0.4.1 and 0.4.0 * Add links to 0.3.3 and finishing touches * Add and polish 0.5.3 changes * Make spacing consistent --- CHANGELOG.md | 283 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 173 insertions(+), 110 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b61cb8f881..3382d24415 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,53 +4,63 @@ All notable changes 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). +## [0.5.3] - 2024-10-18 +This patch resolves a critical issue which could cause user's save data to become corrupted. It is recommended that users switch to this version immediately and avoid using version 0.5.2. +### Fixed +- Fixed a critical issue in which the Stage Editor theme value could not be parsed by older versions of the game, resulting in all save data being destroyed. + - Added a check that prevents save data from being loaded if it is corrupted rather than overriding it. +- `optionsChartEditor.chartEditorLiveInputStyle` in the save data converted from an Enum to a String to fix save data compatibility issues. +- `optionsStageEditor.theme` in the save data converted from an Enum to a String to fix save data compatibility issues. + - In the future, Enum values should not be used in order to prevent incompatibilities caused by introducing new types to the save data that older versions cannot parse. +- Fixed an issue where some publicly distributed release builds of the game were not updated to the latest version. + + ## [0.5.2] - 2024-10-11 ### Added - Added InverseDotsShader that emulates flash selections ([097dbf5](https://github.com/FunkinCrew/Funkin/commit/097dbf5bb4346d431d8ca9f0ec4bc5b5e6f4523f)) - by @ninjamuffin99 -- Added a new reworked Stage Editor ([27a0b44](https://github.com/FunkinCrew/Funkin/pull/3482/commits/27a0b4426f86f04362f97e16e2eff580c9402f34)) - by @JustKolosaki +- Added a new reworked Stage Editor ([27a0b44](https://github.com/FunkinCrew/Funkin/pull/3482/commits/27a0b4426f86f04362f97e16e2eff580c9402f34)) - by @JustKolosaki in [#3482](https://github.com/FunkinCrew/Funkin/pull/3482) - Added the `color` attribute to stage prop JSON data to allow them to be tinted without code. ([27a0b44](https://github.com/FunkinCrew/Funkin/pull/3482/commits/27a0b4426f86f04362f97e16e2eff580c9402f34)) - by @JustKolosaki - Added the `angle` attribute to stage prop JSON data to allow them to be rotated without code. ([27a0b44](https://github.com/FunkinCrew/Funkin/pull/3482/commits/27a0b4426f86f04362f97e16e2eff580c9402f34)) - by @JustKolosaki -- Added the `blend` attribute to the stage prop JSON data to allow blend modes to be applied without code. ([27a0b44](https://github.com/FunkinCrew/Funkin/pull/3482/commits/27a0b4426f86f04362f97e16e2eff580c9402f34)) - by @JustKolosaki - +- Added the `blend` attribute to the stage prop JSON data to allow blend modes to be applied without code. ([27a0b44](https://github.com/FunkinCrew/Funkin/pull/3482/commits/27a0b4426f86f04362f97e16e2eff580c9402f34)) - by @JustKolosaki ### Changed - (docs) Delete Modding.md since we have a separate modding documentation ([a42240e](https://github.com/FunkinCrew/Funkin/commit/a42240e6a595d33034f2c887bf38a350d1fa0f15)) - by @AbnormalPoof in [#3651](https://github.com/FunkinCrew/Funkin/pull/3651) - (docs) Create a git cliff template for easier changelog stuff ([91b4544](https://github.com/FunkinCrew/Funkin/commit/91b4544f7ebc51485e3e28c3d716ba6ee69ad885)) - by @ninjamuffin99 in [#3652](https://github.com/FunkinCrew/Funkin/pull/3652) - (docs) Add additional `variation` input parameter to `Save.hasBeatenSong()` to allow usage of the function by inputting a variation id ([4fa9a0d](https://github.com/FunkinCrew/Funkin/commit/4fa9a0daaa67e0977460b147bd1f74a118e3e2a5)) - by @ninjamuffin99 -- (docs) Added modding docs link in readme ([4b54118](https://github.com/FunkinCrew/Funkin/commit/4b54118731e26118111e06558ae4853c577fe4bb)) - by @Cartridge-Man -- (docs) Fix some misspellings and grammar in code documentation ([2175bea](https://github.com/FunkinCrew/Funkin/commit/2175beaa651e009332202985be4b7eb4ed36e5a4)) - by @Hundrec +- (docs) Added modding docs link in readme ([4b54118](https://github.com/FunkinCrew/Funkin/commit/4b54118731e26118111e06558ae4853c577fe4bb)) - by @Cartridge-Man in [#3082](https://github.com/FunkinCrew/Funkin/pull/3082) +- (docs) Fix some misspellings and grammar in code documentation ([2175bea](https://github.com/FunkinCrew/Funkin/commit/2175beaa651e009332202985be4b7eb4ed36e5a4)) - by @Hundrec in [#3477](https://github.com/FunkinCrew/Funkin/pull/3477) - (docs) Improvements to Github Issues templates ([399869c](https://github.com/FunkinCrew/Funkin/commit/399869cdccc9c5ac27cecfbcdc33c3d7eb4b348c)) - by @Hundrec in [#3458](https://github.com/FunkinCrew/Funkin/pull/3458) -- Fix some misspellings and grammar in code documentation ([6df80ba](https://github.com/FunkinCrew/Funkin/commit/6df80ba69d0e24269f40471f83462cab7d5e13cf)) - by @Hundrec in [#3477](https://github.com/FunkinCrew/Funkin/pull/3477) -- (docs) Improvements to Github Issues templates ([67f7b63](https://github.com/FunkinCrew/Funkin/commit/67f7b638fb76840b868cbfa70a1c6063577984c5)) - by @Hundrec - ### Fixed -- Fix the user song offsets being applied incorrectly, causing stuttering or skipping ([410cfe9](https://github.com/FunkinCrew/Funkin/commit/410cfe972d6df9de4d4d128375cf8380c4f06d92)) - by @JustKolosaki +- Fix the user song offsets being applied incorrectly, causing stuttering or skipping ([410cfe9](https://github.com/FunkinCrew/Funkin/commit/410cfe972d6df9de4d4d128375cf8380c4f06d92)) - by @JustKolosaki in [#3546](https://github.com/FunkinCrew/Funkin/pull/3546) in [#3506](https://github.com/FunkinCrew/Funkin/pull/3506) - Fixed issues with variation / difficulty loading for Freeplay Menu which caused some songs to disappear ([c0314c8](https://github.com/FunkinCrew/Funkin/commit/c0314c85ecd5116641aff3de8e9153f7fe48e79c)) - by @ninjamuffin99 -- Picos songs now display properly on the Freeplay Menu ([1d2bd61](https://github.com/FunkinCrew/Funkin/commit/1d2bd61119e5f418df7f11d7ef2a0fdedee17d3d)) - by @ninjamuffin99 -- Exiting the chart editor doesn't crash the game anymore ([f52472a](https://github.com/FunkinCrew/Funkin/commit/f52472a4767388b22cfbab0f5f7860f6e6762856)) - by @EliteMasterEric and @ianharrigan -- Disable flickering when changing FPS in the options menu ([b2647fe](https://github.com/FunkinCrew/Funkin/commit/b2647fe09f5281ce7074b26d47bc1524764168ee)) - by @lemz1 in [#3629](https://github.com/FunkinCrew/Funkin/pull/3629) -- Anti alias / smooth the volume sound tray ([e66290c](https://github.com/FunkinCrew/Funkin/commit/e66290c55f7141402223644f06ec8a69edeee089)) - by @Kn1ghtNight in [#2853](https://github.com/FunkinCrew/Funkin/pull/2853) +- Pico's songs now display properly on the Freeplay Menu ([1d2bd61](https://github.com/FunkinCrew/Funkin/commit/1d2bd61119e5f418df7f11d7ef2a0fdedee17d3d)) - by @ninjamuffin99 in [#3506](https://github.com/FunkinCrew/Funkin/pull/3506) +- Exiting the chart editor doesn't crash the game anymore ([f52472a](https://github.com/FunkinCrew/Funkin/commit/f52472a4767388b22cfbab0f5f7860f6e6762856)) - by @EliteMasterEric and @ianharrigan in [#3519](https://github.com/FunkinCrew/Funkin/pull/3519) +- Disable flickering when attempting to select FPS in the options menu ([b2647fe](https://github.com/FunkinCrew/Funkin/commit/b2647fe09f5281ce7074b26d47bc1524764168ee)) - by @lemz1 in [#3629](https://github.com/FunkinCrew/Funkin/pull/3629) +- Anti-alias / smooth the volume sound tray ([e66290c](https://github.com/FunkinCrew/Funkin/commit/e66290c55f7141402223644f06ec8a69edeee089)) - by @Kn1ghtNight in [#2853](https://github.com/FunkinCrew/Funkin/pull/2853) - Don't restart the FreeplayState song preview when changing the difficulty within the same variation ([903b3fc](https://github.com/FunkinCrew/Funkin/commit/903b3fc59905a70802618a1cd67407722ea956ed)) - by @JustKolosaki in [#3587](https://github.com/FunkinCrew/Funkin/pull/3587) - Character Select cursor moves properly at lower framerates ([ab5bda3](https://github.com/FunkinCrew/Funkin/commit/ab5bda3ee573a6e03595ec6941e6de38df851889)) - by @ninjamuffin99 in [#3507](https://github.com/FunkinCrew/Funkin/pull/3507) -- Stopped allowing F1 to create more than one help dialog window in the Charting Editor ([777978f](https://github.com/FunkinCrew/Funkin/commit/777978f5a544e1b7c89b47dcc365f734eb6d0df1)) - by @amyspark-ng +- Stop allowing F1 to create more than one help dialog window in the Charting Editor ([777978f](https://github.com/FunkinCrew/Funkin/commit/777978f5a544e1b7c89b47dcc365f734eb6d0df1)) - by @amyspark-ng in [#3552](https://github.com/FunkinCrew/Funkin/pull/3552) - Main menu music doesn't cut out when switching states anymore. ([711e0a6](https://github.com/FunkinCrew/Funkin/commit/711e0a6b7547eb04113e9318dab900f01ad576a5)) - by @EliteMasterEric in [#3530](https://github.com/FunkinCrew/Funkin/pull/3530) -- The dialog now shows up on the animation debugger view ([1fde59f](https://github.com/FunkinCrew/Funkin/commit/1fde59f999eac94eb10fc22094885de2f5310705)) - by @EliteMasterEric +- The dialog now shows up on the animation debugger view ([1fde59f](https://github.com/FunkinCrew/Funkin/commit/1fde59f999eac94eb10fc22094885de2f5310705)) - by @EliteMasterEric in [#3530](https://github.com/FunkinCrew/Funkin/pull/3530) - Center preloader 'fnf' and 'dsp' text so it doesn't clip anymore ([165ad60](https://github.com/FunkinCrew/Funkin/commit/165ad6015539a295e9eefdaef291c312e9566b26)) - by @Burgerballs in [#3567](https://github.com/FunkinCrew/Funkin/pull/3567) - `Song.getFirstValidVariation()` now properly takes into account multiple variations/difficulty input ([d2e2987](https://github.com/FunkinCrew/Funkin/commit/d2e29879fe2acc6febfe0f335f655b741d630c34)) - by @ninjamuffin99 in [#3506](https://github.com/FunkinCrew/Funkin/pull/3506) -- (debug) No more fullscreening when typing "F" in the flixel debugger console ([29b6763](https://github.com/FunkinCrew/Funkin/commit/29b6763290df05d42039806f3d142740568c80f0)) - by @ninjamuffin99 -- Fix crash in LatencyState when exiting / cleaning up state data ([39b1a42](https://github.com/FunkinCrew/Funkin/commit/39b1a42cfeafe2b7be8b66e2fe529e853d9ae197)) - by @lemz1 -- Add additional classes to Polymod blacklist for security ([b0b73c8](https://github.com/FunkinCrew/Funkin/commit/b0b73c83994f33118c6a69550da9ec8ec1c07adc)) - by @EliteMasterEric -- Stop allowing inputs after selecting a character ([dbf66ac](https://github.com/FunkinCrew/Funkin/commit/dbf66ac250137262866d75f7c1387645b35d88d0)) - by @ACrazyTown -- Fixed an issue where the player and girlfriend would disappear or overlap themselves in Character Select (community fix by @gamerbross) -- Fixed an issue where the game would show the wrong girlfriend in Character Select (community fix by @gamerbross) -- Fixed an issue where the cursor wouldn't update properly in Character Select (community fix by @gamerbross) -- Fixed an issue where the player would display double after entering character select or when spamming buttons (community fix by @gamerbross) +- (debug) No more fullscreening when typing "F" in the flixel debugger console ([29b6763](https://github.com/FunkinCrew/Funkin/commit/29b6763290df05d42039806f3d142740568c80f0)) - by @ninjamuffin99 +- Fix crash in LatencyState when exiting / cleaning up state data ([39b1a42](https://github.com/FunkinCrew/Funkin/commit/39b1a42cfeafe2b7be8b66e2fe529e853d9ae197)) - by @lemz1 in [#3493](https://github.com/FunkinCrew/Funkin/pull/3493) +- Add additional classes to Polymod blacklist for security ([b0b73c8](https://github.com/FunkinCrew/Funkin/commit/b0b73c83994f33118c6a69550da9ec8ec1c07adc)) - by @EliteMasterEric in [#3558](https://github.com/FunkinCrew/Funkin/pull/3558) +- Stop allowing inputs after selecting a character ([dbf66ac](https://github.com/FunkinCrew/Funkin/commit/dbf66ac250137262866d75f7c1387645b35d88d0)) - by @ACrazyTown in [#3398](https://github.com/FunkinCrew/Funkin/pull/3398) +- Fix conflict with modded StrumlineNote sprite looping animation ([bc546e8](https://github.com/FunkinCrew/Funkin/commit/bc546e86aa77ffc795b3f079de5f590289a9c583)) - by @DaWaterMalone in [#3577](https://github.com/FunkinCrew/Funkin/pull/3577) +- Properly format the millisecond counter in the chart editor playbar ([f1b6e6c](https://github.com/FunkinCrew/Funkin/commit/f1b6e6c4e42455e0c2900d738ebc24893f2479a0)) - by @afreetoplaynoob in [#3537](https://github.com/FunkinCrew/Funkin/pull/3537) +- Fixed an issue where the player and girlfriend would disappear or overlap themselves in Character Select ([community fix by @gamerbross](https://github.com/FunkinCrew/Funkin/pull/3457)) +- Fixed an issue where the game would show the wrong girlfriend in Character Select ([community fix by @gamerbross](https://github.com/FunkinCrew/Funkin/pull/3457)) +- Fixed an issue where the cursor wouldn't update properly in Character Select ([community fix by @gamerbross](https://github.com/FunkinCrew/Funkin/pull/3457)) +- Fixed an issue where the player would display double after entering character select or when spamming buttons ([community fix by @gamerbross](https://github.com/FunkinCrew/Funkin/pull/3457)) ## New Contributors for 0.5.2 +* @JustKolosaki made their first contribution in [#3482](https://github.com/FunkinCrew/Funkin/pull/3482) * @Kn1ghtNight made their first contribution in [#2853](https://github.com/FunkinCrew/Funkin/pull/2853) -* @DaWaterMalone made their first contribution -* @amyspark-ng made their first contribution -* @Cartridge-Man made their first contribution -* @afreetoplaynoob made their first contribution +* @DaWaterMalone made their first contribution in [#3577](https://github.com/FunkinCrew/Funkin/pull/3577) +* @amyspark-ng made their first contribution in [#3552](https://github.com/FunkinCrew/Funkin/pull/3552) +* @Cartridge-Man made their first contribution in [#3082](https://github.com/FunkinCrew/Funkin/pull/3082) +* @afreetoplaynoob made their first contribution in [#3537](https://github.com/FunkinCrew/Funkin/pull/3537) ## [0.5.1] - 2024-09-30 @@ -68,7 +78,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Separated the Perfect and Perfect (Gold) animations in the Playable Character data. - Base game just uses the same animation for both, but modders can split the animations up on their custom characters now. - Added a bunch of Flash project files from the Weekend 1 and Playable Pico updates to the `Funkin.art` repository. -- Added the `flipX` and `flipY` parameters to props in the Stage data. (community feature by abnormalpoof) +- Added the `flipX` and `flipY` parameters to props in the Stage data. ([community feature by AbnormalPoof](https://github.com/FunkinCrew/Funkin/pull/3474)) ### Changed - The game's mod API version check is now more dynamic. - The update accepts mods with API version `0.5.0` as well as `0.5.1`. @@ -117,18 +127,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Fixed an issue where Spirit's trail in Week 6 would not display correctly. - Fixed an issue where the Input Offsets menu would crash when entering it before playing a song on web builds. - Fixed an issue where the Results screen would spam the percentage tick noise instead of playing when the value changes. -- Fixed an issue where parts of the Chart Editor could not be interacted with. (community fix by KadeDeveloper) -- Fixed an issue where classic FocusCamera song events could cause the camera to snap in place. (community fix by NebulaZorua) -- Fixed an issue where achieving the same rank on a song (but a different clear %) would override your clear %, even if it was lower. (community fix by lemz1) -- Fixed an issue where the FPS counter would display even if Debug Display was turned off. (community fix by Lethrial) -- Fixed an issue where selecting the area to the left of the Chart Editor would select some of the player's notes (community fix by NotHyper474) -- Fixed an issue where pixel icons in the Chart Editor would not display correctly. (community fix by Techniktil) -- Fixed an issue where `Stage.addCharacter` would not properly assign the `characterType`. (community fix by KadeDeveloper) -- Fixed an issue where players should interact with Character Select during the unlock sequence, causing a crash. (community fix by actualmandm) -- Fixed an issue where hold notes in Week 6 were not scaled/positioned correctly. (community fix by dombomb64) -- Fixed an issue where audio offets would not interact with the Chart Editor properly. (community fix by KadeDev) -- Fixed an issue where fetching Modules during the `onDestroy` event would fail at random. (community fix by cyn0x8) -- Fixed an issue where `onSubStateOpenEnd` and `onSubStateCloseEnd` script events would not always get called. (community fix by lemz1) +- Fixed an issue where parts of the Chart Editor could not be interacted with. ([community fix by Kade-github](https://github.com/FunkinCrew/Funkin/pull/3337)) +- Fixed an issue where classic FocusCamera song events could cause the camera to snap in place. ([community fix by nebulazorua](https://github.com/FunkinCrew/Funkin/pull/2331)) +- Fixed an issue where achieving the same rank on a song (but a different clear %) would override your clear %, even if it was lower. ([community fix by lemz1](https://github.com/FunkinCrew/Funkin/pull/3019)) +- Fixed an issue where the FPS counter would display even if Debug Display was turned off. ([community fix by Lethrial](https://github.com/FunkinCrew/Funkin/pull/3356)) +- Fixed an issue where selecting the area to the left of the Chart Editor would select some of the player's notes ([community fix by NotHyper-474](https://github.com/FunkinCrew/Funkin/pull/3093)) +- Fixed an issue where pixel icons in the Chart Editor would not display correctly. ([community fix by Techniktil](https://github.com/FunkinCrew/Funkin/pull/3339)) +- Fixed an issue where `Stage.addCharacter` would not properly assign the `characterType`. ([community fix by Kade-github](https://github.com/FunkinCrew/Funkin/pull/3357)) +- Fixed an issue where players could interact with Character Select during the unlock sequence, causing a crash. ([community fix by ActualMandM](https://github.com/FunkinCrew/Funkin/pull/3355)) +- Fixed an issue where hold notes in Week 6 were not scaled/positioned correctly. ([community fix by dombomb64](https://github.com/FunkinCrew/Funkin/pull/3351)) +- Fixed an issue where audio offets would not interact with the Chart Editor properly. ([community fix by Kade-github](https://github.com/FunkinCrew/Funkin/pull/3384)) +- Fixed an issue where fetching Modules during the `onDestroy` event would fail at random. ([community fix by cyn0x8](https://github.com/FunkinCrew/Funkin/pull/3131)) +- Fixed an issue where `onSubStateOpenEnd` and `onSubStateCloseEnd` script events would not always get called. ([community fix by lemz1](https://github.com/FunkinCrew/Funkin/pull/3138)) + +## New Contributors for 0.5.1 +* @Lethrial made their first contribution in [#3356](https://github.com/FunkinCrew/Funkin/pull/3356) +* @dombomb64 made their first contribution in [#3351](https://github.com/FunkinCrew/Funkin/pull/3351) + ## [0.5.0] - 2024-09-12 ### Added @@ -165,8 +180,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Implemented alternate animations and music for Pico in the results screen. - These display on Pico remixes, as well as when playing Weekend 1. - Implemented support for scripted Note Kinds. You can use HScript define a different note style to display for these notes as well as custom behavior. (community feature by lemz1) -- Implemented support for Numeric and Selector options in the Options menu. (community feature by FlooferLand) -- Implemented new animations for Tankman and Pico +- Implemented support for Numeric and Selector options in the Options menu. ([community feature by FlooferLand](https://github.com/FunkinCrew/Funkin/pull/2942)) +- Implemented new animations for Tankman and Pico. ## Changed - Girlfriend and Nene now perform previously unused animations when you achieve a large combo, or drop a large combo. - The pixel character icons in the Freeplay menu now display an animation! @@ -174,40 +189,51 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Character offsets are now independent of the character's scale. - This should resolve issues with offsets when porting characters from older mods. - Pixel character offsets have been modified to compensate. -- Note style data can now specify custom combo count graphics, judgement graphics, countdown graphics, and countdown audio. (community feature by anysad) +- Note style data can now specify custom combo count graphics, judgement graphics, countdown graphics, and countdown audio. ([community feature by anysad](https://github.com/FunkinCrew/Funkin/pull/3020)) - These were previously using hardcoded values based on whether the stage was `school` or `schoolEvil`. - The `danceEvery` property of characters and stage props can now use values with a precision of `0.25`, to play their idle animation up to four times per beat. - Reworked the JSON merging system in Polymod; you can now include JSONPatch files under `_merge` in your mod folder to add, modify, or remove values in a JSON without replacing it entirely! -- Cutscenes now automatically pause when tabbing out (community fix by AbnormalPoof) -- Characters will now respect the `danceEvery` property (community fix by gamerbross) -- The F5 function now reloads the current song's chart data from disc (community feature by gamerbross) -- Refactored the compilation guide and added common troubleshooting steps (community fix by Hundrec) -- Made several layout improvements and fixes to the Animation Offsets editor in the Debug menu (community fix by gamerbross) -- Fixed a bug where the Back sound would be not played when leaving the Story menu and Options menu (community fix by AppleHair) -- Animation offsets no longer directly modify the `x` and `y` position of props, which makes props work better with tweens (community fix by Sword352) -- The YEAH! events in Tutorial now use chart events rather than being hard-coded (community fix by anysad) +- Cutscenes now automatically pause when tabbing out ([community fix by AbnormalPoof](https://github.com/FunkinCrew/Funkin/pull/2903)) +- Characters will now respect the `danceEvery` property ([community fix by gamerbross](https://github.com/FunkinCrew/Funkin/pull/2925)) +- The F5 function now reloads the current song's chart data from disc ([community feature by gamerbross](https://github.com/FunkinCrew/Funkin/pull/2990)) +- Refactored the compilation guide and added common troubleshooting steps ([community fix by Hundrec](https://github.com/FunkinCrew/Funkin/pull/2813)) +- Made several layout improvements and fixes to the Animation Offsets editor in the Debug menu ([community fix by gamerbross](https://github.com/FunkinCrew/Funkin/pull/2820)) +- Fixed a bug where the Back sound would be not played when leaving the Story menu and Options menu ([community fix by AppleHair](https://github.com/FunkinCrew/Funkin/pull/2986)) +- Animation offsets no longer directly modify the `x` and `y` position of props, which makes props work better with tweens ([community fix by Sword352](https://github.com/FunkinCrew/Funkin/pull/2310)) +- The YEAH! events in Tutorial now use chart events rather than being hard-coded ([community fix by anysad](https://github.com/FunkinCrew/Funkin/pull/3007)) - The player's Score now displays commas in it (community fix by loggo) ## Fixed - Fixed an issue where songs with no notes would crash on the Results screen. - Fixed an issue where the old icon easter egg would not work properly on pixel levels. - Fixed an issue where you could play notes during the Thorns cutscene. - Fixed an issue where the Heart icon when favoriting a song in Freeplay would be malformed. -- Fixed an issue where Pico's death animation displays a faint blue background (community fix by doggogit) -- Fixed an issue where mod songs would not play a preview in the Freeplay menu (community fix by KarimAkra) -- Fixed an issue where the Memory Usage counter could overflow and display a negative number (community fix by KarimAkra) -- Fixed an issue where pressing the Chart Editor keybind while playtesting a chart would reset the chart editor (community fix by gamerbross) -- Fixed a crash bug when pressing F5 after seeing the sticker transition (community fix by gamerbross) -- Fixed an issue where the Story Mode menu couldn't be scrolled with a mouse (community fix by JVNpixels) -- Fixed an issue causing the song to majorly desync sometimes (community fix by Burgerballs) -- Fixed an issue where the Freeplay song preview would not respect the instrumental ID specified in the song metadata (community fix by AppleHair) -- Fixed an issue where Tankman's icon wouldn't display in the Chart Editor (community fix by hundrec) -- Fixed an issue where pausing the game during a camera zoom would zoom the pause menu. (community fix by gamerbros) -- Fixed an issue where certain UI elements would not flash at a consistent rate (community fix by cyn0x8) -- Fixed an issue where the game would not use the placeholder health icon as a fallback (community fix by gamerbross) -- Fixed an issue where the chart editor could get stuck creating a hold note when using Live Inputs (community fix by gamerbross) -- Fixed an issue where character graphics could not be placed in week folders (community fix by 7oltan) -- Fixed a crash issue when a Freeplay song has no `Normal` difficulty (community fix by Applehair and gamerbross) -- Fixed an issue in Story Mode where a song that isn't valid for the current variation could be selected (community fix by Applehair) +- Fixed an issue where Pico's death animation displays a faint blue background ([community fix by doggogit](https://github.com/FunkinCrew/funkin.assets/pull/1)) +- Fixed an issue where mod songs would not play a preview in the Freeplay menu ([community fix by KarimAkra](https://github.com/FunkinCrew/Funkin/pull/2724)) +- Fixed an issue where the Memory Usage counter could overflow and display a negative number ([community fix by KarimAkra](https://github.com/FunkinCrew/Funkin/pull/2713)) +- Fixed an issue where pressing the Chart Editor keybind while playtesting a chart would reset the chart editor ([community fix by gamerbross](https://github.com/FunkinCrew/Funkin/pull/2739)) +- Fixed a crash bug when pressing F5 after seeing the sticker transition ([community fix by gamerbross](https://github.com/FunkinCrew/Funkin/pull/2863)) +- Fixed an issue where the Story Mode menu couldn't be scrolled with a mouse ([community fix by JVNpixels](https://github.com/FunkinCrew/Funkin/pull/2873)) +- Fixed an issue causing the song to majorly desync sometimes ([community fix by Burgerballs](https://github.com/FunkinCrew/Funkin/pull/3058)) +- Fixed an issue where the Freeplay song preview would not respect the instrumental ID specified in the song metadata ([community fix by AppleHair](https://github.com/FunkinCrew/Funkin/pull/2742)) +- Fixed an issue where Tankman's icon wouldn't display in the Chart Editor ([community fix by Hundrec](https://github.com/FunkinCrew/Funkin/pull/2912)) +- Fixed an issue where pausing the game during a camera zoom would zoom the pause menu. ([community fix by gamerbross](https://github.com/FunkinCrew/Funkin/pull/2567)) +- Fixed an issue where certain UI elements would not flash at a consistent rate ([community fix by cyn0x8](https://github.com/FunkinCrew/Funkin/pull/2494)) +- Fixed an issue where the game would not use the placeholder health icon as a fallback ([community fix by gamerbross](https://github.com/FunkinCrew/Funkin/pull/3005)) +- Fixed an issue where the chart editor could get stuck creating a hold note when using Live Inputs ([community fix by gamerbross](https://github.com/FunkinCrew/Funkin/pull/2992)) +- Fixed an issue where character graphics could not be placed in week folders ([community fix by 7oltan](https://github.com/FunkinCrew/Funkin/pull/3035)) +- Fixed a crash issue when a Freeplay song has no `Normal` difficulty ([community fix by AppleHair](https://github.com/FunkinCrew/Funkin/pull/3036) and [gamerbross](https://github.com/FunkinCrew/Funkin/pull/2712)) +- Fixed an issue in Story Mode where a song that isn't valid for the current variation could be selected ([community fix by AppleHair](https://github.com/FunkinCrew/Funkin/pull/3037)) + +## New Contributors for 0.5.0 +* @Flooferland made their first contribution in [#2942](https://github.com/FunkinCrew/Funkin/pull/2942) +* @anysad made their first contribution in [#3007](https://github.com/FunkinCrew/Funkin/pull/3007) +* @Sword352 made their first contribution in [#2310](https://github.com/FunkinCrew/Funkin/pull/2310) +* @KarimAkra made their first contribution in [#2713](https://github.com/FunkinCrew/Funkin/pull/2713) +* @JVNpixels made their first contribution in [#2873](https://github.com/FunkinCrew/Funkin/pull/2873) +* @AppleHair made their first contribution in [#2742](https://github.com/FunkinCrew/Funkin/pull/2742) +* @7oltan made their first contribution in [#3035](https://github.com/FunkinCrew/Funkin/pull/3035) +* @cyn0x8 made their first contribution in [#2494](https://github.com/FunkinCrew/Funkin/pull/2494) + ## [0.4.1] - 2024-06-12 ### Added @@ -216,7 +242,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Highscores and ranks are now saved separately, which fixes the issue where people would overwrite their saves with higher scores, which would remove their rank if they had a lower one. -- A-Bot speaker now reacts to the user's volume preference on desktop (thanks to [M7theguy for the issue report/suggestion](https://github.com/FunkinCrew/Funkin/issues/2744)!) +- A-Bot speaker now reacts to the user's volume preference on desktop ([thanks to M7theguy for the issue report/suggestion](https://github.com/FunkinCrew/Funkin/issues/2744)!) - On Freeplay, heart icons are shifted to the right when you favorite a song that has no rank on it. - Only play `scrollMenu` sound effect when there's a real change on the freeplay menu ([thanks gamerbross for the PR!](https://github.com/FunkinCrew/Funkin/pull/2741)) - Gave antialiasing to the edge of the dad graphic on Freeplay @@ -224,20 +250,25 @@ which would remove their rank if they had a lower one. - Made several chart revisions - Re-enabled custom camera events in Roses (Erect/Nightmare) - Tweaked the chart for Lit Up (Hard) - - Corrected the difficulty ratings for M.I.L.F. (Easy/Normal/Hard) + - Corrected the difficulty ratings for M.I.L.F (Easy/Normal/Hard) ### Fixed - Fixed an issue in the controls menu where some control binds would overlap their names - Fixed crash when attempting to exit the gameover screen when also attempting to retry the song ([thanks DMMaster636 for the PR!](https://github.com/FunkinCrew/Funkin/pull/2709)) -- Fix botplay sustain release bug ([thanks Hundrec!](Fix botplay sustain release bug #2683)) +- Fix botplay sustain release bug ([thanks Hundrec!](https://github.com/FunkinCrew/Funkin/pull/2683)) - Fix for the camera not pausing during a gameplay pause ([thanks gamerbross!](https://github.com/FunkinCrew/Funkin/pull/2684)) -- Fixed issue where Pico's gameplay sprite would unintentionally appear on the gameover screen when dying on 2Hot from an explosion +- Fixed issue where Pico's gameplay sprite would unintentionally appear on the gameover screen when dying on 2hot from an explosion - Freeplay previews properly fade volume during the BF idle animation -- Fixed bug where Dadbattle incorrectly appeared as Dadbattle Erect when returning to freeplay on Hard -- Fixed 2Hot not appearing under the "#" category in Freeplay menu +- Fixed bug where DadBattle incorrectly appeared as DadBattle Erect when returning to freeplay on Hard +- Fixed 2hot not appearing under the "#" category in Freeplay menu - Fixed a bug where the Chart Editor would crash when attempting to select an event with the Event toolbox open - Improved offsets for Pico and Tankman opponents so they don't slide around as much. - Fixed the black "temp" graphic on freeplay from being incorrectly sized / masked, now it's identical to the dad freeplay graphic +## New Contributors for 0.4.1 +* @DMMaster636 made their first contribution in [#2709](https://github.com/FunkinCrew/Funkin/pull/2709) +* @Hundrec made their first contribution in [#2683](https://github.com/FunkinCrew/Funkin/pull/2683) + + ## [0.4.0] - 2024-06-06 ### Added - 2 new Erect remixes, Eggnog and Satin Panties. Check them out from the Freeplay menu! @@ -246,14 +277,14 @@ which would remove their rank if they had a lower one. - Freeplay now plays a preview of songs when you hover over them. - Added a Charter field to the chart format, to allow for crediting the creator of a level's chart. - You can see who charted a song from the Pause menu. -- Added a new Scroll Speed chart event to change the note speed mid-song (thanks burgerballs!) +- Added a new Scroll Speed chart event to change the note speed mid-song ([thanks Burgerballs!](https://github.com/FunkinCrew/Funkin/pull/2409)) ### Changed - Tweaked the charts for several songs: - Tutorial (increased the note speed slightly) - Spookeez - Monster - Winter Horrorland - - M.I.L.F. + - M.I.L.F - Senpai (increased the note speed) - Roses - Thorns (increased the note speed slightly) @@ -263,55 +294,75 @@ which would remove their rank if they had a lower one. - Favorite songs marked in Freeplay are now stored between sessions. - The Freeplay easter eggs are now easier to see. - In the event that the game cannot load your save data, it will now perform a backup before clearing it, so that we can try to repair it in the future. -- Custom note styles are now properly supported for songs; add new notestyles via JSON, then select it for use from the Chart Editor Metadata toolbox. (thanks Keoiki!) -- Health icons now support a Winning frame without requiring a spritesheet, simply include a third frame in the icon file. (thanks gamerbross!) +- Custom note styles are now properly supported for songs; add new notestyles via JSON, then select it for use from the Chart Editor Metadata toolbox. ([thanks Keoiki!](https://github.com/FunkinCrew/Funkin/pull/2581)) +- Health icons now support a Winning frame without requiring a spritesheet, simply include a third frame in the icon file. ([thanks gamerbross!](https://github.com/FunkinCrew/Funkin/pull/2593)) - Remember that for more complex behaviors such as animations or transitions, you should use an XML file to define each frame. - Improved the Event Toolbox in the Chart Editor; dropdowns are now bigger, include search field, and display elements in alphabetical order rather than a random order. ### Fixed - Fixed an issue where Nene's visualizer would not play on Desktop builds - Fixed a bug where the game would silently fail to load saves on HTML5 - Fixed some bugs with the props on the Story Menu not bopping properly -- Additional fixes to the Loading bar on HTML5 (thanks lemz1!) -- Fixed several bugs with the TitleState, including missing music when returning from the Main Menu (thanks gamerbross!) -- Fixed a camera bug in the Main Menu (thanks richTrash21!) -- Fixed a bug where changing difficulties in Story mode wouldn't update the score (thanks sectorA!) -- Fixed a crash in Freeplay caused by a level referencing an invalid song (thanks gamerbross!) -- Fixed a bug where pressing the volume keys would stop the Toy commercial (thanks gamerbross!) -- Fixed a bug where the Chart Editor Playtest would crash when losing (thanks gamerbross!) -- Fixed a bug where hold notes would display improperly in the Chart Editor when downscroll was enabled for gameplay (thanks gamerbross!) -- Fixed a bug where hold notes would be positioned wrong on downscroll (thanks MaybeMaru!) -- Removed a large number of unused imports to optimize builds (thanks Ethan-makes-music!) -- Improved debug logging for unscripted stages (thanks gamerbross!) +- Additional fixes to the Loading bar on HTML5 ([thanks lemz1!](https://github.com/FunkinCrew/Funkin/pull/2553)) +- Fixed several bugs with the TitleState, including missing music when returning from the Main Menu ([thanks gamerbross!](https://github.com/FunkinCrew/Funkin/pull/2539)) +- Fixed a camera bug in the Main Menu ([thanks richTrash21!](https://github.com/FunkinCrew/Funkin/pull/2576)) +- Fixed a bug where changing difficulties in Story mode wouldn't update the score ([thanks sector-a!](https://github.com/FunkinCrew/Funkin/pull/2585)) +- Fixed a crash in Freeplay caused by a level referencing an invalid song ([thanks gamerbross!](https://github.com/FunkinCrew/Funkin/pull/2457)) +- Fixed a bug where pressing the volume keys would stop the Toy commercial ([thanks gamerbross!](https://github.com/FunkinCrew/Funkin/pull/2540)) +- Fixed a bug where the Chart Editor Playtest would crash when losing ([thanks gamerbross!](https://github.com/FunkinCrew/Funkin/pull/2518)) +- Fixed a bug where hold notes would display improperly in the Chart Editor when downscroll was enabled for gameplay ([thanks gamerbross!](https://github.com/FunkinCrew/Funkin/pull/2565)) +- Fixed a bug where hold notes would be positioned wrong on downscroll ([thanks MaybeMaru!](https://github.com/FunkinCrew/Funkin/pull/2488)) +- Removed a large number of unused imports to optimize builds ([thanks Ethan-makes-music!](https://github.com/FunkinCrew/Funkin/pull/2624)) +- Improved debug logging for unscripted stages ([thanks gamerbross!](https://github.com/FunkinCrew/Funkin/pull/2603)) +- Fixed a crash on Linux caused by an old version of hxCodec ([thanks Noobz4Life!](https://github.com/FunkinCrew/Funkin/pull/2472)) +- Optimized animation handling for characters ([thanks richTrash21!](https://github.com/FunkinCrew/Funkin/pull/2493)) - Made improvements to compiling documentation (thanks gedehari!) -- Fixed a crash on Linux caused by an old version of hxCodec (thanks Noobz4Life!) -- Optimized animation handling for characters (thanks richTrash21!) -- Made improvements to compiling documentation (thanks gedehari!) -- Fixed an issue where the Chart Editor would use an incorrect instrumental on imported Legacy songs (thanks gamerbross!) -- Fixed a camera bug in the Main Menu (thanks richTrash21!) -- Fixed a bug where opening the game from the command line would crash the preloader (thanks NotHyper474!) -- Fixed a bug where characters would sometimes use the wrong scale value (thanks PurSnake!) +- Fixed an issue where the Chart Editor would use an incorrect instrumental on imported Legacy songs ([thanks gamerbross!](https://github.com/FunkinCrew/Funkin/pull/2604)) +- Fixed a bug where opening the game from the command line would crash the preloader ([thanks NotHyper-474!](https://github.com/FunkinCrew/Funkin/pull/2629)) +- Fixed a bug where characters would sometimes use the wrong scale value ([thanks PurSnake!](https://github.com/FunkinCrew/Funkin/pull/2610)) - Additional bug fixes and optimizations. +## New Contributors for 0.4.0 +* @Keoiki made their first contribution in [#2581](https://github.com/FunkinCrew/Funkin/pull/2581) +* @richTrash21 made their first contribution in [#2493](https://github.com/FunkinCrew/Funkin/pull/2493) +* @sector-a made their first contribution in [#2585](https://github.com/FunkinCrew/Funkin/pull/2585) +* @MaybeMaru made their first contribution in [#2488](https://github.com/FunkinCrew/Funkin/pull/2488) +* @Ethan-makes-music made their first contribution in [#2624](https://github.com/FunkinCrew/Funkin/pull/2624) +* @Noobz4Life made their first contribution in [#2472](https://github.com/FunkinCrew/Funkin/pull/2472) +* @NotHyper-474 made their first contribution in [#2629](https://github.com/FunkinCrew/Funkin/pull/2629) +* @PurSnake made their first contribution in [#2610](https://github.com/FunkinCrew/Funkin/pull/2610) + + ## [0.3.3] - 2024-05-14 ### Changed -- Cleaned up some code in `PlayAnimationSongEvent.hx` (thanks BurgerBalls!) +- Cleaned up some code in `PlayAnimationSongEvent.hx` ([thanks Burgerballs!](https://github.com/FunkinCrew/Funkin/pull/2308)) ### Fixed -- Fixes to the Loading bar on HTML5 (thanks lemz1!) -- Don't allow any more inputs when exiting freeplay (thanks gamerbros!) -- Fixed using mouse wheel to scroll on freeplay (thanks JugieNoob!) -- Fixed the reset's of the health icons, score, and notes when re-entering gameplay from gameover (thanks ImCodist!) -- Fixed the chart editor character selector's hitbox width (thanks MadBear422!) -- Fixed camera stutter once a wipe transition to the Main Menu completes (thanks ImCodist!) -- Fixed an issue where hold note would be invisible for a single frame (thanks ImCodist!) -- Fix tween accumulation on title screen when pressing Y multiple times (thanks TheGaloXx!) +- Fixes to the Loading bar on HTML5 ([thanks lemz1!](https://github.com/FunkinCrew/Funkin/pull/2499)) +- Don't allow any more inputs when exiting freeplay ([thanks gamerbross!](https://github.com/FunkinCrew/Funkin/pull/2470)) +- Fixed using mouse wheel to scroll on freeplay ([thanks JugieNoob!](https://github.com/FunkinCrew/Funkin/pull/2466)) +- Fixed the resets of the health icons, score, and notes when re-entering gameplay from gameover ([thanks ImCodist!](https://github.com/FunkinCrew/Funkin/pull/2390)) +- Fixed the chart editor character selector's hitbox width ([thanks MadBear422!](https://github.com/FunkinCrew/Funkin/pull/2370)) +- Fixed camera stutter once a wipe transition to the Main Menu completes ([thanks ImCodist!](https://github.com/FunkinCrew/Funkin/pull/2315)) +- Fixed an issue where hold note would be invisible for a single frame ([thanks ImCodist!](https://github.com/FunkinCrew/Funkin/pull/2309)) +- Fix tween accumulation on title screen when pressing Y multiple times ([thanks TheGaloXx!](https://github.com/FunkinCrew/Funkin/pull/2300)) - Fix a crash when querying FlxG.state in the crash handler - Fix for a game over easter egg so you don't accidentally exit it when viewing - Fix an issue where the Freeplay menu never displays 100% clear - Fix an issue where Weekend 1 Pico attempted to retrieve a missing asset. -- Fix an issue where duplicate keybinds would be stoed, potentially causing a crash -- Chart debug key now properly returns you to the previous chart editor session if you were playtesting a chart (thanks nebulazorua!) +- Fix an issue where duplicate keybinds would be stored, potentially causing a crash +- Chart debug key now properly returns you to the previous chart editor session if you were playtesting a chart ([thanks nebulazorua!](https://github.com/FunkinCrew/Funkin/pull/2323)) - Fix a crash on Freeplay found on AMD graphics cards +## New Contributors for 0.3.3 +* @Burgerballs made their first contribution in [#2308](https://github.com/FunkinCrew/Funkin/pull/2308) +* @lemz1 made their first contribution in [#2499](https://github.com/FunkinCrew/Funkin/pull/2499) +* @gamerbross made their first contribution in [#2470](https://github.com/FunkinCrew/Funkin/pull/2470) +* @JugieNoob made their first contribution in [#2466](https://github.com/FunkinCrew/Funkin/pull/2466) +* @MadBear422 made their first contribution in [#2370](https://github.com/FunkinCrew/Funkin/pull/2370) +* @ImCodist made their first contribution in [#2309](https://github.com/FunkinCrew/Funkin/pull/2309) +* @TheGaloXx made their first contribution in [#2300](https://github.com/FunkinCrew/Funkin/pull/2300) +* @nebulazorua made their first contribution in [#2323](https://github.com/FunkinCrew/Funkin/pull/2323) + + ## [0.3.2] - 2024-05-03 ### Added - Added `,` and `.` keybinds to the Chart Editor. These place Focus Camera events at the playhead, for the opponent and player respectively. @@ -337,6 +388,7 @@ which would remove their rank if they had a lower one. ### Removed - Removed some unused `.txt` files in the `assets/data` folder. + ## [0.3.1] - 2024-05-01 ### Changed - Ensure the Git commit hash always displays in the log files. @@ -353,6 +405,7 @@ which would remove their rank if they had a lower one. - When exiting from a song into freeplay, main menu no longer takes inputs unintentionally (aka issues with merch links opening up when selecting songs) - Fix for arrow keys causing web browser page scroll + ## [0.3.0] - 2024-04-30 ### Added - New Story Level: Weekend 1, starting Pico, Darnell, and Nene. @@ -386,6 +439,7 @@ which would remove their rank if they had a lower one. ### Fixed - 17 quadrillion bugs across hundreds of PRs. + ## [0.2.8] - 2021-04-18 (note, this one is iffy cuz we slacked wit it lol!) ### Added - TANKMAN! 3 NEW SONGS BY KAWAISPRITE (UGH, GUNS, STRESS)! Charting help by MtH! @@ -400,6 +454,7 @@ which would remove their rank if they had a lower one. ### Fixed - That one random note on Bopeebo + ## [0.2.7.1] - 2021-02-14 ### Added - Easter eggs @@ -417,6 +472,7 @@ which would remove their rank if they had a lower one. - Fixed sustain note trails ALSO THANKS TO MTH U A REAL ONE ([MTH VERY POWERFUL](https://github.com/ninjamuffin99/Funkin/pull/415)) - Antialiasing on the skyscraper lights + ## [0.2.7] - 2021-02-02 ### Added - PIXEL DAY UPDATE LOL 1 WEEK LATER @@ -430,6 +486,7 @@ which would remove their rank if they had a lower one. ### Fixed - Idle animation bug with BF christmas and BF hair blow sprites ([Thanks to Injourn for the Pull Request!](https://github.com/ninjamuffin99/Funkin/pull/237)) + ## [0.2.6] - 2021-01-20 ### Added - 3 NEW CHRISTMAS SONGS. 2 BY KAWAISPRITE, 1 BY BASSETFILMS!!!!! BF WITH DRIP! SANTA HANGIN OUT! @@ -450,6 +507,7 @@ which would remove their rank if they had a lower one. - Screen wipe being cut off in the limo/mom stage. Should fill the whole screen now. - Boyfriend animations on hold notes, and pressing on repeating notes should behave differently + ## [0.2.5] - 2020-12-27 ### Added - MOMMY GF, 3 NEW ASS SONGS BY KAWAISPRITE, NEW ART BY PHANTOMARCADE,WOOOOOOAH!!!! @@ -467,6 +525,7 @@ which would remove their rank if they had a lower one. - When pausing music at the start, it doesn't continue the song anyways. ([shoutouts gedehari for the Pull Request!](https://github.com/ninjamuffin99/Funkin/pull/48)) - IDK i think backing out of song menu should play main menu songs again hehe ([shoutouts gedehari for the Pull Request!](https://github.com/ninjamuffin99/Funkin/pull/48)) + ## [0.2.4] - 2020-12-11 ### Added - 3 NEW SONGS BY KAWAISPRITE. Pico, Philly, and Blammed. @@ -478,6 +537,7 @@ which would remove their rank if they had a lower one. - Song desync of you paused and unpaused frequently ([shoutouts SonicBlam](https://github.com/ninjamuffin99/Funkin/issues/37)) - Animation offsets when GF is scared + ## [0.2.3] - 2020-12-04 ### Added - More intro texts @@ -487,6 +547,7 @@ which would remove their rank if they had a lower one. - Glitch where if you never would lose health if you missed a note on a fast song (shoutouts [MrDulfin](https://github.com/ninjamuffin99/Funkin/issues/10), [HotSauceBurritos](https://github.com/ninjamuffin99/Funkin/issues/13) and [LobsterMango](https://lobstermango.newgrounds.com)) - Fixed tiny note bleed over thingies (shoutouts [lotusotho](https://github.com/ninjamuffin99/Funkin/pull/24)) + ## [0.2.2] - 2020-11-20 ### Added - Music playing on the freeplay menu. @@ -494,7 +555,6 @@ which would remove their rank if they had a lower one. - Score now shows mid-song. - Menu on pause screen! Can resume, and restart song, or go back to main menu. - New music made for pause menu! - ### Changed - Moved all the intro texts to its own txt file instead of being hardcoded, this allows for much easier customization. File is in the data folder, called "introText.txt", follow the format in there and you're probably good to go! ### Fixed @@ -505,16 +565,19 @@ which would remove their rank if they had a lower one. - Fixed some animation timings, should feel both better to play, and watch. (shoutouts Dave/Ivan lol) - Animation issue where GF would freak out on the title screen if you returned to it([shoutouts MultiXIII](https://github.com/ninjamuffin99/Funkin/issues/12)). + ## [0.2.1.2] - 2020-11-06 ### Fixed - Story mode scores not properly resetting, leading to VERY inflated highscores on the leaderboards. This also requires me to clear the scores that are on the leaderboard right now, sorry! - Difficulty on storymode and in freeplay scores - Hard mode difficulty on campaign levels have been fixed + ## [0.2.1.1] - 2020-11-06 ### Fixed - Week 2 not unlocking properly + ## [0.2.1] - 2020-11-06 ### Added - Scores to the freeplay menu @@ -522,18 +585,18 @@ which would remove their rank if they had a lower one. - Lightning effect in Spooky stages - Campaign scores, can now compete on scoreboards for campaign! - Can now change difficulties in Freeplay mode - ### Changed -- Balanced out Normal mode for the harder songs(Dadbattle and Spookeez, not South yet). Should be much easier all around. +- Balanced out Normal mode for the harder songs(DadBattle and Spookeez, not South yet). Should be much easier all around. - Put tutorial in it's own 'week', so that if you want to play week 1, you don't have to play the tutorial. - ### Fixed - One of the charting bits on South and Spookeez during the intro. + ## [0.2.0] - 2020-11-01 ### Added - Uhh Newgrounds release lolol I always lose track of shit. + ## [0.1.0] - 2020-10-05 ### Added - Uh, everything. This the game's initial gamejam release. We put it out From 79188b06f49d6f72ecf25def499c394a98468c57 Mon Sep 17 00:00:00 2001 From: Hundrec Date: Sun, 3 Nov 2024 12:54:51 -0800 Subject: [PATCH 03/25] Make label actions more convenient (#3771) --- .github/label-actions.yml | 76 ++++++++++++++++++++++++++++++++++----- 1 file changed, 68 insertions(+), 8 deletions(-) diff --git a/.github/label-actions.yml b/.github/label-actions.yml index 1234d15262..dbc0d55a87 100644 --- a/.github/label-actions.yml +++ b/.github/label-actions.yml @@ -8,37 +8,97 @@ This issue is a duplicate. Please direct all discussion to the original issue. # Close the issue close: true + # Set a close reason + close-reason: 'not planned' # Remove other status labels unlabel: + - 'status: accepted' + - 'status: bug reproduced' + - 'status: cannot reproduce' + - 'status: needs clarification' + - 'status: needs revision' + - 'status: pending pull request' - 'status: pending triage' - # Set a close reason - close-reason: 'not planned' + - 'status: rejected' + - 'status: resolved' + - 'status: reviewing internally' + - 'status: stale' prs: # Post a comment comment: > This pull request is a duplicate. Please direct all discussion to the original pull request. - # Remove other status labels - unlabel: - - 'status: pending triage' # Close the pull request close: true # Set a close reason close-reason: 'not planned' + # Remove other status labels + unlabel: + - 'status: accepted' + - 'status: bug reproduced' + - 'status: cannot reproduce' + - 'status: needs clarification' + - 'status: needs revision' + - 'status: pending pull request' + - 'status: pending triage' + - 'status: rejected' + - 'status: resolved' + - 'status: reviewing internally' + - 'status: stale' 'status: rejected': issues: # Close the issue close: true + # Set a close reason + close-reason: 'not planned' # Remove other status labels unlabel: + - 'status: accepted' + - 'status: bug reproduced' + - 'status: cannot reproduce' + - 'status: duplicate' + - 'status: needs clarification' + - 'status: needs revision' + - 'status: pending pull request' - 'status: pending triage' - # Set a close reason - close-reason: 'not planned' + - 'status: resolved' + - 'status: reviewing internally' + - 'status: stale' prs: # Close the pull request close: true + # Set a close reason + close-reason: 'not planned' # Remove other status labels unlabel: + - 'status: accepted' + - 'status: bug reproduced' + - 'status: cannot reproduce' + - 'status: duplicate' + - 'status: needs clarification' + - 'status: needs revision' + - 'status: pending pull request' - 'status: pending triage' + - 'status: resolved' + - 'status: reviewing internally' + - 'status: stale' + +'status: resolved': + issues: + # Close the issue + close: true # Set a close reason - close-reason: 'not planned' + close-reason: 'completed' + # Remove other status labels + unlabel: + - 'status: accepted' + - 'status: bug reproduced' + - 'status: cannot reproduce' + - 'status: duplicate' + - 'status: needs clarification' + - 'status: needs revision' + - 'status: pending pull request' + - 'status: pending triage' + - 'status: rejected' + - 'status: reviewing internally' + - 'status: stale' From 9e13ea0b2c0799d9a7fae7db56eddb05898739d0 Mon Sep 17 00:00:00 2001 From: Abnormal <86753001+AbnormalPoof@users.noreply.github.com> Date: Mon, 4 Nov 2024 18:13:37 +0000 Subject: [PATCH 04/25] fixed a plethora of dead links (#3831) --- CHANGELOG.md | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3382d24415..6b98f33737 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -465,11 +465,11 @@ which would remove their rank if they had a lower one. - Offset of the Newgrounds logo on boot screen. - Made the changelog txt so it can be opened easier by normal people who don't have a markdown reader (most normal people); ### Fixed -- Fixed crashes on Week 6 story mode dialogue if spam too fast ([Thanks to Lotusotho for the Pull Request!](https://github.com/ninjamuffin99/Funkin/pull/357)) +- Fixed crashes on Week 6 story mode dialogue if spam too fast ([Thanks to Lotusotho for the Pull Request!](https://github.com/FunkinCrew/Funkin/pull/357)) - Should show intro credits on desktop versions of the game more consistently - Layering on Week 4 songs with GF and the LIMO LOL HOW TF I MISS THIS -- Chart's and chart editor now support changeBPM, GOD BLESS MTH FOR THIS ONE I BEEN STRUGGLIN WIT THAT SINCE OCTOBER LMAO ([GOD BLESS MTH](https://github.com/ninjamuffin99/Funkin/pull/382)) -- Fixed sustain note trails ALSO THANKS TO MTH U A REAL ONE ([MTH VERY POWERFUL](https://github.com/ninjamuffin99/Funkin/pull/415)) +- Chart's and chart editor now support changeBPM, GOD BLESS MTH FOR THIS ONE I BEEN STRUGGLIN WIT THAT SINCE OCTOBER LMAO ([GOD BLESS MTH](https://github.com/FunkinCrew/Funkin/pull/382)) +- Fixed sustain note trails ALSO THANKS TO MTH U A REAL ONE ([MTH VERY POWERFUL](https://github.com/FunkinCrew/Funkin/pull/415)) - Antialiasing on the skyscraper lights @@ -484,13 +484,13 @@ which would remove their rank if they had a lower one. - Made it so you lose sliiiightly more health when you miss a note. - Removed the default HaxeFlixel pause screen when the game window loses focus, can get screenshots of the game easier hehehe ### Fixed -- Idle animation bug with BF christmas and BF hair blow sprites ([Thanks to Injourn for the Pull Request!](https://github.com/ninjamuffin99/Funkin/pull/237)) +- Idle animation bug with BF christmas and BF hair blow sprites ([Thanks to Injourn for the Pull Request!](https://github.com/FunkinCrew/Funkin/pull/237)) ## [0.2.6] - 2021-01-20 ### Added - 3 NEW CHRISTMAS SONGS. 2 BY KAWAISPRITE, 1 BY BASSETFILMS!!!!! BF WITH DRIP! SANTA HANGIN OUT! -- Enemy icons change when they you are winning a lot ([Thanks to pahaze for the Pull Request!](https://github.com/ninjamuffin99/Funkin/pull/138)) +- Enemy icons change when they you are winning a lot ([Thanks to pahaze for the Pull Request!](https://github.com/FunkinCrew/Funkin/pull/138)) - Holding CTRL in charting editor places notes on both sides - Q and E changes sustain lengths in note editor - Other charting editor workflow improvements @@ -502,8 +502,8 @@ which would remove their rank if they had a lower one. - Removed APE ### Fixed - Maybe fixed double notes / jump notes. Need to tweak it for balance, but should open things up for cooler charts in the future. -- Old Verison popup screen weirdness ([Thanks to gedehari for the Pull Request!](https://github.com/ninjamuffin99/Funkin/pull/155)) -- Song no longer loops when finishing the song. ([Thanks Injourn for the Pull Request!](https://github.com/ninjamuffin99/Funkin/pull/132)) +- Old Verison popup screen weirdness ([Thanks to gedehari for the Pull Request!](https://github.com/FunkinCrew/Funkin/pull/155)) +- Song no longer loops when finishing the song. ([Thanks Injourn for the Pull Request!](https://github.com/FunkinCrew/Funkin/pull/132)) - Screen wipe being cut off in the limo/mom stage. Should fill the whole screen now. - Boyfriend animations on hold notes, and pressing on repeating notes should behave differently @@ -522,8 +522,8 @@ which would remove their rank if they had a lower one. - Mouse is now visible in note editor ### Fixed - Crash when playing Week 3 and then playing a non-week 3 song -- When pausing music at the start, it doesn't continue the song anyways. ([shoutouts gedehari for the Pull Request!](https://github.com/ninjamuffin99/Funkin/pull/48)) -- IDK i think backing out of song menu should play main menu songs again hehe ([shoutouts gedehari for the Pull Request!](https://github.com/ninjamuffin99/Funkin/pull/48)) +- When pausing music at the start, it doesn't continue the song anyways. ([shoutouts gedehari for the Pull Request!](https://github.com/FunkinCrew/Funkin/pull/48)) +- IDK i think backing out of song menu should play main menu songs again hehe ([shoutouts gedehari for the Pull Request!](https://github.com/FunkinCrew/Funkin/pull/48)) ## [0.2.4] - 2020-12-11 @@ -534,7 +534,7 @@ which would remove their rank if they had a lower one. ### Changed - Made it less punishing to ATTEMPT to hit a note and miss, rather than let it pass you ### Fixed -- Song desync of you paused and unpaused frequently ([shoutouts SonicBlam](https://github.com/ninjamuffin99/Funkin/issues/37)) +- Song desync of you paused and unpaused frequently ([shoutouts SonicBlam](https://github.com/FunkinCrew/Funkin/issues/37)) - Animation offsets when GF is scared @@ -543,9 +543,9 @@ which would remove their rank if they had a lower one. - More intro texts ### Fixed - Exploit where you could potentially give yourself a high score via the debug menu -- Issue/bug where you could spam the confirm button on the story menu ([shoutouts lotusotho for the CODE contribution/pull request!](https://github.com/ninjamuffin99/Funkin/pull/19)) -- Glitch where if you never would lose health if you missed a note on a fast song (shoutouts [MrDulfin](https://github.com/ninjamuffin99/Funkin/issues/10), [HotSauceBurritos](https://github.com/ninjamuffin99/Funkin/issues/13) and [LobsterMango](https://lobstermango.newgrounds.com)) -- Fixed tiny note bleed over thingies (shoutouts [lotusotho](https://github.com/ninjamuffin99/Funkin/pull/24)) +- Issue/bug where you could spam the confirm button on the story menu ([shoutouts lotusotho for the CODE contribution/pull request!](https://github.com/FunkinCrew/Funkin/pull/19)) +- Glitch where if you never would lose health if you missed a note on a fast song (shoutouts [MrDulfin](https://github.com/FunkinCrew/Funkin/issues/10), [HotSauceBurritos](https://github.com/FunkinCrew/Funkin/issues/13) and [LobsterMango](https://lobstermango.newgrounds.com)) +- Fixed tiny note bleed over thingies (shoutouts [lotusotho](https://github.com/FunkinCrew/Funkin/pull/24)) ## [0.2.2] - 2020-11-20 @@ -558,12 +558,12 @@ which would remove their rank if they had a lower one. ### Changed - Moved all the intro texts to its own txt file instead of being hardcoded, this allows for much easier customization. File is in the data folder, called "introText.txt", follow the format in there and you're probably good to go! ### Fixed -- Fixed soft lock when pausing on song finish ([shoutouts gedehari](https://github.com/ninjamuffin99/Funkin/issues/15)) -- Think I fixed issue that led to in-game scores being off by 2 ([shoutouts Mike](https://github.com/ninjamuffin99/Funkin/issues/4)) -- Should have fixed the 1 frame note appearance thing. ([shoutouts Mike](https://github.com/ninjamuffin99/Funkin/issues/6)) +- Fixed soft lock when pausing on song finish ([shoutouts gedehari](https://github.com/FunkinCrew/Funkin/issues/15)) +- Think I fixed issue that led to in-game scores being off by 2 ([shoutouts Mike](https://github.com/FunkinCrew/Funkin/issues/4)) +- Should have fixed the 1 frame note appearance thing. ([shoutouts Mike](https://github.com/FunkinCrew/Funkin/issues/6)) - Cleaned up some charting on South on hard mode - Fixed some animation timings, should feel both better to play, and watch. (shoutouts Dave/Ivan lol) -- Animation issue where GF would freak out on the title screen if you returned to it([shoutouts MultiXIII](https://github.com/ninjamuffin99/Funkin/issues/12)). +- Animation issue where GF would freak out on the title screen if you returned to it([shoutouts MultiXIII](https://github.com/FunkinCrew/Funkin/issues/12)). ## [0.2.1.2] - 2020-11-06 From be08bbec58b96620748b60f9010b354c847a3ef1 Mon Sep 17 00:00:00 2001 From: Hundrec Date: Tue, 3 Dec 2024 14:21:53 -0800 Subject: [PATCH 05/25] Add `status: planned` label to label actions (#3910) * Make label actions more convenient * chore: Add status: planned to label actions --- .github/label-actions.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/label-actions.yml b/.github/label-actions.yml index dbc0d55a87..a99d17660f 100644 --- a/.github/label-actions.yml +++ b/.github/label-actions.yml @@ -19,6 +19,7 @@ - 'status: needs revision' - 'status: pending pull request' - 'status: pending triage' + - 'status: planned' - 'status: rejected' - 'status: resolved' - 'status: reviewing internally' @@ -40,6 +41,7 @@ - 'status: needs revision' - 'status: pending pull request' - 'status: pending triage' + - 'status: planned' - 'status: rejected' - 'status: resolved' - 'status: reviewing internally' @@ -61,6 +63,7 @@ - 'status: needs revision' - 'status: pending pull request' - 'status: pending triage' + - 'status: planned' - 'status: resolved' - 'status: reviewing internally' - 'status: stale' @@ -79,6 +82,7 @@ - 'status: needs revision' - 'status: pending pull request' - 'status: pending triage' + - 'status: planned' - 'status: resolved' - 'status: reviewing internally' - 'status: stale' @@ -99,6 +103,7 @@ - 'status: needs revision' - 'status: pending pull request' - 'status: pending triage' + - 'status: planned' - 'status: rejected' - 'status: reviewing internally' - 'status: stale' From 517359914b4bb15e7aebe0913904895261f10e3f Mon Sep 17 00:00:00 2001 From: EliteMasterEric Date: Fri, 11 Oct 2024 23:43:57 -0400 Subject: [PATCH 06/25] Bump the Stage data version to indicate that new values were added. --- source/funkin/data/stage/CHANGELOG.md | 6 ++++++ source/funkin/data/stage/StageRegistry.hx | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/source/funkin/data/stage/CHANGELOG.md b/source/funkin/data/stage/CHANGELOG.md index bf9d750cc7..f83ce608d4 100644 --- a/source/funkin/data/stage/CHANGELOG.md +++ b/source/funkin/data/stage/CHANGELOG.md @@ -5,6 +5,12 @@ 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). +## [1.0.3] +### Added +- Added the `color` attribute on stage props to tint them. +- Added the `blend` attribute on stage props to apply blend modes. +- Added the `angle` attribute on stage props to apply a rotation to them. + ## [1.0.2] ### Added - Added the ability to specify `flipX` and `flipY` on stage props to horizontally or vertically flip, respectively. diff --git a/source/funkin/data/stage/StageRegistry.hx b/source/funkin/data/stage/StageRegistry.hx index e11166bddd..0c546d0ab9 100644 --- a/source/funkin/data/stage/StageRegistry.hx +++ b/source/funkin/data/stage/StageRegistry.hx @@ -11,9 +11,9 @@ class StageRegistry extends BaseRegistry * Handle breaking changes by incrementing this value * and adding migration to the `migrateStageData()` function. */ - public static final STAGE_DATA_VERSION:thx.semver.Version = "1.0.2"; + public static final STAGE_DATA_VERSION:thx.semver.Version = "1.0.3"; - public static final STAGE_DATA_VERSION_RULE:thx.semver.VersionRule = ">=1.0.0 <=1.0.2"; + public static final STAGE_DATA_VERSION_RULE:thx.semver.VersionRule = ">=1.0.0 <=1.0.3"; public static var instance(get, never):StageRegistry; static var _instance:Null = null; From 4ce83b2ac52869dba0d3dfcd13f5451493fb9dc8 Mon Sep 17 00:00:00 2001 From: EliteMasterEric Date: Fri, 11 Oct 2024 23:48:19 -0400 Subject: [PATCH 07/25] Updated Save data version to indicate new values. --- source/funkin/save/Save.hx | 2 +- source/funkin/save/changelog.md | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/source/funkin/save/Save.hx b/source/funkin/save/Save.hx index 8403a1a775..0a788a90fc 100644 --- a/source/funkin/save/Save.hx +++ b/source/funkin/save/Save.hx @@ -18,7 +18,7 @@ import thx.semver.Version; @:nullSafety class Save { - public static final SAVE_DATA_VERSION:thx.semver.Version = "2.0.4"; + public static final SAVE_DATA_VERSION:thx.semver.Version = "2.0.6"; public static final SAVE_DATA_VERSION_RULE:thx.semver.VersionRule = "2.0.x"; // We load this version's saves from a new save path, to maintain SOME level of backwards compatibility. diff --git a/source/funkin/save/changelog.md b/source/funkin/save/changelog.md index 41d6e68aee..72fb7fc034 100644 --- a/source/funkin/save/changelog.md +++ b/source/funkin/save/changelog.md @@ -5,11 +5,9 @@ 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). -## [2.0.4] - 2024-09-12 -Note to self: Only update to 2.1.0 when migration is needed. +## [2.0.6] - 2024-10-11 ### Added -- `unlocks.charactersSeen:Array` to `Save` -- `unlocks.oldChar:Bool` to `Save` +- `optionsStageEditor` to `Save` for storing user preferences for the stage editor. ## [2.0.5] - 2024-05-21 ### Fixed @@ -17,6 +15,8 @@ Note to self: Only update to 2.1.0 when migration is needed. ## [2.0.4] - 2024-05-21 ### Added +- `unlocks.charactersSeen:Array` to `Save` +- `unlocks.oldChar:Bool` to `Save` - `favoriteSongs:Array` to `Save` ## [2.0.3] - 2024-01-09 From 7f8937d5406e4bc5ce8cd309db8be790943b9b94 Mon Sep 17 00:00:00 2001 From: EliteMasterEric Date: Fri, 11 Oct 2024 23:52:07 -0400 Subject: [PATCH 08/25] Only display the Stage Editor in builds that enable it, and enable it by default (this re-enables the Stage Editor keybind). --- project.hxp | 2 +- source/funkin/ui/debug/DebugMenuSubState.hx | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/project.hxp b/project.hxp index adecc20328..38c5c49336 100644 --- a/project.hxp +++ b/project.hxp @@ -460,7 +460,6 @@ class Project extends HXProject { // Should be false unless explicitly requested. GITHUB_BUILD.apply(this, false); - FEATURE_STAGE_EDITOR.apply(this, false); FEATURE_NEWGROUNDS.apply(this, false); FEATURE_GHOST_TAPPING.apply(this, false); @@ -471,6 +470,7 @@ class Project extends HXProject { FEATURE_FUNKVIS.apply(this, true); FEATURE_PARTIAL_SOUNDS.apply(this, true); FEATURE_VIDEO_PLAYBACK.apply(this, true); + FEATURE_STAGE_EDITOR.apply(this, true); // Should be true on debug builds or if GITHUB_BUILD is enabled. FEATURE_DEBUG_FUNCTIONS.apply(this, isDebug() || GITHUB_BUILD.isEnabled(this)); diff --git a/source/funkin/ui/debug/DebugMenuSubState.hx b/source/funkin/ui/debug/DebugMenuSubState.hx index cc6a2426e7..45652095b0 100644 --- a/source/funkin/ui/debug/DebugMenuSubState.hx +++ b/source/funkin/ui/debug/DebugMenuSubState.hx @@ -55,12 +55,14 @@ class DebugMenuSubState extends MusicBeatSubState // Create each menu item. // Call onMenuChange when the first item is created to move the camera . #if FEATURE_CHART_EDITOR - onMenuChange(createItem("CHART EDITOR", openChartEditor)); + createItem("CHART EDITOR", openChartEditor); #end - // createItem("Input Offset Testing", openInputOffsetTesting); - createItem("CHARACTER SELECT", openCharSelect, true); createItem("ANIMATION EDITOR", openAnimationEditor); + #if FEATURE_STAGE_EDITOR createItem("STAGE EDITOR", openStageEditor); + #end + // createItem("Input Offset Testing", openInputOffsetTesting); + // createItem("CHARACTER SELECT", openCharSelect, true); // createItem("TEST STICKERS", testStickers); #if sys createItem("OPEN CRASH LOG FOLDER", openLogFolder); From 36d7de5692fe94efb3ec0a31b3691a782ecc64c9 Mon Sep 17 00:00:00 2001 From: EliteMasterEric Date: Fri, 18 Oct 2024 16:00:06 -0400 Subject: [PATCH 09/25] Enable log messages on all builds by default after we got too many complaints. --- project.hxp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/project.hxp b/project.hxp index 38c5c49336..4e8dae4b80 100644 --- a/project.hxp +++ b/project.hxp @@ -474,7 +474,10 @@ class Project extends HXProject { // Should be true on debug builds or if GITHUB_BUILD is enabled. FEATURE_DEBUG_FUNCTIONS.apply(this, isDebug() || GITHUB_BUILD.isEnabled(this)); - FEATURE_LOG_TRACE.apply(this, isDebug()); + + // Got a lot of complains about this being turned off by default on some builds. + // TODO: Look into ways to optimize logging (maybe by using a thread pool?) + FEATURE_LOG_TRACE.apply(this, true); // Should default to true on workspace builds and false on release builds. REDIRECT_ASSETS_FOLDER.apply(this, isDebug() && isDesktop()); From 2383fdfade82682f46080ee0eabe5d7dad089b3b Mon Sep 17 00:00:00 2001 From: EliteMasterEric Date: Fri, 18 Oct 2024 16:33:22 -0400 Subject: [PATCH 10/25] Remove unused custom type resolver. --- source/funkin/save/Save.hx | 5 +-- source/funkin/util/SerializerUtil.hx | 48 ---------------------------- 2 files changed, 1 insertion(+), 52 deletions(-) diff --git a/source/funkin/save/Save.hx b/source/funkin/save/Save.hx index 0a788a90fc..1d723d0866 100644 --- a/source/funkin/save/Save.hx +++ b/source/funkin/save/Save.hx @@ -961,10 +961,7 @@ class Save */ static function loadFromSlot(slot:Int):Save { - trace("[SAVE] Loading save from slot " + slot + "..."); - - // Prevent crashes if the save data is corrupted. - SerializerUtil.initSerializer(); + trace('[SAVE] Loading save from slot $slot...'); FlxG.save.bind('$SAVE_NAME${slot}', SAVE_PATH); diff --git a/source/funkin/util/SerializerUtil.hx b/source/funkin/util/SerializerUtil.hx index fa602cc733..c87d3f6c00 100644 --- a/source/funkin/util/SerializerUtil.hx +++ b/source/funkin/util/SerializerUtil.hx @@ -63,31 +63,6 @@ class SerializerUtil } } - public static function initSerializer():Void - { - haxe.Unserializer.DEFAULT_RESOLVER = new FunkinTypeResolver(); - } - - /** - * Serialize a Haxe object using the built-in Serializer. - * @param input The object to serialize - * @return The serialized object as a string - */ - public static function fromHaxeObject(input:Dynamic):String - { - return haxe.Serializer.run(input); - } - - /** - * Convert a serialized Haxe object back into a Haxe object. - * @param input The serialized object as a string - * @return The deserialized object - */ - public static function toHaxeObject(input:String):Dynamic - { - return haxe.Unserializer.run(input); - } - /** * Customize how certain types are serialized when converting to JSON. */ @@ -115,26 +90,3 @@ class SerializerUtil return result; } } - -class FunkinTypeResolver -{ - public function new() - { - // Blank constructor. - } - - public function resolveClass(name:String):Class - { - if (name == 'Dynamic') - { - FlxG.log.warn('Found invalid class type in save data, indicates partial save corruption.'); - return null; - } - return Type.resolveClass(name); - }; - - public function resolveEnum(name:String):Enum - { - return Type.resolveEnum(name); - }; -} From ec9ec2031ac53ead60d583d54ea7f137094c85f0 Mon Sep 17 00:00:00 2001 From: EliteMasterEric Date: Fri, 18 Oct 2024 17:11:09 -0400 Subject: [PATCH 11/25] Update save data format and error handling. --- hmm.json | 2 +- source/funkin/save/Save.hx | 83 +++++++++++++------ source/funkin/save/changelog.md | 8 ++ .../funkin/save/migrator/SaveDataMigrator.hx | 18 ++++ .../funkin/save/migrator/SaveData_v2_0_0.hx | 26 ++++++ .../ui/debug/charting/ChartEditorState.hx | 17 ++-- .../ui/debug/stageeditor/StageEditorState.hx | 6 +- 7 files changed, 122 insertions(+), 38 deletions(-) create mode 100644 source/funkin/save/migrator/SaveData_v2_0_0.hx diff --git a/hmm.json b/hmm.json index 8ff572b30b..50879416b6 100644 --- a/hmm.json +++ b/hmm.json @@ -11,7 +11,7 @@ "name": "flixel", "type": "git", "dir": null, - "ref": "f2b090d6c608471e730b051c8ee22b8b378964b1", + "ref": "ffa691cb2d2d81de35b900a4411e4062ac84ab58", "url": "https://github.com/FunkinCrew/flixel" }, { diff --git a/source/funkin/save/Save.hx b/source/funkin/save/Save.hx index 1d723d0866..52cf18b7ff 100644 --- a/source/funkin/save/Save.hx +++ b/source/funkin/save/Save.hx @@ -1,25 +1,23 @@ package funkin.save; import flixel.util.FlxSave; -import funkin.util.FileUtil; import funkin.input.Controls.Device; import funkin.play.scoring.Scoring; import funkin.play.scoring.Scoring.ScoringRank; import funkin.save.migrator.RawSaveData_v1_0_0; import funkin.save.migrator.SaveDataMigrator; -import funkin.save.migrator.SaveDataMigrator; import funkin.ui.debug.charting.ChartEditorState.ChartEditorLiveInputStyle; import funkin.ui.debug.charting.ChartEditorState.ChartEditorTheme; import funkin.ui.debug.stageeditor.StageEditorState.StageEditorTheme; +import funkin.util.FileUtil; import funkin.util.SerializerUtil; import thx.semver.Version; -import thx.semver.Version; @:nullSafety class Save { - public static final SAVE_DATA_VERSION:thx.semver.Version = "2.0.6"; - public static final SAVE_DATA_VERSION_RULE:thx.semver.VersionRule = "2.0.x"; + public static final SAVE_DATA_VERSION:thx.semver.Version = "2.1.0"; + public static final SAVE_DATA_VERSION_RULE:thx.semver.VersionRule = ">=2.1.0 <2.2.0"; // We load this version's saves from a new save path, to maintain SOME level of backwards compatibility. static final SAVE_PATH:String = 'FunkinCrew'; @@ -965,32 +963,57 @@ class Save FlxG.save.bind('$SAVE_NAME${slot}', SAVE_PATH); - if (FlxG.save.isEmpty()) + switch (FlxG.save.status) { - trace('[SAVE] Save data is empty, checking for legacy save data...'); - var legacySaveData = fetchLegacySaveData(); - if (legacySaveData != null) - { - trace('[SAVE] Found legacy save data, converting...'); - var gameSave = SaveDataMigrator.migrateFromLegacy(legacySaveData); - FlxG.save.mergeData(gameSave.data, true); - return gameSave; - } - else - { - trace('[SAVE] No legacy save data found.'); - var gameSave = new Save(); + case EMPTY: + trace('[SAVE] Save data in slot ${slot} is empty, checking for legacy save data...'); + var legacySaveData = fetchLegacySaveData(); + if (legacySaveData != null) + { + trace('[SAVE] Found legacy save data, converting...'); + var gameSave = SaveDataMigrator.migrateFromLegacy(legacySaveData); + FlxG.save.mergeData(gameSave.data, true); + return gameSave; + } + else + { + trace('[SAVE] No legacy save data found.'); + var gameSave = new Save(); + FlxG.save.mergeData(gameSave.data, true); + return gameSave; + } + case ERROR(_): + return handleSaveDataError(slot); + case BOUND(_, _): + trace('[SAVE] Loaded existing save data in slot ${slot}.'); + var gameSave = SaveDataMigrator.migrate(FlxG.save.data); FlxG.save.mergeData(gameSave.data, true); + return gameSave; - } + } + } + + /** + * Call this when there is an error loading the save data in slot X. + */ + static function handleSaveDataError(slot:Int):Save + { + var msg = 'There was an error loading your save data in slot ${slot}.'; + msg += '\nPlease report this issue to the developers.'; + lime.app.Application.current.window.alert(msg, "Save Data Failure"); + + // Don't touch that slot anymore. + // Instead, load the next available slot. + + var nextSlot = slot + 1; + + if (nextSlot < 1000) + { + return loadFromSlot(nextSlot); } else { - trace('[SAVE] Found existing save data.'); - var gameSave = SaveDataMigrator.migrate(FlxG.save.data); - FlxG.save.mergeData(gameSave.data, true); - - return gameSave; + throw "End of save data slots. Can't load any more."; } } @@ -1055,7 +1078,15 @@ class Save { var targetSaveData = new FlxSave(); targetSaveData.bind('$SAVE_NAME${slot}', SAVE_PATH); - return !targetSaveData.isEmpty(); + switch (targetSaveData.status) + { + case EMPTY: + return false; + case ERROR(_): + return false; + case BOUND(_, _): + return true; + } } /** diff --git a/source/funkin/save/changelog.md b/source/funkin/save/changelog.md index 72fb7fc034..aa98d30961 100644 --- a/source/funkin/save/changelog.md +++ b/source/funkin/save/changelog.md @@ -5,6 +5,14 @@ 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). +## [2.1.0] - 2024-10-18 +This version introduces changes to save data loading in order to improve compatibility with older versions. +### Changed +- `optionsStageEditor.theme` converted from an Enum to a String to fix save data compatibility issues. + - In the future, Enum values should not be used in order to prevent incompatibilities caused by introducing new types to the save data that older versions cannot parse. +- `optionsChartEditor.theme` converted from an Enum to a String to fix save data compatibility issues. +- `optionsChartEditor.chartEditorLiveInputStyle` converted from an Enum to a String to fix save data compatibility issues. + ## [2.0.6] - 2024-10-11 ### Added - `optionsStageEditor` to `Save` for storing user preferences for the stage editor. diff --git a/source/funkin/save/migrator/SaveDataMigrator.hx b/source/funkin/save/migrator/SaveDataMigrator.hx index 7a929322a0..228669f66b 100644 --- a/source/funkin/save/migrator/SaveDataMigrator.hx +++ b/source/funkin/save/migrator/SaveDataMigrator.hx @@ -32,6 +32,10 @@ class SaveDataMigrator var save:Save = new Save(saveDataWithDefaults); return save; } + else if (VersionUtil.validateVersion(version, "2.0.x")) + { + return migrate_v2_0_0(inputData); + } else { var message:String = 'Error migrating save data, expected ${Save.SAVE_DATA_VERSION}.'; @@ -43,6 +47,20 @@ class SaveDataMigrator } } + static function migrate_v2_0_0(inputData:Dynamic):Save + { + // Import the structured data. + var saveDataWithDefaults:RawSaveData = cast thx.Objects.deepCombine(Save.getDefault(), inputData); + + // Reset these values to valid ones. + saveDataWithDefaults.optionsChartEditor.chartEditorLiveInputStyle = funkin.ui.debug.charting.ChartEditorLiveInputStyle.None; + saveDataWithDefaults.optionsChartEditor.theme = funkin.ui.debug.charting.ChartEditorTheme.Light; + saveDataWithDefaults.optionsStageEditor.theme = funkin.ui.debug.stageeditor.StageEditorTheme.Light; + + var save:Save = new Save(saveDataWithDefaults); + return save; + } + /** * Migrate from 1.x to the latest version. */ diff --git a/source/funkin/save/migrator/SaveData_v2_0_0.hx b/source/funkin/save/migrator/SaveData_v2_0_0.hx new file mode 100644 index 0000000000..5369d87371 --- /dev/null +++ b/source/funkin/save/migrator/SaveData_v2_0_0.hx @@ -0,0 +1,26 @@ +package funkin.save.migrator; + +// Internal enums used to ensure old save data can be parsed by the default Haxe unserializer. +// In the future, only primitive types and abstract enums should be used in save data! + +@:native("funkin.ui.debug.stageeditor.StageEditorTheme") +enum StageEditorTheme +{ + Light; + Dark; +} + +@:native("funkin.ui.debug.charting.ChartEditorTheme") +enum ChartEditorTheme +{ + Light; + Dark; +} + +@:native("funkin.ui.debug.charting.ChartEditorLiveInputStyle") +enum ChartEditorLiveInputStyle +{ + None; + NumberKeys; + WASDKeys; +} diff --git a/source/funkin/ui/debug/charting/ChartEditorState.hx b/source/funkin/ui/debug/charting/ChartEditorState.hx index 3fb63a4f1e..c11f133429 100644 --- a/source/funkin/ui/debug/charting/ChartEditorState.hx +++ b/source/funkin/ui/debug/charting/ChartEditorState.hx @@ -5654,7 +5654,8 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState function handleHelpKeybinds():Void { // F1 = Open Help - if (FlxG.keys.justPressed.F1 && !isHaxeUIDialogOpen) { + if (FlxG.keys.justPressed.F1 && !isHaxeUIDialogOpen) + { this.openUserGuideDialog(); } } @@ -6543,22 +6544,22 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState /** * Available input modes for the chart editor state. Numbers/arrows/WASD available for other keybinds. */ -enum ChartEditorLiveInputStyle +enum abstract ChartEditorLiveInputStyle(String) { /** * No hotkeys to place notes at the playbar. */ - None; + var None; /** * 1/2/3/4 to place notes on opponent's side, 5/6/7/8 to place notes on player's side. */ - NumberKeys; + var NumberKeys; /** * WASD to place notes on opponent's side, Arrow keys to place notes on player's side. */ - WASDKeys; + var WASDKeys; } typedef ChartEditorParams = @@ -6577,15 +6578,15 @@ typedef ChartEditorParams = /** * Available themes for the chart editor state. */ -enum ChartEditorTheme +enum abstract ChartEditorTheme(String) { /** * The default theme for the chart editor. */ - Light; + var Light; /** * A theme which introduces darker colors. */ - Dark; + var Dark; } diff --git a/source/funkin/ui/debug/stageeditor/StageEditorState.hx b/source/funkin/ui/debug/stageeditor/StageEditorState.hx index 98190498fa..a536a09ee5 100644 --- a/source/funkin/ui/debug/stageeditor/StageEditorState.hx +++ b/source/funkin/ui/debug/stageeditor/StageEditorState.hx @@ -1458,17 +1458,17 @@ class StageEditorState extends UIState /** * Available themes for the stage editor state. */ -enum StageEditorTheme +enum abstract StageEditorTheme(String) { /** * The default theme for the stage editor. */ - Light; + var Light; /** * A theme which introduces stage colors. */ - Dark; + var Dark; } enum StageEditorDialogType From d6db842efbfb7c8b4e1f4b9d755b94b43a0bfd97 Mon Sep 17 00:00:00 2001 From: EliteMasterEric Date: Fri, 18 Oct 2024 17:22:36 -0400 Subject: [PATCH 12/25] Fix a typo. --- source/funkin/save/migrator/SaveDataMigrator.hx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/funkin/save/migrator/SaveDataMigrator.hx b/source/funkin/save/migrator/SaveDataMigrator.hx index 228669f66b..3dc012fce4 100644 --- a/source/funkin/save/migrator/SaveDataMigrator.hx +++ b/source/funkin/save/migrator/SaveDataMigrator.hx @@ -53,9 +53,9 @@ class SaveDataMigrator var saveDataWithDefaults:RawSaveData = cast thx.Objects.deepCombine(Save.getDefault(), inputData); // Reset these values to valid ones. - saveDataWithDefaults.optionsChartEditor.chartEditorLiveInputStyle = funkin.ui.debug.charting.ChartEditorLiveInputStyle.None; - saveDataWithDefaults.optionsChartEditor.theme = funkin.ui.debug.charting.ChartEditorTheme.Light; - saveDataWithDefaults.optionsStageEditor.theme = funkin.ui.debug.stageeditor.StageEditorTheme.Light; + saveDataWithDefaults.optionsChartEditor.chartEditorLiveInputStyle = funkin.ui.debug.charting.ChartEditorState.ChartEditorLiveInputStyle.None; + saveDataWithDefaults.optionsChartEditor.theme = funkin.ui.debug.charting.ChartEditorState.ChartEditorTheme.Light; + saveDataWithDefaults.optionsStageEditor.theme = funkin.ui.debug.stageeditor.StageEditorState.StageEditorTheme.Light; var save:Save = new Save(saveDataWithDefaults); return save; From b5c5693d4d26176267efaa4483d020d5c91f7525 Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Fri, 18 Oct 2024 19:51:06 -0400 Subject: [PATCH 13/25] proj hxp version bump --- project.hxp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.hxp b/project.hxp index 4e8dae4b80..2ec8ba4458 100644 --- a/project.hxp +++ b/project.hxp @@ -25,7 +25,7 @@ class Project extends HXProject { * REMEMBER TO CHANGE THIS WHEN THE GAME UPDATES! * You only have to change it here, the rest of the game will query this value. */ - static final VERSION:String = "0.5.2"; + static final VERSION:String = "0.5.3"; /** * The game's name. Used as the default window title. From 61a797802088bdc669ec4f014f661705c13b87aa Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Tue, 22 Oct 2024 12:14:14 -0400 Subject: [PATCH 14/25] changelog yoink --- CHANGELOG.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b98f33737..f08fe25a1f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,8 +19,8 @@ This patch resolves a critical issue which could cause user's save data to becom ### Added - Added InverseDotsShader that emulates flash selections ([097dbf5](https://github.com/FunkinCrew/Funkin/commit/097dbf5bb4346d431d8ca9f0ec4bc5b5e6f4523f)) - by @ninjamuffin99 - Added a new reworked Stage Editor ([27a0b44](https://github.com/FunkinCrew/Funkin/pull/3482/commits/27a0b4426f86f04362f97e16e2eff580c9402f34)) - by @JustKolosaki in [#3482](https://github.com/FunkinCrew/Funkin/pull/3482) -- Added the `color` attribute to stage prop JSON data to allow them to be tinted without code. ([27a0b44](https://github.com/FunkinCrew/Funkin/pull/3482/commits/27a0b4426f86f04362f97e16e2eff580c9402f34)) - by @JustKolosaki -- Added the `angle` attribute to stage prop JSON data to allow them to be rotated without code. ([27a0b44](https://github.com/FunkinCrew/Funkin/pull/3482/commits/27a0b4426f86f04362f97e16e2eff580c9402f34)) - by @JustKolosaki +- Added the `color` attribute to stage prop JSON data to allow them to be tinted without code. ([27a0b44](https://github.com/FunkinCrew/Funkin/pull/3482/commits/27a0b4426f86f04362f97e16e2eff580c9402f34)) - by @JustKolosaki +- Added the `angle` attribute to stage prop JSON data to allow them to be rotated without code. ([27a0b44](https://github.com/FunkinCrew/Funkin/pull/3482/commits/27a0b4426f86f04362f97e16e2eff580c9402f34)) - by @JustKolosaki - Added the `blend` attribute to the stage prop JSON data to allow blend modes to be applied without code. ([27a0b44](https://github.com/FunkinCrew/Funkin/pull/3482/commits/27a0b4426f86f04362f97e16e2eff580c9402f34)) - by @JustKolosaki ### Changed - (docs) Delete Modding.md since we have a separate modding documentation ([a42240e](https://github.com/FunkinCrew/Funkin/commit/a42240e6a595d33034f2c887bf38a350d1fa0f15)) - by @AbnormalPoof in [#3651](https://github.com/FunkinCrew/Funkin/pull/3651) @@ -43,7 +43,7 @@ This patch resolves a critical issue which could cause user's save data to becom - The dialog now shows up on the animation debugger view ([1fde59f](https://github.com/FunkinCrew/Funkin/commit/1fde59f999eac94eb10fc22094885de2f5310705)) - by @EliteMasterEric in [#3530](https://github.com/FunkinCrew/Funkin/pull/3530) - Center preloader 'fnf' and 'dsp' text so it doesn't clip anymore ([165ad60](https://github.com/FunkinCrew/Funkin/commit/165ad6015539a295e9eefdaef291c312e9566b26)) - by @Burgerballs in [#3567](https://github.com/FunkinCrew/Funkin/pull/3567) - `Song.getFirstValidVariation()` now properly takes into account multiple variations/difficulty input ([d2e2987](https://github.com/FunkinCrew/Funkin/commit/d2e29879fe2acc6febfe0f335f655b741d630c34)) - by @ninjamuffin99 in [#3506](https://github.com/FunkinCrew/Funkin/pull/3506) -- (debug) No more fullscreening when typing "F" in the flixel debugger console ([29b6763](https://github.com/FunkinCrew/Funkin/commit/29b6763290df05d42039806f3d142740568c80f0)) - by @ninjamuffin99 +- (debug) No more fullscreening when typing "F" in the flixel debugger console ([29b6763](https://github.com/FunkinCrew/Funkin/commit/29b6763290df05d42039806f3d142740568c80f0)) - by @ninjamuffin99 - Fix crash in LatencyState when exiting / cleaning up state data ([39b1a42](https://github.com/FunkinCrew/Funkin/commit/39b1a42cfeafe2b7be8b66e2fe529e853d9ae197)) - by @lemz1 in [#3493](https://github.com/FunkinCrew/Funkin/pull/3493) - Add additional classes to Polymod blacklist for security ([b0b73c8](https://github.com/FunkinCrew/Funkin/commit/b0b73c83994f33118c6a69550da9ec8ec1c07adc)) - by @EliteMasterEric in [#3558](https://github.com/FunkinCrew/Funkin/pull/3558) - Stop allowing inputs after selecting a character ([dbf66ac](https://github.com/FunkinCrew/Funkin/commit/dbf66ac250137262866d75f7c1387645b35d88d0)) - by @ACrazyTown in [#3398](https://github.com/FunkinCrew/Funkin/pull/3398) @@ -314,7 +314,7 @@ which would remove their rank if they had a lower one. - Removed a large number of unused imports to optimize builds ([thanks Ethan-makes-music!](https://github.com/FunkinCrew/Funkin/pull/2624)) - Improved debug logging for unscripted stages ([thanks gamerbross!](https://github.com/FunkinCrew/Funkin/pull/2603)) - Fixed a crash on Linux caused by an old version of hxCodec ([thanks Noobz4Life!](https://github.com/FunkinCrew/Funkin/pull/2472)) -- Optimized animation handling for characters ([thanks richTrash21!](https://github.com/FunkinCrew/Funkin/pull/2493)) +- Optimized animation handling for characters ([thanks richTrash21!](https://github.com/FunkinCrew/Funkin/pull/2493)) - Made improvements to compiling documentation (thanks gedehari!) - Fixed an issue where the Chart Editor would use an incorrect instrumental on imported Legacy songs ([thanks gamerbross!](https://github.com/FunkinCrew/Funkin/pull/2604)) - Fixed a bug where opening the game from the command line would crash the preloader ([thanks NotHyper-474!](https://github.com/FunkinCrew/Funkin/pull/2629)) From bb24821f13ecfc78f2bceebeb092e7a50292e310 Mon Sep 17 00:00:00 2001 From: Eric Date: Wed, 18 Dec 2024 10:44:01 -0500 Subject: [PATCH 15/25] Remove duplicate issue detector. (#3944) --- .github/workflows/label-issue.yml | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/.github/workflows/label-issue.yml b/.github/workflows/label-issue.yml index eeb83350c6..7430f161c0 100644 --- a/.github/workflows/label-issue.yml +++ b/.github/workflows/label-issue.yml @@ -7,36 +7,6 @@ on: - edited jobs: - # When an issue is opened, perform a similarity check for potential duplicates. - # If some are found, add a label and comment listing the potential duplicate issues. - potential-duplicate: - name: Detect potential duplicate issues - runs-on: ubuntu-latest - steps: - - uses: wow-actions/potential-duplicates@v1 - with: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # Issue title filter work with anymatch https://www.npmjs.com/package/anymatch. - # Any matched issue will stop detection immediately. - # You can specify multi filters in each line. - filter: '' - # Exclude keywords in title before detecting. - exclude: '' - # Label to set, when potential duplicates are detected. - label: 'potential duplicate' - # Get issues with state to compare. Supported state: 'all', 'closed', 'open'. - state: all - # If similarity is higher than this threshold([0,1]), issue will be marked as duplicate. - # Turn this up if the detection is too sensitive - threshold: 0.6 - # Reactions to be add to comment when potential duplicates are detected. - # Available reactions: "-1", "+1", "confused", "laugh", "heart", "hooray", "rocket", "eyes" - # reactions: '-1' - # Comment to post when potential duplicates are detected. - comment: > - Potential duplicates: {{#issues}} - - [#{{ number }}] {{ title }} ({{ accuracy }}%) - {{/issues}} # When an issue is opened, detect if it has an empty body or incomplete issue form. # If it does, close the issue immediately. empty-issues: From bc521b7e7f573854b5cd76c052ba6fe88931e9bf Mon Sep 17 00:00:00 2001 From: UltimateQuack Date: Thu, 16 Jan 2025 21:51:15 -0300 Subject: [PATCH 16/25] "Fixed" the Apache 2.0 LICENSE file part (#3843) very simple --- LICENSE.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/LICENSE.md b/LICENSE.md index f7c1c42e98..68a0cba218 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -8,7 +8,7 @@ All Rights Reserved. "Friday Night Funkin'" and the "Friday Night Funkin'" logo You can view the `funkin-assets` license here: (https://github.com/FunkinCrew/funkin.assets/blob/main/LICENSE.md) ## Apache 2.0 License - +``` Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -210,3 +210,4 @@ You can view the `funkin-assets` license here: (https://github.com/FunkinCrew/fu WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. +``` From c3a188b3571733f55068d9009761b2db0ef2a2f2 Mon Sep 17 00:00:00 2001 From: Hundrec Date: Thu, 16 Jan 2025 18:02:59 -0700 Subject: [PATCH 17/25] [GITHUB] Create a dedicated charting issue template (and bump version to 0.5.3) (#3834) * Create Charting Issue template * Include images and videos in charting issue template * Update version in bug report template * Update version in crash report template --- .github/ISSUE_TEMPLATE/bug.yml | 2 +- .github/ISSUE_TEMPLATE/charting.yml | 70 +++++++++++++++++++++++++++++ .github/ISSUE_TEMPLATE/crash.yml | 2 +- 3 files changed, 72 insertions(+), 2 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE/charting.yml diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml index 96aa06c3f2..71089ba04a 100644 --- a/.github/ISSUE_TEMPLATE/bug.yml +++ b/.github/ISSUE_TEMPLATE/bug.yml @@ -41,7 +41,7 @@ body: attributes: label: Version description: Which version are you playing on? The game version is in the bottom left corner of the main menu. - placeholder: ex. 0.5.0 + placeholder: ex. 0.5.3 validations: required: true diff --git a/.github/ISSUE_TEMPLATE/charting.yml b/.github/ISSUE_TEMPLATE/charting.yml new file mode 100644 index 0000000000..a56afc543e --- /dev/null +++ b/.github/ISSUE_TEMPLATE/charting.yml @@ -0,0 +1,70 @@ +name: Charting Issue +description: Report an issue with the placement of notes in the game. +labels: ["type: charting issue", "status: pending triage"] +title: "Charting Issue: " +body: + - type: checkboxes + attributes: + label: Issue Checklist + description: Be sure to complete these steps to increase the chances of your issue being addressed! + options: + - label: I have properly named my issue + - label: I have checked the Issues/Discussions pages to see if my issue has already been reported + + - type: dropdown + attributes: + label: Platform + description: Which platform are you playing on? + options: + - Newgrounds (Web/HTML5) + - Itch.io (Web/HTML5) + - Itch.io (Downloadable Build) - Windows + - Itch.io (Downloadable Build) - MacOS + - Itch.io (Downloadable Build) - Linux + - Compiled from GitHub Source Code + validations: + required: true + + - type: dropdown + attributes: + label: Browser + description: (Web/HTML5 users only) Which browser are you playing on? + options: + - Google Chrome + - Microsoft Edge + - Firefox + - Opera + - Safari + - Other (Specify in Description field) + + - type: input + attributes: + label: Version + description: Which version are you playing on? The game version is in the bottom left corner of the main menu. + placeholder: ex. 0.5.3 + validations: + required: true + + - type: markdown + attributes: + value: "## Describe the charting issue(s)." + + - type: markdown + attributes: + value: "### Please do not report issues from other engines. These must be reported in their respective repositories." + + - type: textarea + attributes: + label: Location + description: Where did you find the issue(s)? Include the name of the song, the variation, the difficulty, the time/section of the song, and any images or videos. + placeholder: ex. Cocoa Erect on Erect/Nightmare difficulties at Section 30 + validations: + required: true + + - type: textarea + attributes: + label: Description + description: Why do you believe this is an issue? Is a note at the wrong time, a hold note too short/long, or something else? + placeholder: Describe the charting issue(s) here... + validations: + required: true diff --git a/.github/ISSUE_TEMPLATE/crash.yml b/.github/ISSUE_TEMPLATE/crash.yml index 3e8fb08dd3..a91f670d0a 100644 --- a/.github/ISSUE_TEMPLATE/crash.yml +++ b/.github/ISSUE_TEMPLATE/crash.yml @@ -41,7 +41,7 @@ body: attributes: label: Version description: Which version are you playing on? The game version is in the bottom left corner of the main menu. - placeholder: ex. 0.5.0 + placeholder: ex. 0.5.3 validations: required: true From 5d5d12dbfdc2fc0ab005081de648ff6ecd65d1f8 Mon Sep 17 00:00:00 2001 From: JVN-Pixels <146671762+JVNpixels@users.noreply.github.com> Date: Thu, 16 Jan 2025 17:05:37 -0800 Subject: [PATCH 18/25] [ENHANCEMENT]: Compiling Error Issue Template (#3835) * Create compiling.yml * Update compiling.yml * Update compiling.yml * Update compiling.yml * Update compiling.yml * Update compiling.yml * charting (Hundrec) thanks hundrec i like this * Delete .github/ISSUE_TEMPLATE/charting.yml --- .github/ISSUE_TEMPLATE/compiling.yml | 47 ++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/compiling.yml diff --git a/.github/ISSUE_TEMPLATE/compiling.yml b/.github/ISSUE_TEMPLATE/compiling.yml new file mode 100644 index 0000000000..cab9b34cd0 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/compiling.yml @@ -0,0 +1,47 @@ +name: Compiling Report +description: Report an issue with compiling the game. +labels: ["type: compilation help", "status: pending triage"] +title: "Compiling Report: " +body: + - type: checkboxes + attributes: + label: Issue Checklist + description: Be sure to complete these steps to increase the chances of your issue being addressed! + options: + - label: I have properly named my issue + - label: I have checked the Issues/Discussions pages to see if my issue has already been reported + + - type: dropdown + attributes: + label: Platform + description: Which platform are you compiling to/for? + options: + - Web/HTML5 + - Desktop + - Other + validations: + required: true + + - type: input + attributes: + label: Version + description: Which version are you compiling? The game version is in the bottom left corner of the main menu or in the project.hxp file. + placeholder: ex. 0.5.3 + validations: + required: true + + - type: markdown + attributes: + value: "## Describe your compiling error." + + - type: markdown + attributes: + value: "### Please do not report issues from other engines. These must be reported in their respective repositories." + + - type: textarea + attributes: + label: Description (include any images, videos, errors of terminal or console, error logs) + description: Provide as much detail as you can. The better others understand your issue, the more they can help you! + placeholder: Describe your issue here... + validations: + required: true From 48a72ce32cac8acd9314e7e608756ff04e149cfc Mon Sep 17 00:00:00 2001 From: Hundrec Date: Wed, 22 Jan 2025 19:27:36 -0700 Subject: [PATCH 19/25] Add status: stale to auto-close (#4017) --- .github/label-actions.yml | 53 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 50 insertions(+), 3 deletions(-) diff --git a/.github/label-actions.yml b/.github/label-actions.yml index a99d17660f..4d5429cf13 100644 --- a/.github/label-actions.yml +++ b/.github/label-actions.yml @@ -7,9 +7,9 @@ comment: > This issue is a duplicate. Please direct all discussion to the original issue. # Close the issue - close: true + close: false # Set a close reason - close-reason: 'not planned' + # close-reason: 'not planned' # Remove other status labels unlabel: - 'status: accepted' @@ -22,6 +22,7 @@ - 'status: planned' - 'status: rejected' - 'status: resolved' + - 'status: resolved internally' - 'status: reviewing internally' - 'status: stale' prs: @@ -29,6 +30,28 @@ comment: > This pull request is a duplicate. Please direct all discussion to the original pull request. # Close the pull request + close: false + # Set a close reason + # close-reason: 'not planned' + # Remove other status labels + unlabel: + - 'status: accepted' + - 'status: bug reproduced' + - 'status: cannot reproduce' + - 'status: needs clarification' + - 'status: needs revision' + - 'status: pending pull request' + - 'status: pending triage' + - 'status: planned' + - 'status: rejected' + - 'status: resolved' + - 'status: resolved internally' + - 'status: reviewing internally' + - 'status: stale' + +'status: stale': + issues: + # Close the issue close: true # Set a close reason close-reason: 'not planned' @@ -37,6 +60,7 @@ - 'status: accepted' - 'status: bug reproduced' - 'status: cannot reproduce' + - 'status: duplicate' - 'status: needs clarification' - 'status: needs revision' - 'status: pending pull request' @@ -44,8 +68,28 @@ - 'status: planned' - 'status: rejected' - 'status: resolved' + - 'status: resolved internally' + - 'status: reviewing internally' + prs: + # Close the pull request + close: true + # Set a close reason + close-reason: 'not planned' + # Remove other status labels + unlabel: + - 'status: accepted' + - 'status: bug reproduced' + - 'status: cannot reproduce' + - 'status: duplicate' + - 'status: needs clarification' + - 'status: needs revision' + - 'status: pending pull request' + - 'status: pending triage' + - 'status: planned' + - 'status: rejected' + - 'status: resolved' + - 'status: resolved internally' - 'status: reviewing internally' - - 'status: stale' 'status: rejected': issues: @@ -65,6 +109,7 @@ - 'status: pending triage' - 'status: planned' - 'status: resolved' + - 'status: resolved internally' - 'status: reviewing internally' - 'status: stale' prs: @@ -84,6 +129,7 @@ - 'status: pending triage' - 'status: planned' - 'status: resolved' + - 'status: resolved internally' - 'status: reviewing internally' - 'status: stale' @@ -105,5 +151,6 @@ - 'status: pending triage' - 'status: planned' - 'status: rejected' + - 'status: resolved internally' - 'status: reviewing internally' - 'status: stale' From 981aad214fbe5d270ef86b40ade707fce781c25a Mon Sep 17 00:00:00 2001 From: Hundrec Date: Wed, 22 Jan 2025 21:31:59 -0700 Subject: [PATCH 20/25] Change size label names in PR labeler (#3918) --- .github/changed-lines-count-labeler.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/changed-lines-count-labeler.yml b/.github/changed-lines-count-labeler.yml index 1de00e62f8..9b2f338ce2 100644 --- a/.github/changed-lines-count-labeler.yml +++ b/.github/changed-lines-count-labeler.yml @@ -1,12 +1,12 @@ -# Add 'small' to any changes below 10 lines -small: +# Add 'size: small' to any changes below 10 lines +'size: small': max: 9 -# Add 'medium' to any changes between 10 and 100 lines -medium: +# Add 'size: medium' to any changes between 10 and 100 lines +'size: medium': min: 10 max: 99 -# Add 'large' to any changes of at least 100 lines -large: +# Add 'size: large' to any changes of at least 100 lines +'size: large': min: 100 From 2adae38805dc2550ee936a117d10b2cac0830316 Mon Sep 17 00:00:00 2001 From: Hundrec Date: Thu, 23 Jan 2025 14:18:37 -0700 Subject: [PATCH 21/25] Update Contributing section in README (#4026) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 29077d7f15..9239d266c1 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ To learn how to install the necessary dependencies and compile the game from sou # Contributing -Please check out our [Contributor's guide](./CONTRIBUTORS.md) on how you can actively participate in the development of Friday Night Funkin'. +You can actively participate in the development of Friday Night Funkin' by opening a [bug report](https://github.com/FunkinCrew/Funkin/issues) or submitting a [code contribution](https://github.com/FunkinCrew/Funkin/pulls)! # Modding From 7e0f4d9c8497f0c5c687b4f44d1dc7ffa73426c1 Mon Sep 17 00:00:00 2001 From: Abnormal <86753001+AbnormalPoof@users.noreply.github.com> Date: Thu, 23 Jan 2025 21:19:58 +0000 Subject: [PATCH 22/25] Update labeler workflow (#4023) --- .github/labeler.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index 9cf784f4ca..414df5a31e 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -1,11 +1,18 @@ # Add Documentation tag to PR's changing markdown files, or anything in the docs folder -Documentation: +'pr: documentation': - changed-files: - any-glob-to-any-file: - docs/* - '**/*.md' # Add Haxe tag to PR's changing haxe code files -Haxe: +'pr: haxe': - changed-files: - any-glob-to-any-file: '**/*.hx' + +# Add GitHub tag to PR's changing yml files, or anything in the .github folder +'pr: github': +- changed-files: + - any-glob-to-any-file: + - github/* + - '**/*.yml' From 0c06ba942e74c6c40ab3c3b7e23bc1828ec3aa98 Mon Sep 17 00:00:00 2001 From: Hundrec Date: Fri, 24 Jan 2025 16:21:34 -0700 Subject: [PATCH 23/25] Add needs r&d label to unlabel list (#4034) --- .github/label-actions.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/label-actions.yml b/.github/label-actions.yml index 4d5429cf13..ef7448ab26 100644 --- a/.github/label-actions.yml +++ b/.github/label-actions.yml @@ -16,6 +16,7 @@ - 'status: bug reproduced' - 'status: cannot reproduce' - 'status: needs clarification' + - 'status: needs r&d' - 'status: needs revision' - 'status: pending pull request' - 'status: pending triage' @@ -31,14 +32,13 @@ This pull request is a duplicate. Please direct all discussion to the original pull request. # Close the pull request close: false - # Set a close reason - # close-reason: 'not planned' # Remove other status labels unlabel: - 'status: accepted' - 'status: bug reproduced' - 'status: cannot reproduce' - 'status: needs clarification' + - 'status: needs r&d' - 'status: needs revision' - 'status: pending pull request' - 'status: pending triage' @@ -62,6 +62,7 @@ - 'status: cannot reproduce' - 'status: duplicate' - 'status: needs clarification' + - 'status: needs r&d' - 'status: needs revision' - 'status: pending pull request' - 'status: pending triage' @@ -73,8 +74,6 @@ prs: # Close the pull request close: true - # Set a close reason - close-reason: 'not planned' # Remove other status labels unlabel: - 'status: accepted' @@ -82,6 +81,7 @@ - 'status: cannot reproduce' - 'status: duplicate' - 'status: needs clarification' + - 'status: needs r&d' - 'status: needs revision' - 'status: pending pull request' - 'status: pending triage' @@ -104,6 +104,7 @@ - 'status: cannot reproduce' - 'status: duplicate' - 'status: needs clarification' + - 'status: needs r&d' - 'status: needs revision' - 'status: pending pull request' - 'status: pending triage' @@ -115,8 +116,6 @@ prs: # Close the pull request close: true - # Set a close reason - close-reason: 'not planned' # Remove other status labels unlabel: - 'status: accepted' @@ -124,6 +123,7 @@ - 'status: cannot reproduce' - 'status: duplicate' - 'status: needs clarification' + - 'status: needs r&d' - 'status: needs revision' - 'status: pending pull request' - 'status: pending triage' @@ -146,6 +146,7 @@ - 'status: cannot reproduce' - 'status: duplicate' - 'status: needs clarification' + - 'status: needs r&d' - 'status: needs revision' - 'status: pending pull request' - 'status: pending triage' From 47e320e96fe9076d0d38bed2d510ca2ea0c6173d Mon Sep 17 00:00:00 2001 From: Hundrec Date: Mon, 27 Jan 2025 11:37:27 -0700 Subject: [PATCH 24/25] [GITHUB] Add `status: pending triage` to all PRs (#4035) * Add `status: pending triage` to all PRs * Update label-pull-request.yml * now size and pr labels can be updated every commit! * remove this * move the pending triage thing to a new workflow * Rename label-pr-on-create.yml to label-pull-request-on-create.yml * fix the identation on this * almost forgot to remove this --------- Co-authored-by: Abnormal <86753001+AbnormalPoof@users.noreply.github.com> --- .../label-pull-request-on-create.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .github/workflows/label-pull-request-on-create.yml diff --git a/.github/workflows/label-pull-request-on-create.yml b/.github/workflows/label-pull-request-on-create.yml new file mode 100644 index 0000000000..94620657d4 --- /dev/null +++ b/.github/workflows/label-pull-request-on-create.yml @@ -0,0 +1,19 @@ +name: "Pull Request Labeler 2 (Runs on PR creation)" +on: + pull_request_target: + types: + - opened + +jobs: + # Apply `status: pending triage` to newly created pull requests + apply-pending-triage: + permissions: + contents: read + pull-requests: write + runs-on: ubuntu-latest + steps: + - name: Apply "status pending triage" to new pull requests + uses: actions-ecosystem/action-add-labels@v1 + with: + token: ${{ secrets.GITHUB_TOKEN }} + labels: "status: pending triage" From df142a91445589189e0bc61704667e3be784e69a Mon Sep 17 00:00:00 2001 From: Hundrec Date: Mon, 27 Jan 2025 11:37:42 -0700 Subject: [PATCH 25/25] [GITHUB] Add Links to Guides in Issue Templates (#4053) * Issues Guide in bug template * Issues Guide in charting template * Guide links in compiling template * Issues Guide in crash template * Issues Guide in enhancement template --- .github/ISSUE_TEMPLATE/bug.yml | 3 ++- .github/ISSUE_TEMPLATE/charting.yml | 3 ++- .github/ISSUE_TEMPLATE/compiling.yml | 30 ++++++++++++++++++-------- .github/ISSUE_TEMPLATE/crash.yml | 3 ++- .github/ISSUE_TEMPLATE/enhancement.yml | 3 ++- 5 files changed, 29 insertions(+), 13 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml index 71089ba04a..5210f50bff 100644 --- a/.github/ISSUE_TEMPLATE/bug.yml +++ b/.github/ISSUE_TEMPLATE/bug.yml @@ -8,8 +8,9 @@ body: label: Issue Checklist description: Be sure to complete these steps to increase the chances of your issue being addressed! options: - - label: I have properly named my issue + - label: I have read the pinned [Issues Guide](https://github.com/FunkinCrew/Funkin/issues/4050) - label: I have checked the Issues/Discussions pages to see if my issue has already been reported + - label: I have properly named my issue - type: dropdown attributes: diff --git a/.github/ISSUE_TEMPLATE/charting.yml b/.github/ISSUE_TEMPLATE/charting.yml index a56afc543e..3c1e689ce0 100644 --- a/.github/ISSUE_TEMPLATE/charting.yml +++ b/.github/ISSUE_TEMPLATE/charting.yml @@ -8,8 +8,9 @@ body: label: Issue Checklist description: Be sure to complete these steps to increase the chances of your issue being addressed! options: - - label: I have properly named my issue + - label: I have read the pinned [Issues Guide](https://github.com/FunkinCrew/Funkin/issues/4050) - label: I have checked the Issues/Discussions pages to see if my issue has already been reported + - label: I have properly named my issue - type: dropdown attributes: diff --git a/.github/ISSUE_TEMPLATE/compiling.yml b/.github/ISSUE_TEMPLATE/compiling.yml index cab9b34cd0..c9e364c3e5 100644 --- a/.github/ISSUE_TEMPLATE/compiling.yml +++ b/.github/ISSUE_TEMPLATE/compiling.yml @@ -1,23 +1,27 @@ -name: Compiling Report +name: Compiling Help description: Report an issue with compiling the game. labels: ["type: compilation help", "status: pending triage"] -title: "Compiling Report: " +title: "Compiling Help: " body: - type: checkboxes attributes: label: Issue Checklist description: Be sure to complete these steps to increase the chances of your issue being addressed! options: - - label: I have properly named my issue + - label: I have read the pinned [Issues Guide](https://github.com/FunkinCrew/Funkin/issues/4050) + - label: I have followed the [Compiling Guide](https://github.com/FunkinCrew/Funkin/blob/main/docs/COMPILING.md) and the [Troubleshooting Guide](https://github.com/FunkinCrew/Funkin/blob/main/docs/TROUBLESHOOTING.md) - label: I have checked the Issues/Discussions pages to see if my issue has already been reported + - label: I have properly named my issue - type: dropdown attributes: label: Platform - description: Which platform are you compiling to/for? + description: Which platform are you compiling for? options: - Web/HTML5 - - Desktop + - Desktop (Windows) + - Desktop (Mac) + - Desktop (Linux) - Other validations: required: true @@ -32,7 +36,7 @@ body: - type: markdown attributes: - value: "## Describe your compiling error." + value: "## Describe your compiling issue." - type: markdown attributes: @@ -40,8 +44,16 @@ body: - type: textarea attributes: - label: Description (include any images, videos, errors of terminal or console, error logs) - description: Provide as much detail as you can. The better others understand your issue, the more they can help you! - placeholder: Describe your issue here... + label: Console Output + description: Paste any errors or warnings from the console here. + placeholder: Paste output here... + validations: + required: true + + - type: textarea + attributes: + label: Context + description: Provide as much detail as you can. Did you modify any code? Provide any relevant images or videos. + placeholder: Describe the context here... validations: required: true diff --git a/.github/ISSUE_TEMPLATE/crash.yml b/.github/ISSUE_TEMPLATE/crash.yml index a91f670d0a..4f49289978 100644 --- a/.github/ISSUE_TEMPLATE/crash.yml +++ b/.github/ISSUE_TEMPLATE/crash.yml @@ -8,8 +8,9 @@ body: label: Issue Checklist description: Be sure to complete these steps to increase the chances of your issue being addressed! options: - - label: I have properly named my issue + - label: I have read the pinned [Issues Guide](https://github.com/FunkinCrew/Funkin/issues/4050) - label: I have checked the Issues/Discussions pages to see if my issue has already been reported + - label: I have properly named my issue - type: dropdown attributes: diff --git a/.github/ISSUE_TEMPLATE/enhancement.yml b/.github/ISSUE_TEMPLATE/enhancement.yml index dfb4ace959..108279534d 100644 --- a/.github/ISSUE_TEMPLATE/enhancement.yml +++ b/.github/ISSUE_TEMPLATE/enhancement.yml @@ -8,8 +8,9 @@ body: label: Issue Checklist description: Be sure to complete these steps to increase the chances of your suggestion being considered! options: - - label: I have properly named my enhancement + - label: I have read the pinned [Issues Guide](https://github.com/FunkinCrew/Funkin/issues/4050) - label: I have checked the Issues/Discussions pages to see if my enhancement has already been suggested + - label: I have properly named my enhancement - type: textarea attributes: