-
Notifications
You must be signed in to change notification settings - Fork 2.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into note-effects
- Loading branch information
Showing
31 changed files
with
582 additions
and
148 deletions.
There are no files selected for viewing
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
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,244 @@ | ||
| # Contributing | ||
| Welcome to the Contributing Guide! | ||
| You can contribute to the Funkin' repository by opening issues or pull requests. This guide will cover best practices for each type of contribution. | ||
|
|
||
| # Part 1: Etiquette | ||
| - Be respectful to one another. We're here to help each other out! | ||
| - Keep your titles clear and concise. Do not type the whole description into the title. | ||
| - Do not spam by creating unnecessary issues and pull requests. | ||
| - Use common sense! | ||
|
|
||
| # Part 2: Issues | ||
| Issues serve many purposes, from reporting bugs to suggesting new features. | ||
| This section provides guidelines to follow when [opening an issue](https://github.com/FunkinCrew/Funkin/issues). | ||
|
|
||
| ## Requirements | ||
| Make sure you're playing: | ||
| - the latest version of the game (currently v0.5.3) | ||
| - without any mods | ||
| - on [Newgrounds](https://www.newgrounds.com/portal/view/770371) or downloaded from [itch.io](https://ninja-muffin24.itch.io/funkin) | ||
|
|
||
| ## Rejected Features | ||
| If you want to **suggest a feature**, make sure it hasn't already been rejected. | ||
| Here's a list of commonly suggested features and the reasons why they won't be added: | ||
|
|
||
| | Feature | Reason | | ||
| | ------- | ------- | | ||
| | Combo Break + Accuracy Displays | https://github.com/FunkinCrew/Funkin/pull/2681#issuecomment-2156308982 | | ||
| | Toggleable Ghost Tapping | https://github.com/FunkinCrew/Funkin/pull/2564#issuecomment-2119701802 | | ||
| | Perfectly Centered Strumlines | _same as above^_ | | ||
| | Losing Icons for DD and Parents | https://github.com/FunkinCrew/Funkin/issues/3048#issuecomment-2243491536 | | ||
| | Playable GF / Speaker BF / Speaker Pico | https://github.com/FunkinCrew/Funkin/issues/2953#issuecomment-2216985230 | | ||
| | Adjusted Difficulty Ratings | https://github.com/FunkinCrew/Funkin/issues/2781#issuecomment-2172053144 | | ||
| | Countdown after Unpausing | https://github.com/FunkinCrew/Funkin/issues/2721#issuecomment-2159330106 | | ||
| | Importing Charts from Psych Engine (and other mod content) | https://github.com/FunkinCrew/Funkin/issues/2586#issuecomment-2125733327 | | ||
| | Backwards Compatibility for Modding | https://github.com/FunkinCrew/Funkin/issues/3949#issuecomment-2608391329 | | ||
| | Lua Support | https://github.com/FunkinCrew/Funkin/issues/2643#issuecomment-2143718093 | | ||
|
|
||
| ## Issue Types | ||
| Choose the issue template that best suits your needs! | ||
| Here's what each template is designed for: | ||
|
|
||
| ### Bug Report ([view list](https://github.com/FunkinCrew/Funkin/issues?q=is%3Aissue%20state%3Aopen%20label%3A%22type%3A%20minor%20bug%22)) | ||
| For minor bugs and general issues with the game. Choose this one if none of the others fit your needs. | ||
|
|
||
| ### Crash Report ([view list](https://github.com/FunkinCrew/Funkin/issues?q=is%3Aissue%20state%3Aopen%20label%3A%22type%3A%20major%20bug%22)) | ||
| For crashes and freezes like the [Null Object Reference](https://github.com/FunkinCrew/Funkin/issues/2209) problem from v0.3.0. | ||
|
|
||
| ### Charting Issue ([view list](https://github.com/FunkinCrew/Funkin/issues?q=is%3Aissue%20state%3Aopen%20label%3A%22type%3A%20charting%20issue%22)) | ||
| For misplaced notes, wonky camera movements, broken song events, and everything related to the game's charts. | ||
|
|
||
| ### Enhancement ([view list](https://github.com/FunkinCrew/Funkin/issues?q=is%3Aissue%20state%3Aopen%20label%3A%22type%3A%20enhancement%22)) | ||
| For suggestions to add new features or improve existing ones. We'd love to hear your ideas! | ||
|
|
||
| ### Compiling Help (only after reading the [Troubleshooting Guide](https://github.com/FunkinCrew/Funkin/blob/main/docs/TROUBLESHOOTING.md)) | ||
| For issues with compiling the game. Legacy versions (before v0.3.0) are not supported. | ||
|
|
||
| > [!TIP] | ||
| > If none of the above Issue templates suit your inquiry (e.g. Questions or Coding Help), please [open a discussion](https://github.com/FunkinCrew/Funkin/discussions). | ||
| ## Before You Submit... | ||
| Complete the Issue Checklist at the top of your template! | ||
|
|
||
| > [!IMPORTANT] | ||
| > If you do not complete each step of the Issue Checklist, **your issue may be closed.** | ||
| Be sure to use the search bar on the Issues page to check that your issue hasn't already been reported by someone else. | ||
| Duplicate issues make it harder to keep track of important issues with the game. | ||
|
|
||
| Also only report one issue or enhancement at a time! If you have multiple bug reports or suggestions, split them up into separate submissions so they can be checked off one by one. | ||
|
|
||
| Once you're sure your issue is unique and specific, feel free to submit it. | ||
|
|
||
| **Thank you for opening issues!** | ||
|
|
||
| # Part 3: Pull Requests | ||
| Community members are welcome to contribute their changes by [opening pull requests](https://github.com/FunkinCrew/Funkin/pulls). | ||
| This section covers guidelines for opening and managing pull requests (PRs). | ||
|
|
||
| ## Choosing a base branch | ||
| When creating a branch in your fork, base your branch on either the `main` or `develop` branch depending on the types of changes you want to make. | ||
|
|
||
| > [!CAUTION] | ||
| > Avoid using your fork's default branch (`main` in this case) for your PR. This is considered an [anti-pattern](https://jmeridth.com/posts/do-not-issue-pull-requests-from-your-master-branch/) by GitHub themselves! | ||
| Choose the `main` branch if you modify: | ||
| - Documentation (`.md` files) | ||
| - GitHub files (`.yml` files or anything in the `.github` folder) | ||
|
|
||
| Choose the `develop` branch if you modify: | ||
| - Game code (`.hx` files) | ||
| - Any other type of file | ||
|
|
||
| > [!TIP] | ||
| > When in doubt, base your branch on the `develop` branch. | ||
| Choosing the right base branch helps keep your commit history clean and avoid merge conflicts. | ||
| Once you’re satisfied with the changes you’ve made, open a PR and base it on the same branch you previously chose. | ||
|
|
||
| ## Merge conflicts and rebasing | ||
| Some game updates introduce significant breaking changes that may create merge conflicts in your PR. To resolve them, you will need to update or rebase your PR. | ||
|
|
||
| Most merge conflicts are small and will only require you to modify a few files to resolve them. | ||
| However, some changes are so big that your commit history will look like a mess! | ||
| In this case, you will have to perform a [**rebase**](https://docs.github.com/en/get-started/using-git/about-git-rebase). | ||
| This process reapplies your changes on top of the updated branch and cleanly resolves the merge conflicts. | ||
|
|
||
| > [!TIP] | ||
| > If your commit history becomes too long, you can use rebase to `squash` your PR's commits into a single commit. | ||
| ## Code PRs | ||
|
|
||
| > [!IMPORTANT] | ||
| > This guide does not cover compiling. If you have trouble compiling the game, refer to the [Compilation Guide](https://github.com/FunkinCrew/Funkin/blob/main/docs/COMPILING.md). | ||
| Code-based PRs make changes such as **fixing bugs** or **implementing new features** in the game. | ||
| This involves modifying one or several of the repository’s `.hx` files, found within the `source/` folder. | ||
|
|
||
| ### Codestyle | ||
| Before submitting your PR, check that your code follows the [Style Guide](https://github.com/FunkinCrew/Funkin/blob/main/docs/style-guide.md). | ||
|
|
||
| Here are some guidelines for writing comments in your code: | ||
| - Leave comments only when you believe a piece of code warrants explanation. | ||
| - Ensure that your comments provide meaningful insight into the function or purpose of the code. | ||
| - Write your comments in a clear and concise manner. | ||
| - Only sign your comments with your name when your changes are complex and may require further explanation. | ||
|
|
||
| ### Example Comments | ||
| #### DO NOT: | ||
| ```haxe | ||
| /** | ||
| * jumps around the song | ||
| * works with bpm changes but skipped notes still hurt | ||
| * @param sections how many sections to jump, negative = backwards | ||
| */ | ||
| function changeSection(sections:Int):Void | ||
| { | ||
| // Pause the music, as you probably guessed | ||
| // FlxG.sound.music.pause(); | ||
| // Set the target time in steps, I don’t really get how this works though lol - [GitHub username] | ||
| var targetTimeSteps:Float = Conductor.instance.currentStepTime + (Conductor.instance.stepsPerMeasure * sections); | ||
| var targetTimeMs:Float = Conductor.instance.getStepTimeInMs(targetTimeSteps); | ||
| // Don't go back in time to before the song started, that would probably break a lot of things and cause a whole bunch of problems! | ||
| targetTimeMs = Math.max(0, targetTimeMs); | ||
| if (FlxG.sound.music != null) // If the music is not null, set the time to the target time | ||
| { | ||
| FlxG.sound.music.time = targetTimeMs; | ||
| } | ||
| // Handle skipped notes and events and all that jazz | ||
| handleSkippedNotes(); | ||
| SongEventRegistry.handleSkippedEvents(songEvents, Conductor.instance.songPosition); | ||
| // regenNoteData(FlxG.sound.music.time); | ||
| Conductor.instance.update(FlxG.sound?.music?.time ?? 0.0); | ||
| // I hate this function - [GitHub username] | ||
| resyncVocals(); | ||
| } | ||
| ``` | ||
|
|
||
| #### DO: | ||
| ```haxe | ||
| /** | ||
| * Jumps forward or backward a number of sections in the song. | ||
| * Accounts for BPM changes, does not prevent death from skipped notes. | ||
| * @param sections The number of sections to jump, negative to go backwards. | ||
| */ | ||
| function changeSection(sections:Int):Void | ||
| { | ||
| var targetTimeSteps:Float = Conductor.instance.currentStepTime + (Conductor.instance.stepsPerMeasure * sections); | ||
| var targetTimeMs:Float = Conductor.instance.getStepTimeInMs(targetTimeSteps); | ||
| // Don't go back in time to before the song started. | ||
| targetTimeMs = Math.max(0, targetTimeMs); | ||
| if (FlxG.sound.music != null) | ||
| { | ||
| FlxG.sound.music.time = targetTimeMs; | ||
| } | ||
| handleSkippedNotes(); | ||
| SongEventRegistry.handleSkippedEvents(songEvents, Conductor.instance.songPosition); | ||
| Conductor.instance.update(FlxG.sound?.music?.time ?? 0.0); | ||
| resyncVocals(); | ||
| } | ||
| ``` | ||
|
|
||
| ## Documentation PRs | ||
| Documentation-based PRs make changes such as **fixing typos** or **adding new information** in documentation files. | ||
| This involves modifying one or several of the repository’s `.md` files, found throughout the repository. | ||
| Make sure your changes are easy to understand and formatted consistently to maximize clarity and readability. | ||
|
|
||
| > [!CAUTION] | ||
| > DO NOT TOUCH THE `LICENSE.md` FILE, EVEN TO MAKE SMALL CHANGES! | ||
| ### Example Documentation PR | ||
| #### DO NOT: | ||
| ``` | ||
| // The original documentation | ||
| - `F2`: ***OVERLAY***: Enables the Flixel debug overlay, which has partial support for scripting. | ||
| - `F3`: ***SCREENSHOT***: Takes a screenshot of the game and saves it to the local `screenshots` directory. Works outside of debug builds too! | ||
| - `F4`: ***EJECT***: Forcibly switch state to the Main Menu (with no extra transition). Useful if you're stuck in a level and you need to get out! | ||
| - `F5`: ***HOT RELOAD***: Forcibly reload the game's scripts and data files, then restart the current state. If any files in the `assets` folder have been modified, the game should process the changes for you! NOTE: Known bug, this does not reset song charts or song scripts, but it should reset everything else (such as stage layout data and character animation data). | ||
| - `CTRL-SHIFT-L`: ***FORCE CRASH***: Immediately crash the game with a detailed crash log and a stack trace. | ||
| // The new PR additions | ||
| - `ctrl alt shift e`: No idea what this does | ||
| - `alt-f4`: closes the game | ||
| ``` | ||
|
|
||
| #### DO: | ||
| ``` | ||
| // The original documentation | ||
| - `F2`: ***OVERLAY***: Enables the Flixel debug overlay, which has partial support for scripting. | ||
| - `F3`: ***SCREENSHOT***: Takes a screenshot of the game and saves it to the local `screenshots` directory. Works outside of debug builds too! | ||
| - `F4`: ***EJECT***: Forcibly switch state to the Main Menu (with no extra transition). Useful if you're stuck in a level and you need to get out! | ||
| - `F5`: ***HOT RELOAD***: Forcibly reload the game's scripts and data files, then restart the current state. If any files in the `assets` folder have been modified, the game should process the changes for you! NOTE: Known bug, this does not reset song charts or song scripts, but it should reset everything else (such as stage layout data and character animation data). | ||
| - `CTRL-SHIFT-L`: ***FORCE CRASH***: Immediately crash the game with a detailed crash log and a stack trace. | ||
| // The new PR additions | ||
| - `CTRL-ALT-SHIFT-E`: ***DUMP SAVE DATA***: Prompts the user to save their save data as a JSON file, so its contents can be viewed. Only available on debug builds. | ||
| - `ALT-F4`: ***CLOSE GAME***: Closes the game forcibly on Windows. | ||
| ``` | ||
|
|
||
| ## GitHub PRs | ||
| GitHub-related PRs make changes such as **tweaking Issue Templates** or **updating the repository’s workflows**. | ||
| This involves modifying one or several of the repository’s `.yml` files, or any other file in the `.github` folder. | ||
| Please test these changes on your fork’s main branch to avoid breaking anything in this repository (e.g. GitHub Actions, issue templates, etc.)! | ||
|
|
||
| ## funkin.assets PRs | ||
| The `assets` submodule has its own repository called [funkin.assets](https://github.com/FunkinCrew/funkin.assets). | ||
| If you only modify files in the `assets` folder, open a PR in the `funkin.assets` repository instead of the main repository. | ||
| If you simultaneously modify files from both repositories, then open two separate PRs and explain the connection in your PR descriptions. | ||
|
|
||
| Be sure to choose `main` as the base branch for `funkin.assets` PRs, as no `develop` branch exists for that repository. | ||
|
|
||
| # Closing | ||
| Thank you for reading the Contributing Guide. | ||
| We look forward to seeing your contributions to the game! |
Oops, something went wrong.