-
Notifications
You must be signed in to change notification settings - Fork 2.4k
[ENHANCEMENT] Softcoded Freeplay Capsule Week Labels #5249
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
KoloInDaCrib
wants to merge
66
commits into
FunkinCrew:dummy/develop-v0.7.5
Choose a base branch
from
KoloInDaCrib:one-less-hardcoded-thing-yay
base: dummy/develop-v0.7.5
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
[ENHANCEMENT] Softcoded Freeplay Capsule Week Labels #5249
KoloInDaCrib
wants to merge
66
commits into
FunkinCrew:dummy/develop-v0.7.5
from
KoloInDaCrib:one-less-hardcoded-thing-yay
+3,968
−2,192
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This fixes an issue where recycled sounds would use the previous sound's waveform data.
…Features (FunkinCrew#3974) * stage editor bugfixes + features :D * Merge branch 'develop' of https://github.com/FunkinCrew/Funkin into stage-editor-bugfix-n-stuff * even more fixes and missing features * delete logic fix + 2 new feats feat 1: new objects now have the zIndex 1 higher than the last one (thanks hundrec) feat 2: chars to test as are now saved (thanks imverybad) * compilation fix --------- Co-authored-by: Kolo <[email protected]>
* Load meta/chartdata fix Deletes the song serialiser class, it has no use anymore Also fixes the BPM changes Note style is properly set when metadata toolbox is refreshed Add variation dialog now fills note style dropdown with note styles and sets it properly afterwards Also makes a few optimisations for the chart editor * Try push unique the difficulties for the notes
* Initial commit * use chunking i tested it out, and it is faster than the previous implementation * WIP implementation of no stacking when pasting * Better method name and remove unnecessary variable * Fix wrong notes being removed from notesB * Hopefully temporary implementation of note overwrite * Small cleanup and refactors * Note overwrite on paste again * Small refactor; reduce default threshold * Hopefully should be good to go now. * Add support for overlapping notes in chart editor preview Also fixes some inconsistencies in the documentation * Respect style guide Optional parameters and parameters with default values should be mutually exclusive. * Fix scrolling causing performance loss * Switch to snap-based threshold instead (No idea if this was implemented correctly) * Shift + Delete for deleting all stacked notes in chart or selection * Ignore events when wanting to delete stacked notes * aaa this just feels wrong * Don't make event selection box red if there's a stacked note selected * Fix deleting all stacked notes action not working * Add 'Edit -> Delete Stacked' menu item and some fixes * Make undo feel less weird Actually correct implementation of threshold (maybe) Minor bugfixes * Some stuff I forgor 💀 * use only when ONLY only is only Co-authored-by: Hundrec <[email protected]> * This minor spelling mistake will be the bane of me Co-authored-by: Hundrec <[email protected]> * Hundrecard's paste note text suggestion * Fix a minor bug with RemoveStackedNotesCommand * Singular text for singular note * Use dropdown for threshold (thanks Hundrec for the suggestion!) Also R.I.P True... * - Revert snaps order - Actually change default threshold to match default dropdown value - Increase epsilon on threshold check * Clarify how threshold works differently in the UI Co-authored-by: Hundrec <[email protected]> * Fix `Exact` threshold check * Fix a bug with RemoveStackedNotesCommand, properly this time Also fixes bug where listStackedNotes could include a stacked note twice Also minor optimization? * Warn user about stacked notes when opening song * Change back to fastContains since the PR that fixes `fastIndexOf` was accepted --------- Co-authored-by: lemz1 <[email protected]> Co-authored-by: Hundrec <[email protected]>
* Save chart editor vocal volume and playback speed Also opponent hitsounds * Whoops, didn't save and load the stuff properly * I sawed this playbackspeed in half!
* run checks if timer's running * Improve vwoosh timer behaviour (no freezing the whole game this time) * Prevent vwoosh timer from running outside PlayState --------- Co-authored-by: Kolo <[email protected]>
Co-authored-by: Kolo <[email protected]>
Co-authored-by: Kolo <[email protected]>
* change -> chance * Remove extra "lose" * Fix two more misspellings in PlayState Co-Authored-By: VioletSnowLeopard <[email protected]> * Finish Eric's sentences in PlayState.hx --------- Co-authored-by: VioletSnowLeopard <[email protected]> Co-authored-by: Abnormal <[email protected]>
Co-authored-by: Kolo <[email protected]>
* Open chart editor in freeplay * idk * Load a random song when opened on random
…rew#3732) * Fix audio offset interactions with song start Don't use combined offset here-- using it will cause the instrumental to skip forwards due to your offset. Just use instrumental offset, and don't play it when the song starts-- let resyncVocals do that * Alter countdown + conductor behavior Conductor's minimum songPosition when music is playing is now combinedOffset. resyncVocals is also no longer used when the song starts, as it complicates matters and causes weird double-upping whatever due to the song being played, paused, and then played again * Update source/funkin/Conductor.hx thank you https://github.com/cyn0x8 for reminding me FlxMath.bound exists Co-Authored-By: cyn <[email protected]> * Oops, don't need this here Thank you @NotHyper-474! * Fixed instrumentalOffset goofiness :D --------- Co-authored-by: cyn <[email protected]> Co-authored-by: Abnormal <[email protected]>
This is already done by OpenFL
…#5065) * fix: Fix the game crashing when hot reloading with F5 * NOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO Co-authored-by: Hundrec <[email protected]> --------- Co-authored-by: Hundrec <[email protected]>
Also fixes the song text clipping the rank area when getting a new rank
…ew#5036) * fix song text remaining highlighted unintentionally fixes song text squishing * Fix squashed text for real this time
* aaaaAAAAAAAAAAAAAAAA Actually fix vocals (and other sounds) playing in the chart editor...... ...I think * forgot vocals aren't included
Also they now dance to Artistic Expression
* Close the toolboxes * Get deselected
Co-authored-by: Kolo <[email protected]>
Also windows target configuration preset for straight to stage editor (not to be confused with the stage builder)
TechnikTil
suggested changes
Jun 19, 2025
TechnikTil
approved these changes
Jun 20, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yup, that works
if commits will be resolved, it could be epic. |
8b38bcf
to
f47de1b
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
pr: haxe
PR modifies game code.
size: large
A large pull request with more than 100 changes.
status: pending triage
Awaiting review.
topic: freeplay
Related to the operation of the Freeplay menu.
topic: mods
Related to the creation or use of mods.
type: enhancement
Involves an enhancement or new feature.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Linked Issues
N/A
Description
Makes the little text on the Freeplay Song Capsule for the Song's Week softcodable, considering modded weeks aren't currently able to add them. The way this works is, if the folder
assets/images/freeplay/freeplayCapsule
contains an image with the name of a week's id (likeweek4.png
), any capsule that has a song from that week will have the label use that image.Screenshots/Videos
this.hardcode.pisses.me.off.mp4