Merge branch 'CodenameCrew:main' into main

DifficultBit2901 · web-flow · commit 06be243a83ad · 2025-08-13T15:18:39.000+02:00
diff --git a/api-generator/api/doc-filter.xml b/api-generator/api/doc-filter.xml
diff --git a/api-generator/theme/templates/abstract.mtt b/api-generator/theme/templates/abstract.mtt
@@ -3,7 +3,7 @@
 		<span ::cond api.hasSourceLink(type):: class="viewsource">
 			<a href="::api.getSourceLink(type)::" class="btn btn-medium default-button"><i class="fa fa-eye"></i> View source</a>
 		</span>
-		<h1><small>::if api.isEnumAbstract(type)::enum ::end::abstract</small> ::api.getPathName(type.path)::$$printTypeParams(::type.params::)::if !api.isCoreType(type)::($$printLinkedType(::type.athis::,::false::))::end::</h1>
+		<h1 style="width: fit-content"><small>::if api.isEnumAbstract(type)::enum ::end::abstract</small> ::api.getPathName(type.path)::$$printTypeParams(::type.params::)::if !api.isCoreType(type)::($$printLinkedType(::type.athis::,::false::))::end::</h1>
 		$$printPackage(::type::)
 		<h4 ::cond (type.from != null || type.to != null)::>
 			::foreach t type.from::
diff --git a/api-generator/theme/templates/class.mtt b/api-generator/theme/templates/class.mtt
@@ -3,7 +3,7 @@
 		<span ::cond api.hasSourceLink(type):: class="viewsource">
 			<a href="::api.getSourceLink(type)::" class="btn btn-medium default-button"><i class="fa fa-eye"></i> View source</a>
 		</span>
-		<h1>
+		<h1 style="width: fit-content">
 			<small>::if type.isFinal::final ::end::::if type.isInterface::interface::else::class::end::</small> ::api.getPathName(type.path)::$$printTypeParams(::type.params::)
 		</h1>
 		$$printPackage(::type::)
diff --git a/api-generator/theme/templates/class_field.mtt b/api-generator/theme/templates/class_field.mtt
@@ -3,7 +3,7 @@
 <div class="field::if (depth == 0 && api.isPlatform(name)) " platform platform-" + name else ""::">
 ::if field.line != null::
 	<a href="::api.getSourceLinkWithLine(type, field.line)::" class="field-source pull-right default-button" target="_blank">
-		<i class="fa fa-github"></i> View in GitHub
+		<i class="fa fa-github"></i> View on GitHub
 	</a>
 ::end::
 
diff --git a/api-generator/theme/templates/enum.mtt b/api-generator/theme/templates/enum.mtt
@@ -3,7 +3,7 @@
 		<span ::cond api.hasSourceLink(type):: class="viewsource">
 			<a href="::api.getSourceLink(type)::" class="btn btn-medium default-button"><i class="fa fa-eye"></i> View source</a>
 		</span>
-		<h1><small>enum</small> ::api.getPathName(type.path)::$$printTypeParams(::type.params::)</h1>
+		<h1 style="width: fit-content"><small>enum</small> ::api.getPathName(type.path)::$$printTypeParams(::type.params::)</h1>
 		$$printPackage(::type::)
 		$$printModule(::type.module::)
 		$$printMeta(::type::)
diff --git a/api-generator/theme/templates/typedef.mtt b/api-generator/theme/templates/typedef.mtt
@@ -3,7 +3,7 @@
 		<span ::cond api.hasSourceLink(type):: class="viewsource">
 			<a href="::api.getSourceLink(type)::" class="btn btn-medium default-button"><i class="fa fa-eye"></i> View source</a>
 		</span>
-		<h1><small>typedef</small> ::api.getPathName(type.path)::$$printTypeParams(::type.params::)</h1>
+		<h1 style="width: fit-content"><small>typedef</small> ::api.getPathName(type.path)::$$printTypeParams(::type.params::)</h1>
 		$$printPackage(::type::)
 		$$printModule(::type.module::)
 		$$printMeta(::type::)
diff --git a/featured-mods/psx-edition/cover.jpg b/featured-mods/psx-edition/cover.jpg
diff --git a/featured-mods/psx-edition/meta.json b/featured-mods/psx-edition/meta.json
@@ -0,0 +1,10 @@
+{
+    "name": "FNF: PSX Edition",
+    "description": "Welcome to the overworld!",
+    "author": "BatteryB",
+    "version": "demo",
+    "link":"https://gamebanana.com/mods/604214",
+    "source": "",
+    "lastUpdated": "2025-07-01T21:43:00Z",
+    "tags": ["softcoded"]
+}
diff --git a/src/pages/api-docs/resources/api-docs.scss b/src/pages/api-docs/resources/api-docs.scss
@@ -14,6 +14,7 @@
   float: right;
   padding: 0.2em 0.4em;
   pointer-events: auto;
