-
Notifications
You must be signed in to change notification settings - Fork 2.3k
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
Move changes made in main to develop #4006
Merged
Merged
Conversation
This file contains 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
* 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
* Make label actions more convenient * chore: Add status: planned to label actions
… by default (this re-enables the Stage Editor keybind).
Kade-github
pushed a commit
to Kade-github/Funkin
that referenced
this pull request
Jan 17, 2025
* Rewrite CHANGELOG.md for v0.5.2 * [docs] Add missing changes and links to Changelog (FunkinCrew#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 * Make label actions more convenient (FunkinCrew#3771) * fixed a plethora of dead links (FunkinCrew#3831) * Add `status: planned` label to label actions (FunkinCrew#3910) * Make label actions more convenient * chore: Add status: planned to label actions * Bump the Stage data version to indicate that new values were added. * Updated Save data version to indicate new values. * Only display the Stage Editor in builds that enable it, and enable it by default (this re-enables the Stage Editor keybind). * Enable log messages on all builds by default after we got too many complaints. * Remove unused custom type resolver. * Update save data format and error handling. * Fix a typo. * proj hxp version bump * changelog yoink * Remove duplicate issue detector. (FunkinCrew#3944) --------- Co-authored-by: Hundrec <[email protected]> Co-authored-by: Abnormal <[email protected]> Co-authored-by: Cameron Taylor <[email protected]>
MidyGamy
pushed a commit
to MidyGamy/Funkin
that referenced
this pull request
Jan 27, 2025
* Rewrite CHANGELOG.md for v0.5.2 * [docs] Add missing changes and links to Changelog (FunkinCrew#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 * Make label actions more convenient (FunkinCrew#3771) * fixed a plethora of dead links (FunkinCrew#3831) * Add `status: planned` label to label actions (FunkinCrew#3910) * Make label actions more convenient * chore: Add status: planned to label actions * Bump the Stage data version to indicate that new values were added. * Updated Save data version to indicate new values. * Only display the Stage Editor in builds that enable it, and enable it by default (this re-enables the Stage Editor keybind). * Enable log messages on all builds by default after we got too many complaints. * Remove unused custom type resolver. * Update save data format and error handling. * Fix a typo. * proj hxp version bump * changelog yoink * Remove duplicate issue detector. (FunkinCrew#3944) --------- Co-authored-by: Hundrec <[email protected]> Co-authored-by: Abnormal <[email protected]> Co-authored-by: Cameron Taylor <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
pr: documentation
PR modifies documentation or README files.
pr: haxe
PR modifies game code.
size: large
A large pull request with more than 100 changes.
status: accepted
PR was approved for contribution. If it's not already merged, it may be merged on a private branch.
type: github
Relates to the management of issues and pull requests on GitHub.
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.
Mainly changelog tweaks etc