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.

Sign up for GitHub

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

Jump to bottom

[ENHANCEMENT]: Miss Sound Preference #3869

Closed
wants to merge 33 commits into from
Closed

[ENHANCEMENT]: Miss Sound Preference #3869

wants to merge 33 commits into from

Conversation

JVNpixels
Copy link
Contributor

This adds a miss sound preference to the game as for some people it can get annoying, so you can either turn it on or off.
image
I don't have an ingame version right now because the game isn't compiling, but I do know how to make an option without needing the game to compile.

EliteMasterEric and others added 10 commits October 11, 2024 23:57
@github-actions github-actions bot added size: medium A medium pull request with 100 or fewer changes. pr: haxe PR modifies game code. labels Nov 16, 2024
Hundrec and others added 12 commits December 3, 2024 17:21
@Hundrec
Add status: planned label to label actions (FunkinCrew#3910)
be08bbe 
* Make label actions more convenient

* chore: Add status: planned to label actions
@JVNpixels
Update PreferencesMenu.hx
861e1e7 
silly me
@EliteMasterEric
Bump the Stage data version to indicate that new values were added.
5173599
@EliteMasterEric
Updated Save data version to indicate new values.
4ce83b2
@EliteMasterEric
Only display the Stage Editor in builds that enable it, and enable it…
7f8937d 
… by default (this re-enables the Stage Editor keybind).
@EliteMasterEric
Enable log messages on all builds by default after we got too many co…
36d7de5 
…mplaints.
@EliteMasterEric
Remove unused custom type resolver.
2383fdf
@EliteMasterEric
Update save data format and error handling.
ec9ec20
@EliteMasterEric
Fix a typo.
d6db842
@ninjamuffin99 @EliteMasterEric
proj hxp version bump
b5c5693
@ninjamuffin99 @EliteMasterEric
changelog yoink
61a7978
@EliteMasterEric
Remove duplicate issue detector. (FunkinCrew#3944)
bb24821
@EliteMasterEric EliteMasterEric added the status: pending triage Awaiting review. label Jan 17, 2025
@EliteMasterEric EliteMasterEric changed the base branch from main to develop January 17, 2025 01:00
@Hundrec
[GITHUB] Create a dedicated charting issue template (and bump version…
c3a188b 
… to 0.5.3) (FunkinCrew#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
@JVNpixels
Copy link
Contributor Author

Sorry, I am confused, where do I rebase this to?

@charlesisfeline
Copy link

Sorry, I am confused, where do I rebase this to?

develop

@JVNpixels JVNpixels changed the base branch from main to develop January 18, 2025 05:37
@JVNpixels
Copy link
Contributor Author

JVNpixels commented Jan 18, 2025 •
edited
Loading

Why do we need to rebase? Wasn’t it already at develop? I don’t know the exact reason for rebasing and don’t quite understand the whole idea.. 😅

@Hundrec Hundrec added the type: enhancement Involves an enhancement or new feature. label Jan 22, 2025
@AbnormalPoof
Copy link
Collaborator

This PR appears to have merge conflicts. Please fix them!

@JVNpixels JVNpixels changed the base branch from develop to main January 25, 2025 00:12
@Hundrec
Copy link
Collaborator

Hundrec commented Jan 25, 2025

This should be based on develop.

@JVNpixels JVNpixels changed the base branch from main to develop January 25, 2025 21:53
@JVNpixels
Copy link
Contributor Author

how do i get rid of these commits?

@NotHyper-474
Copy link
Contributor

You can do what's called a rebase, but it's not the same as the base changing you do through the website.

@JVNpixels
Copy link
Contributor Author

You can do what's called a rebase, but it's not the same as the base changing you do through the website.

i think i’ll just make a new P.R

@JVNpixels JVNpixels closed this Jan 26, 2025
@AbnormalPoof AbnormalPoof added status: rejected Issue did not pass review or PR cannot be approved. and removed type: enhancement Involves an enhancement or new feature. status: needs revision Cannot be approved because it is awaiting some work by the contributor. size: medium A medium pull request with 100 or fewer changes. pr: haxe PR modifies game code. labels Jan 26, 2025
@JVNpixels
Copy link
Contributor Author

Wait just a question, this never happened before when I originally made the story mode P.R, why is this happening now? For the new pull request, where should I fork it from?

@AbnormalPoof
Copy link
Collaborator

AbnormalPoof commented Jan 28, 2025 •
edited
Loading

You based this pull request on main. Eric changed the base branch to develop which caused the extra commits to appear.

Generally, code-related pull requests (enhancement, bug fixes, optimizations, etc.) need to be based on develop. Documentation-related things (changes to GitHub files or files in docs/) need to be based on main.

@EliteMasterEric
Copy link
Member

Really wish there was an option for a default PR branch to help avoid issues like this.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mcagabe19 mcagabe19 mcagabe19 approved these changes

@NotHyper-474 NotHyper-474 NotHyper-474 approved these changes

@EliteMasterEric EliteMasterEric Awaiting requested review from EliteMasterEric

Assignees
No one assigned
Labels
status: rejected Issue did not pass review or PR cannot be approved.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@JVNpixels @charlesisfeline @AbnormalPoof @Hundrec @NotHyper-474 @EliteMasterEric @mcagabe19 @ninjamuffin99 @PatoFlamejanteTV