Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
e6504e3
New Stage class WIP
Jamextreme140 Feb 19, 2026
0633500
Merge branch 'CodenameCrew:main' into stage-rewrite
Jamextreme140 Feb 20, 2026
2019443
Implementing new Stage class for Gameplay
Jamextreme140 Feb 20, 2026
279d6d6
Merge branch 'CodenameCrew:main' into stage-rewrite
Jamextreme140 Feb 21, 2026
b261875
`onAddSprite` & `onAddLayer` is now `FlxTypedSignal` instead of a `Nu…
ItsLJcool Feb 21, 2026
9bca1d3
stage load on setup for PlayState
Jamextreme140 Feb 23, 2026
7a2725c
StageLayer bounds
Jamextreme140 Feb 23, 2026
b310c5b
Some cleanup :3
Jamextreme140 Feb 26, 2026
b93c284
Useful attributes + organization
Jamextreme140 Feb 26, 2026
ce6f289
Merge branch 'CodenameCrew:main' into stage-rewrite
Jamextreme140 Mar 6, 2026
34e7ffe
handling stage switching (WIP)
Jamextreme140 Mar 9, 2026
0181255
Merge branch 'CodenameCrew:main' into stage-rewrite
Jamextreme140 Mar 16, 2026
577db10
Merge branch 'CodenameCrew:main' into stage-rewrite
Jamextreme140 Apr 2, 2026
7ec8531
Merge branch 'CodenameCrew:main' into stage-rewrite
Jamextreme140 Apr 15, 2026
0409164
ocd prevents me from not not pushing this
ItsLJcool May 10, 2026
be91047
Merge branch 'stage-rewrite' of https://github.com/Jamextreme140/Code…
ItsLJcool May 10, 2026
dbe8a9d
changes & fixes to backcompatability?
ItsLJcool May 10, 2026
9173078
Merge branch 'CodenameCrew:main' into stage-rewrite
Jamextreme140 May 10, 2026
17ff25a
Fixes and using References in the StageLayer instead of member index.
ItsLJcool May 11, 2026
9b3412e
quick fixes and now you can access PlayState values in Stage Scripts,…
ItsLJcool May 12, 2026
762677a
Merge branch 'CodenameCrew:main' into stage-rewrite
Jamextreme140 May 16, 2026
e2a60e0
Merge branch 'CodenameCrew:main' into stage-rewrite
Jamextreme140 Jun 21, 2026
4b98297
Simplified Signal dispatch and bounds update
Jamextreme140 Jun 22, 2026
c7bdb61
remove dumb code and re-ordered some code to ensure things exist in t…
ItsLJcool Jun 23, 2026
c896938
fixed updateBounds to no longer fail casting if any FlxBasic objects …
ItsLJcool Jun 24, 2026
402d283
ok re-fixed `updateBounds` to no longer die if encountering a non-`Fl…
ItsLJcool Jun 25, 2026
ebfed78
OK FOR REAL IVE FIXED `updateBounds` PLEASE
ItsLJcool Jun 25, 2026
1f387a6
adding `StageLayers` to a `StageLayer` with `add` / `insert` / `remov…
ItsLJcool Jun 25, 2026
01e5642
im just a fat idot
ItsLJcool Jun 26, 2026
5c98f56
better `toString` for debugging
ItsLJcool Jun 26, 2026
2e9c7c9
Merge branch 'CodenameCrew:main' into stage-rewrite
Jamextreme140 Jun 29, 2026
f85f4a1
Backwords compatability for now, can be removed later.
ItsLJcool Jul 2, 2026
c30f149
Merge branch 'stage-rewrite' of https://github.com/Jamextreme140/Code…
ItsLJcool Jul 2, 2026
1da336c
Stage Caching implemented, also FINALLY added Change Stage and Change…
ItsLJcool Jul 2, 2026
4097536
Merge branch 'CodenameCrew:main' into stage-rewrite
Jamextreme140 Jul 15, 2026
a29f1d9
Merge branch 'CodenameCrew:main' into stage-rewrite
Jamextreme140 Jul 26, 2026
468a539
more clever name :3
Jamextreme140 Jul 26, 2026
6711870
"flixel-animate" layer rendering method (WIP)
Jamextreme140 Aug 1, 2026
73b564a
Merge branch 'main' into stage-rewrite
Jamextreme140 Aug 1, 2026
fc1acd1
Merge branch 'CodenameCrew:main' into stage-rewrite
Jamextreme140 Aug 4, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion source/funkin/backend/chart/EventsData.hx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import openfl.Assets;
using StringTools;

class EventsData {
public static var defaultEventsList:Array<String> = ["HScript Call", "Camera Movement", "Camera Position", "Add Camera Zoom", "Camera Bop", "Camera Zoom", "Camera Modulo Change", "Camera Flash", "BPM Change", "Continuous BPM Change", "Time Signature Change", "Scroll Speed Change", "Alt Animation Toggle", "Play Animation"];
public static var defaultEventsList:Array<String> = ["HScript Call", "Camera Movement", "Camera Position", "Add Camera Zoom", "Camera Bop", "Camera Zoom", "Camera Modulo Change", "Camera Flash", "BPM Change", "Continuous BPM Change", "Time Signature Change", "Scroll Speed Change", "Alt Animation Toggle", "Play Animation", "Change Stage", "Change Character"];
public static var defaultEventsParams:Map<String, Array<EventParamInfo>> = [
"HScript Call" => [
{name: "Function Name", type: TString, defValue: "myFunc"},
Expand Down Expand Up @@ -121,6 +121,23 @@ class EventsData {
defValue: "NONE"
}
],
"Change Stage" => [
{name: "Stage Name", type: TString, defValue: ""},
{name: "Cached?", type: TBool, defValue: true},
{name: "Destroy Previous Stage", type: TBool, defValue: false},
{name: "Force Reload?", type: TBool, defValue: false}
],
"Change Character" => [
{name: "Character from StrumLine", type: TStrumLine, defValue: 0},
{name: "Character StrumLine Index", type: TInt(0, 9999999, 1), defValue: 0},
{name: "Character Name", type: TString, defValue: "bf"},
{name: "Override isPlayer?", type: TBool, defValue: false},
{name: "isPlayer?", type: TBool, defValue: false},

{name: "Cache?", type: TBool, defValue: true},
{name: "Destroy Previous Character", type: TBool, defValue: false},
{name: "Auto Stage Position", type: TBool, defValue: true},
]
];

public static var eventsList:Array<String> = defaultEventsList.copy();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ final class StageNodeEvent extends CancellableEvent {
/**
* The stage instance
*/
public var stage:Stage;
public var stage:Dynamic;

/**
* The node which is currently being parsed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ final class StageXMLEvent extends CancellableEvent {
/**
* The stage instance
*/
public var stage:Stage;
public var stage:Dynamic;

/**
* The xml
Expand Down
2 changes: 1 addition & 1 deletion source/funkin/backend/utils/CoolUtil.hx
Original file line number Diff line number Diff line change
Expand Up @@ -704,7 +704,7 @@ final class CoolUtil
* @param xml XML to get the attribute from
* @param name Name of the attribute
*/
public static inline function getAtt(xml:Access, name:String) {
public static inline function getAtt(xml:Access, name:String):Null<String> {
/*if (!xml.has.resolve(name)) return null;
return xml.att.resolve(name);*/
// Reason for change:
Expand Down
1 change: 1 addition & 0 deletions source/funkin/game/Character.hx
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import funkin.backend.scripting.Script;
import funkin.backend.scripting.ScriptPack;
import funkin.backend.scripting.events.CancellableEvent;
import funkin.backend.scripting.events.character.*;
import funkin.backend.scripting.events.sprite.PlayAnimContext;
import funkin.backend.scripting.events.sprite.*;
import funkin.backend.scripting.events.PointEvent;
import funkin.backend.scripting.events.DrawEvent;
Expand Down
Loading