+  z-index: 100;
 }
 
 li.expandable>ul {
@@ -86,6 +87,10 @@ code {
   color: white !important;
 }
 
+.anchor {
+  width: auto;
+}
+
 .anchor > code, .field > h3 > code {
   padding: 0.4em 0.6em;
   font-size: 13px;
diff --git a/src/pages/wiki.scss b/src/pages/wiki.scss
@@ -79,7 +79,7 @@ ul.pagination li {
       position: absolute;
       left: 0;
       display: inline-block;
-      content: "ff";
+      content: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" width="1" height="1">');
       color: transparent;
       width: calc(100% - 4px);
       border: unset;
diff --git a/src/style.scss b/src/style.scss
@@ -264,7 +264,7 @@ li {
       position: absolute;
       left: 0;
       display: inline-block;
-      content: "ff";
+      content: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" width="1" height="1">');
       color: transparent;
       width: calc(100% - 4px);
       border: solid rgba(0, 0, 0, 0.2) 2px;
diff --git a/tools/tools.build.js b/tools/tools.build.js
@@ -16,8 +16,8 @@ const tools = [
 		desc: "Tool to pack events for the engine"
 	},
 	{
-		link: "https://neeeoo.github.io/funkin-packer/",
-		title: "Funkin Packer",
+		link: "https://kitzsh.github.io/tex-packer-ex/",
+		title: "Texture Packer EX",
 		desc: "Tool to pack and repack spritesheets",
 		external: true,
 	},
@@ -92,4 +92,4 @@ function buildHtml(_pageDir, _exportPath) {
 
 module.exports = {
 	buildHtml: buildHtml
-}
+}
diff --git a/wiki/modding/scripting/Custom Controls.png b/wiki/modding/scripting/Custom Controls.png
diff --git a/wiki/modding/scripting/custom-controls.md b/wiki/modding/scripting/custom-controls.md
@@ -0,0 +1,95 @@
+---
+author: TheZoroForce240
+desc: This page explains how to create custom controls for your mod!
+lastUpdated: 2025-08-05T18:51:29.793Z
+title: Custom Controls
+---
+# Custom Controls
+Custom controls can be easily added to your own mod and automatically setup inside the controls menu! (so you don't have to code it yourself)
+
+To get started, put a file in `./data/config` called `controls.xml`.
+
+Here is an example xml that you can copy from:
+
+```xml
+<controls>
+	<category name="TEST CATEGORY">
+		<control name="dodge" saveName="dodge" menuName="DODGE" keyP1="SPACE" keyP2=""/>
+	</category>
+	<category name="SIX KEY">
+		<control name="6k0" saveName="control_6k0" menuName="LEFT" keyP1="S" keyP2="" menuIcon="game/notes/default" menuAnim="purple0"/>
+		<control name="6k1" saveName="control_6k1" menuName="UP" keyP1="D" keyP2="" menuIcon="game/notes/default" menuAnim="green0"/>
+		<control name="6k2" saveName="control_6k2" menuName="RIGHT" keyP1="F" keyP2="" menuIcon="game/notes/default" menuAnim="red0"/>
+		<control name="6k3" saveName="control_6k3" menuName="LEFT" keyP1="J" keyP2="LEFT" menuIcon="game/notes/default" menuAnim="purple0"/>
+		<control name="6k4" saveName="control_6k4" menuName="DOWN" keyP1="K" keyP2="DOWN" menuIcon="game/notes/default" menuAnim="blue0"/>
+		<control name="6k5" saveName="control_6k5" menuName="RIGHT" keyP1="L" keyP2="RIGHT" menuIcon="game/notes/default" menuAnim="red0"/>
+	</category>
+</controls>
+```
+
+<img src="./Custom Controls.png" alt="Image showing the custom controls based on the example above"/>
+
+You want to start by creating a <syntax lang="xml">&lt;category&gt;</syntax> node, which will include any options inside that section while in the menu (as shown in the screenshot)
+
+The <syntax lang="xml">&lt;category&gt;</syntax> only has one available property:
+- `name` - This is the name that will appear for the category in the controls menu
+
+Each <syntax lang="xml">&lt;control&gt;</syntax> node can then be added as a subnode of the category
+
+## <h2 id="properties" sidebar="Properties">Here's the list of properties for each control:</h2>
+
+- `name` - This name is what will be used to access the control later
+- `saveName` - This is the name used with `FlxG.save.data` for the control to be stored in, make sure to name this carefully and not break any other save data!
+- `menuName` - This is the name that will be displayed inside the menu
+- `keyP1`, `keyP2` - These are what the control key binding will default to, this name will need to be matching with a `FlxKey` name to correctly set, and can be set to `""` to default to none. The `P1` and `P2` determine which player uses the binding in co-op mode (when checking `.controls` on the `StrumLine`) or when checking directly through `controlsP1` or `controlsP2`, and will act as 2 bindings by default just like any other control.
+- `menuIcon` - This is an image path to a custom control icon that can be used in the menu, must be a sparrow xml spritesheet! (optional)
+- `menuAnim` - This is the animation prefix for the spritesheet set by `menuIcon` (optional, but required if using `menuIcon`)
+
+Accessing in scripts:
+
+The control state can be checked multiple ways, typically just by calling `controls` (assuming that you're in a `MusicBeatState`), and then calling the member functions `getJustPressed(name)`, `getJustReleased(name)`, or `getPressed(name)`.
+
+Per player controls can be accessed with `controlsP1` and `controlsP2`, and per strumline controls can be accessed with `.controls` on any `StrumLine` (example: `strumLines.members[0].controls`), which will change between `P1`/`P2` controls when using co-op mode (only while in `PlayState`).
+
+Example usage of accessing a control inside of a script:
+
+```haxe
+function update(elapsed) {
+    //global
+    if (controls.getJustPressed("dodge")) {
+        trace("dodge!");
+    }
+    if (controls.getJustReleased("dodge")) {
+        trace("released dodge!");
+    }
+    if (controls.getPressed("dodge")) {
+        trace("holding dodge!");
+    }
+
+    //per player
+    if (controlsP1.getJustPressed("dodge")) {
+        trace("p1 dodge!");
+    }
+    if (controlsP2.getJustPressed("dodge")) {
+        trace("p2 dodge!");
+    }
+
+    //per strumline (changes on co-op mode)
+    if (strumLines.members[0].controls.getJustPressed("dodge")) {
+        trace("strumline0 dodge!");
+    }
+    if (strumLines.members[1].controls.getJustPressed("dodge")) {
+        trace("strumline1 dodge!");
+    }
+}
+```
+
+## Multikey Control Bindings
+
+You may notice that if you change a strumline's key count the bindings will not work by default.
+
+This can be easily solved by setting up controls in a specific way inside the controls xml.
+
+All you need to do is have the `name` property of the controls to be set to `keyCount`k`strumID` for each one, for example `name="5k0"` will be for the first strum when the key count is 5.
+
+If you've named it correctly you should have the bindings automatically set for that key count!
diff --git a/wiki/modding/scripting/script-calls.md b/wiki/modding/scripting/script-calls.md
@@ -1,7 +1,7 @@
 ---
 author: Frakits & Nex_isDumb
 desc: This page contains a list of all script calls
-lastUpdated: 2024-10-14T16:54:14.259Z
+lastUpdated: 2025-07-15T00:00:52.664Z
 title: All script calls
 ---
 # List of all script calls
@@ -69,6 +69,21 @@ The ``event`` in question has the following parameters:
 
 ### <syntax lang="haxe">onVocalsResync()</syntax>
 
+## <h2 id="character-scripts">Character Scripts</h2>
+
+### <syntax lang="haxe">onCharacterXMLParsed(event:CharacterXMLEvent)</syntax>, <syntax lang="haxe">onCharacterNodeParsed(event:CharacterNodeEvent)</syntax>
+
+### <syntax lang="haxe">onDance(event:DanceEvent)</syntax>
+
+### <syntax lang="haxe">onPlaySingAnim(event:DirectionAnimEvent)</syntax>
+
+### <syntax lang="haxe">onPlayAnim(event:PlayAnimEvent)</syntax>
+
+### <syntax lang="haxe">onGetCamPos(event:PointEvent)</syntax>
+
+### <syntax lang="haxe">destroy()</syntax>
+
+
 ## <h2 id="dialogue-scripts" sidebar="Dialogue Scripts">Dialogue Scripts <small>(mostly substate like behavior)</small></h2>
 
 ### <syntax lang="haxe">structureLoaded(event:DialogueStructureEvent)</syntax>
diff --git a/wiki/wiki.json b/wiki/wiki.json
@@ -35,6 +35,7 @@
             ["shaders", "Shaders"],
             ["hxvlc", "Using hxvlc for videos"],
             ["custom-options", "Custom Options"],
+            ["custom-controls", "Custom Controls"],
             ["custom-classes", "Custom Classes"],
             ["3d-rendering", "3D rendering - UNFINISHED"],
             ["script-calls", "All of the script calls - UNFINISHED"],
