[ENHANCEMENT] Stage Editor - Selection improvements (Select None button)

.github/changed-lines-count-labeler.yml

@@ -0,0 +1,22 @@
+# Add 'size: tiny' to any changes of at most 4 lines
+'size: tiny':
+  max: 4
+
+# Add 'size: small' to any changes between 5 and 10 lines
+'size: small':
+  min: 5
+  max: 10
+
+# Add 'size: medium' to any changes between 11 and 100 lines
+'size: medium':
+  min: 11
+  max: 100
+
+# Add 'size: large' to any changes between 101 and 500 lines
+'size: large':
+  min: 101
+  max: 500
+
+# Add 'size: huge' to any changes of more than 500 lines
+'size: huge':
+  min: 501

.github/label-actions.yml

@@ -0,0 +1,56 @@
+# Configuration for Label Actions - https://github.com/dessant/label-actions
+
+# Automatically close pull requests when the `status: duplicate` label is applied
+'status: duplicate':
+  prs:
+    # Post a comment
+    comment: >
+      This pull request is a duplicate. Please direct all discussion to the original pull request.
+    # Close the pull request
+    close: true
+    # Remove other status labels
+    unlabel:
+      - 'status: accepted'
+      - 'status: needs clarification'
+      - 'status: needs r&d'
+      - 'status: needs revision'
+      - 'status: pending triage'
+      - 'status: rejected'
+      - 'status: resolved'
+      - 'status: resolved internally'
+      - 'status: reviewing internally'
+      - 'status: stale'
+
+'status: stale':
+  prs:
+    # Close the pull request
+    close: true
+    # Remove other status labels
+    unlabel:
+      - 'status: accepted'
+      - 'status: duplicate'
+      - 'status: needs clarification'
+      - 'status: needs r&d'
+      - 'status: needs revision'
+      - 'status: pending triage'
+      - 'status: rejected'
+      - 'status: resolved'
+      - 'status: resolved internally'
+      - 'status: reviewing internally'
+
+'status: rejected':
+  prs:
+    # Close the pull request
+    close: true
+    # Remove other status labels
+    unlabel:
+      - 'status: accepted'
+      - 'status: duplicate'
+      - 'status: needs clarification'
+      - 'status: needs r&d'
+      - 'status: needs revision'
+      - 'status: pending triage'
+      - 'status: resolved'
+      - 'status: resolved internally'
+      - 'status: reviewing internally'
+      - 'status: stale'

.github/labeler.yml

@@ -0,0 +1,36 @@
+# Add Documentation tag to PR's changing markdown files, or anything in the docs folder
+'pr: documentation':
+- changed-files:
+  - any-glob-to-any-file: '**/*.md'
+
+# Add HScript tag to PR's changing hscript files
+'pr: hscript':
+- changed-files:
+  - any-glob-to-any-file: '**/*.hxc'
+
+# Add Chart tag to PR's changing chart files
+'pr: chart':
+- changed-files:
+  - any-glob-to-any-file: 'preload/data/songs/**'
+
+# Add Audio tag to PR's changing audio files
+'pr: audio':
+- changed-files:
+  - any-glob-to-any-file:
+    - '**/*.mp3'
+    - '**/*.ogg'
+
+# Add Art tag to PR's changing image or animation files
+'pr: art':
+- changed-files:
+  - any-glob-to-any-file:
+    - 'preload/images/**'
+    - 'shared/images/**'
+    - '**/*.png'
+
+# Add GitHub tag to PR's changing yml files, or anything in the .github folder 
+'pr: github':
+- changed-files:
+  - any-glob-to-any-file:
+    - '.github/**'
+    - '**/*.yml'

.github/pull_request_template.md

