Skip to content
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 16 commits into from
Jan 17, 2025
Merged

Move changes made in main to develop #4006

merged 16 commits into from
Jan 17, 2025

Conversation

EliteMasterEric
Copy link
Member

Mainly changelog tweaks etc

@github-actions github-actions bot added pr: haxe PR modifies game code. pr: documentation PR modifies documentation or README files. size: large A large pull request with more than 100 changes. labels Jan 17, 2025
@EliteMasterEric EliteMasterEric merged commit a08da87 into develop Jan 17, 2025
2 of 6 checks passed
@EliteMasterEric EliteMasterEric added this to the 0.6.0 milestone Jan 17, 2025
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]>
@Hundrec Hundrec added the status: accepted PR was approved for contribution. If it's not already merged, it may be merged on a private branch. label Jan 22, 2025
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]>
@Hundrec Hundrec added the type: github Relates to the management of issues and pull requests on GitHub. label Feb 3, 2025
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants