From 27a072f4e17f343396bbb14ada4c4b1c10d5cc7c Mon Sep 17 00:00:00 2001 From: Abnormal <86753001+AbnormalPoof@users.noreply.github.com> Date: Tue, 5 Aug 2025 15:11:35 +0000 Subject: [PATCH 1/3] add *the* checkbox (thunder and lightning noises) --- .github/ISSUE_TEMPLATE/bug.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml index aedba571b..7ccfa0dca 100644 --- a/.github/ISSUE_TEMPLATE/bug.yml +++ b/.github/ISSUE_TEMPLATE/bug.yml @@ -14,6 +14,7 @@ body: - label: I have read the [Contributing Guide](https://github.com/FunkinCrew/Funkin/blob/main/docs/CONTRIBUTING.md) - label: I have checked the Issues/Discussions pages to see if my issue has already been reported - label: I have properly titled my issue + - label: This is a genuine issue with Friday Night Funkin' and not a side effect from a mod I have installed. - type: dropdown attributes: From 059b412e85c2f9ae528af57d638c79734886667f Mon Sep 17 00:00:00 2001 From: Hundrec Date: Tue, 5 Aug 2025 23:15:21 +0800 Subject: [PATCH 2/3] Reword the checkbox --- .github/ISSUE_TEMPLATE/bug.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml index 7ccfa0dca..74b4afc46 100644 --- a/.github/ISSUE_TEMPLATE/bug.yml +++ b/.github/ISSUE_TEMPLATE/bug.yml @@ -14,7 +14,7 @@ body: - label: I have read the [Contributing Guide](https://github.com/FunkinCrew/Funkin/blob/main/docs/CONTRIBUTING.md) - label: I have checked the Issues/Discussions pages to see if my issue has already been reported - label: I have properly titled my issue - - label: This is a genuine issue with Friday Night Funkin' and not a side effect from a mod I have installed. + - label: I did not have any mods installed when I encountered this issue - type: dropdown attributes: From 0ac4bb1ba376a79994149d792324b2b3a82bff30 Mon Sep 17 00:00:00 2001 From: Hundrec Date: Sat, 30 Aug 2025 21:27:13 +0800 Subject: [PATCH 3/3] A few tweaks to the Contributing Guide --- docs/CONTRIBUTING.md | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index 5e537dbb8..254842ca4 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -122,9 +122,6 @@ Also only report one issue or enhancement at a time! If you have multiple bug re Once you're sure your issue is unique and specific, feel free to submit it. -> [!IMPORTANT] -> **DO NOT CLOSE YOUR ISSUE FOR ANY REASON!** Your issue will be taken care of by a moderator! - **Thank you for opening issues!** # Part 3: Pull Requests @@ -132,20 +129,20 @@ Community members are welcome to contribute their changes by [opening pull reque 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. +When creating a branch in your fork, base your branch on either the `develop` or `main` 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! > Instead, make a separate branch for your additions (ex. `docs/fix-typo` or `minor-bugfix`). -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 +Choose the `main` branch if you modify: +- Documentation (`.md` files) +- GitHub files (`.yml` files or anything in the `.github` folder) + > [!TIP] > When in doubt, base your branch on the `develop` branch. @@ -399,7 +396,7 @@ If you only modify files in the `assets` folder, open a PR in the `funkin.assets 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. +Be sure to choose `develop` as the base branch for `funkin.assets` PRs, just as you would in the `Funkin` repository. ### Charting PRs Charting PRs make changes such as **adjusting chart metadata**.