@@ -0,0 +1,13 @@
+<!-- Please read the Contributing Guide (https://github.com/FunkinCrew/Funkin/blob/main/docs/CONTRIBUTING.md) before submitting this PR. -->
+
+<!-- Is this PR associated with a PR from the main repo? If so, link it below. -->
+## Associated Funkin PR
+
+<!-- Does this PR close any issues? If so, link them below. -->
+## Linked Issues
+
+<!-- Briefly describe the issue(s) fixed. -->
+## Description
+
+<!-- Include any relevant screenshots or videos. -->
+## Screenshots/Videos

.github/workflows/cancel-merged-branches.yml

@@ -0,0 +1,38 @@
+name: Cancel queued workflows on PR merge
+
+on:
+  pull_request:
+    types:
+    - closed
+
+jobs:
+
+  cancel_stuff:
+    if: github.event.pull_request.merged == true
+    runs-on: build-set
+    permissions:
+      actions: write
+
+    steps:
+    - name: Cancel queued workflows for ${{ github.event.pull_request.head.ref }}
+      uses: actions/github-script@v7
+      with:
+        result-encoding: string
+        retries: 3
+        script: |
+          let branch_workflows = await github.rest.actions.listWorkflowRuns({
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            workflow_id: "build-shit.yml",
+            status: "queued",
+            branch: "${{ github.event.pull_request.head.ref }}"
+          });
+          let runs = branch_workflows.data.workflow_runs;
+          runs.forEach((run) => {
+            github.rest.actions.cancelWorkflowRun({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              run_id: run.id
+            });
+          });
+          console.log(runs);

.github/workflows/label-actions.yml

@@ -0,0 +1,29 @@
+# Perform actions when labels are applied to issues, discussions, or pull requests
+# See .github/label-actions.yml
+name: 'Label Actions'
+
+on:
+  issues:
+    types:
+      - labeled
+      - unlabeled
+  pull_request_target:
+    types:
+      - labeled
+      - unlabeled
+  discussion:
+    types:
+      - labeled
+      - unlabeled
+
+permissions:
+  contents: read
+  issues: write
+  pull-requests: write
+  discussions: write
+
+jobs:
+  action:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dessant/label-actions@v4

.github/workflows/label-pull-request-on-create.yml

@@ -0,0 +1,19 @@
+name: "Pull Request Labeler 2 (Runs on PR creation)"
+on:
+  pull_request_target:
+    types:
+      - opened
+
+jobs:
+  # Apply `status: pending triage` to newly created pull requests
+  apply-pending-triage:
+    permissions:
+      contents: read
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+      - name: Apply "status pending triage" to new pull requests
+        uses: actions-ecosystem/action-add-labels@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          labels: "status: pending triage"

.github/workflows/label-pull-request.yml

@@ -0,0 +1,29 @@
+name: "Pull Request Labeler"
+on:
+- pull_request_target
+
+jobs:
+  # Apply labels to pull requests based on which files were edited
+  labeler:
+    permissions:
+      contents: read
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+    - name: Set basic labels
+      uses: actions/labeler@v5
+      with:
+        sync-labels: true
+  # Apply labels to pull requests based on how many lines were edited
+  changed-lines-count-labeler:
+    permissions:
+      contents: read
+      pull-requests: write
+    runs-on: ubuntu-latest
+    name: An action for automatically labelling pull requests based on the changed lines count
+    steps:
+    - name: Set change count labels
+      uses: vkirilichev/[email protected]
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        configuration-path: .github/changed-lines-count-labeler.yml

exclude/data/ui/chart-editor/components/menubar.xml

@@ -19,7 +19,7 @@
     <menu-separator />
     <menu-item id="menubarItemExit" text="Exit" shortcutText="Ctrl+Q" />
   </menu>
-  <menu text="Edit">
+  <menu text="Edit" width="208px;">
     <menu-item id="menubarItemUndo" text="Undo" shortcutText="Ctrl+Z" />
     <menu-item id="menubarItemRedo" text="Redo" shortcutText="Ctrl+Y" />
     <menu-separator />
@@ -28,6 +28,7 @@
     <menu-item id="menubarItemPaste" text="Paste" shortcutText="Ctrl+V" />
     <menu-item id="menubarItemPasteUnsnapped" text="Paste (Unsnapped)" shortcutText="Ctrl+Shift+V" />
     <menu-item id="menubarItemDelete" text="Delete" shortcutText="Delete" />
+    <menu-item id="menubarItemDeleteStacked" text="Delete Stacked Notes" shortcutText="Shift + Delete" />
     <menu-separator />
     <menu-item id="menubarItemFlipNotes" text="Flip Selected Notes" shortcutText="Ctrl+F" />
     <menu-separator />
@@ -39,6 +40,15 @@
     <menu-item id="menubarItemSelectBeforeCursor" text="Select Before Cursor" shortcutText="Shift+Home" disabled="true" />
     <menu-item id="menubarItemSelectAfterCursor" text="Select After Cursor" shortcutText="Shift+End" disabled="true" />
     <menu-separator />
+    <hbox>
+      <label text="Note Stack Threshold" styleName="menuLabel" paddingLeft="12px;" horizontalAlign="left" verticalAlign="center"/>
+      <dropdown id="menuBarStackedNoteThreshold" width="100%">
+          <data>
+              <item text="Exact"/>
+          </data>
+      </dropdown>
+    </hbox>
+    <menu-separator />
     <menu text="Note Snapping">
       <menu-item id="menuBarItemNoteSnapDecrease" text="Decrease Note Snap Precision" shortcutText="Left Arrow" />
       <menu-item id="menuBarItemNoteSnapIncrease" text="Increase Note Snap Precision" shortcutText="Right Arrow" />

exclude/data/ui/chart-editor/components/playbar.xml

@@ -5,6 +5,10 @@
 <box id="playbar" width="100%" height="48" styleName="playbar">
 	<hbox>
 		<label horizontalAlign="left" id="playbarSongPos" text="0:32" styleName="playbarDuration" />
+		<rule direction="vertical" height="80%" />
+		<label horizontalAlign="left" verticalAlign="center" id="playbarBeatNum" text="Beat: 0" styleName="playbarStatus" tooltip="The current position in the song in beats and fractions of a measure." />
+		<rule direction="vertical" height="80%" />
+		<label horizontalAlign="left" verticalAlign="center" id="playbarStepNum" text="Step: 0" styleName="playbarStatus" tooltip="The current position in the song in steps." />
 	</hbox>
 	<hbox horizontalAlign="center">
 		<button allowFocus="false" styleName="playbarButton" tooltip="Skip to Start" id="playbarStart" text="|<" />

exclude/data/ui/chart-editor/components/style.xml

@@ -74,15 +74,15 @@
 		padding-left: 0px;
 		}
 		.dialog-close-button {
-		resource: "haxeui-flixel/styles/flixel-ui/images/close.png";
+		resource: "shared:assets/shared/images/ui/chart-editor/close.png";
 		vertical-align: "center";
 		cursor: "pointer";
 		pointer-events: true;
 		padding: 3px;
 		border-radius: 2px;
 		}
 		.dialog-close-button:hover {
-		resource: $close-hover;
+		resource: "shared:assets/shared/images/ui/chart-editor/close.png";
 		background-color: $selection-background-color;
 		}
 		.dialog-minimize-button {

exclude/data/ui/stage-editor/components/bottom-bar.xml

@@ -1,8 +1,8 @@
 <box id="bottomBar" width="100%" height="48" styleName="bottomBar" verticalAlign="bottom">
   <hbox horizontalAlign="left" verticalAlign="center">
-    <label id="bottomBarModeText" text="Assets" styleName="infoText" verticalAlign="center" tooltip="Left Click/TAB to swap between Character and Object modes."/>
+    <label id="bottomBarModeText" text="Assets" styleName="infoText" verticalAlign="center" tooltip="Click/TAB to swap between Character and Object modes."/>
     <rule direction="vertical" height="80%" />
-    <label id="bottomBarSelectText" text="None" styleName="infoText" verticalAlign="center" tooltip="Left Click to change Focus on the Next Object/Character."/>
+    <label id="bottomBarSelectText" text="None" styleName="infoText" verticalAlign="center" tooltip="Click to change Focus on the Next or Previous Object/Character."/>
     <rule direction="vertical" height="80%" />
     <label id="bottomBarMoveStepText" text="1px" styleName="infoText" verticalAlign="center" tooltip="Move Step Level\nLeft Click to Increase\nRight Click to Decrease"/>
     <rule direction="vertical" height="80%" />