Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
75b3a13
Add dropdown for stacking threshold
NotHyper-474 Nov 21, 2024
16a8b21
Stacked notes key action in User Guide
NotHyper-474 Mar 17, 2025
29ed453
Add "Delete Stacked" menu item
NotHyper-474 Mar 19, 2025
79cd0e4
Add "Flip character horizontally" to the list of Shortcuts (#60)
AbnormalPoof Jun 17, 2025
896e7d5
[FIX]: Monster Instrumental On Web (#182)
JVNpixels Jun 17, 2025
35d3fed
Ensure volume enables for burpShit animation as well
Hundrec Oct 3, 2024
7ed2c3a
Explicitly set "ignoreOther" to false in playKickCanAnim
biomseed Oct 9, 2024
225ab82
Fix super call
NotHyper-474 Oct 24, 2024
3b3cf15
fix pico's cheer offsets
AbnormalPoof Oct 26, 2024
acb3a75
[BUGFIX] Prevent Picos from gasping a second time during the Pico and…
KoloInDaCrib Jun 17, 2025
236ba8e
Stressed out pico fix
Lasercar Feb 15, 2025
c4d7c70
Stressed out otis fix
Lasercar Apr 6, 2025
27b954f
fix: Prevent error when getting fake out death while testing in Chart…
NotHyper-474 Apr 30, 2025
bbeeaec
Fix GF's Week 7 combo break anim not playing (#149)
qt2k4 Jun 17, 2025
a4db8f3
Update tankmanBattlefieldErect.json
JVNpixels Apr 6, 2025
db9f260
Update pico-pixel.json
ExtraCode75 Apr 6, 2025
4ee785b
Delete preload/sounds/perfect.ogg
JVNpixels Apr 13, 2025
df99728
Delete preload/sounds/perfect.mp3
JVNpixels Apr 13, 2025
0b6b85e
Restore Darnell (BF Mix) alt inst
Hundrec Apr 26, 2025
636c895
dump the sound when the song ends
VioletSnowLeopard May 4, 2025
1b2d0e1
Remove spammy trace in spooky-dark
NotHyper-474 May 5, 2025
2b0353c
shift da icon by 15 pixels
KoloInDaCrib Jun 8, 2025
d2df5b6
Editors close button fix
Lasercar Feb 14, 2025
6bd63a4
Starting BPM font size matches other label
Lasercar Apr 27, 2025
d8464f8
kolo...........................................
AbnormalPoof Jun 17, 2025
6d761e0
fix close
Lasercar Jun 17, 2025
a3e5c31
[ENHANCEMENT] Scriptable Backing Cards (#202)
KoloInDaCrib Jun 20, 2025
6045ba3
Add labels for beat and step
NotHyper-474 May 4, 2025
38c7d77
fix chart(er)
Lasercar Apr 28, 2025
1367f2b
Changed default FastCar position + removed redundant resetFastCar() call
MetaBreeze May 5, 2025
70a1d73
YOU TOO DARNELL??
MetaBreeze May 5, 2025
af7fc4d
fix: death before dialogue no more
anysad Apr 21, 2025
1170be1
update script lerp logic
cyn0x8 Jun 23, 2025
9a3d81c
uggthughugh
KoloInDaCrib Jul 2, 2025
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
14 changes: 13 additions & 1 deletion exclude/data/ui/chart-editor/components/menubar.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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 />
Expand All @@ -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 />
Expand All @@ -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" />
Expand All @@ -56,6 +66,8 @@
<menu-option-box id="menuBarItemThemeDark" text="Dark" group="menubarItemThemeGroup" />
</menu>
<menu-separator />
<menu-checkbox id="menubarItemViewIndicators" text="Note Kind Indicator" tooltip="Show an indicator if a note is of a non-default kind." />
<menu-separator />
<menu-item id="menubarItemDifficultyUp" text="Increase Difficulty" tooltip="Manage Difficulties with the Difficulty Toolbox" shortcutText="Ctrl+Left" />
<menu-item id="menubarItemDifficultyDown" text="Decrease Difficulty" tooltip="Manage Difficulties with the Difficulty Toolbox" shortcutText="Ctrl+Right" />
</menu>
Expand Down
4 changes: 4 additions & 0 deletions exclude/data/ui/chart-editor/components/playbar.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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="|<" />
Expand Down
4 changes: 2 additions & 2 deletions exclude/data/ui/chart-editor/components/style.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
48 changes: 22 additions & 26 deletions exclude/data/ui/stage-editor/components/menu.xml
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -6,60 +6,56 @@
width: 160px;
}
</style>

<menu text="File" id="menubarMenuFile">
<menu-item id="menubarItemNewStage" text="New Stage"/>
<menu-item id="menubarItemNewStage" text="New Stage" />
<menu-separator />
<menu-item id="menubarItemOpenStage" text="Open Stage..." shortcutText="Ctrl+O" />
<menu id="menubarItemOpenRecent" text="Open Recent" />
<menu-separator />
<menu-item id="menubarItemSaveStage" text="Save Stage" shortcutText="Ctrl+S" />
<menu-item id="menubarItemSaveStageAs" text="Save Stage As..." shortcutText="Ctrl+Shift+S" />
<menu-separator />
<menu-item id="menubarItemClearAssets" text="Clear Assets" style="color: indianred"/>
<menu-item id="menubarItemClearAssets" text="Clear Assets" style="color: indianred" />
<menu-separator />
<menu-item id="menubarItemExit" text="Exit" shortcutText="Esc" />
</menu>

<menu text="Edit" id="menubarMenuEdit">
<menu-item id="menubarItemUndo" text="Undo" shortcutText="Ctrl + Z"/>
<menu-item id="menubarItemRedo" text="Redo" shortcutText="Ctrl + Y"/>
<menu-item id="menubarItemUndo" text="Undo" shortcutText="Ctrl + Z" />
<menu-item id="menubarItemRedo" text="Redo" shortcutText="Ctrl + Y" />
<menu-separator />
<menu-item id="menubarItemCopy" text="Copy Object" shortcutText="Ctrl + C"/>
<menu-item id="menubarItemCut" text="Cut Object" shortcutText="Ctrl + X"/>
<menu-item id="menubarItemPaste" text="Paste Object" shortcutText="Ctrl + V"/>
<menu-item id="menubarItemDelete" text="Delete Object" shortcutText="Ctrl + Del" style="color: indianred"/>
<menu-item id="menubarItemCopy" text="Copy Object" shortcutText="Ctrl + C" />
<menu-item id="menubarItemCut" text="Cut Object" shortcutText="Ctrl + X" />
<menu-item id="menubarItemPaste" text="Paste Object" shortcutText="Ctrl + V" />
<menu-item id="menubarItemDelete" text="Delete Object" shortcutText="Ctrl + Del" style="color: indianred" />
<menu-separator />
<menu-item id="menubarItemNewObj" text="New Object"/>
<menu-item id="menubarItemFindObj" text="Find Object" shortcutText="Ctrl + F"/>
<menu-item id="menubarItemNewObj" text="New Object" />
<menu-item id="menubarItemFindObj" text="Find Object" shortcutText="Ctrl + F" />
</menu>

<menu text="View" id="menubarMenuView">
<menu text="Theme">
<menu-option-box id="menubarItemThemeLight" text="Light" group="menubarItemThemeGroup" tooltip="Change the Background's Color Scheme to Light Mode."/>
<menu-option-box id="menubarItemThemeLight" text="Light" group="menubarItemThemeGroup" tooltip="Change the Background's Color Scheme to Light Mode." />
<menu-option-box id="menubarItemThemeDark" text="Dark" group="menubarItemThemeGroup" tooltip="Change the Background's Color Scheme to Dark Mode." />
</menu>
<menu-separator />
<menu-checkbox id="menubarItemViewChars" text="View Characters" selected="true" tooltip="Show Characters."/>
<menu-checkbox id="menubarItemViewNameText" text="View Name Text" selected="true" tooltip="Show the Text above Cursor with the Name of an Asset directly below Cursor."/>
<menu-checkbox id="menubarItemViewFloorLines" text="View Floor Lines" tooltip="Show Lines that indicate the Floor of Characters."/>
<menu-checkbox id="menubarItemViewPosMarkers" text="View Position Markers" tooltip="Show Circles that show the Feet Position of Characters."/>
<menu-checkbox id="menubarItemViewCamBounds" text="View Camera Bounds" tooltip="Show Rectangles representing the Camera View upon being focused on a Character."/>
<menu-checkbox id="menubarItemViewChars" text="View Characters" selected="true" tooltip="Show Characters." />
<menu-checkbox id="menubarItemViewNameText" text="View Name Text" selected="true" tooltip="Show the Text above Cursor with the Name of an Asset directly below Cursor." />
<menu-checkbox id="menubarItemViewFloorLines" text="View Floor Lines" tooltip="Show Lines that indicate the Floor of Characters." />
<menu-checkbox id="menubarItemViewPosMarkers" text="View Position Markers" tooltip="Show Circles that show the Feet Position of Characters." />
<menu-checkbox id="menubarItemViewCamBounds" text="View Camera Bounds" tooltip="Show Rectangles representing the Camera View upon being focused on a Character." />
</menu>

<menu text="Windows" id="menubarMenuWindow">
<menu-checkbox id="menubarItemWindowObject" text="Object Properties"/>
<menu-checkbox id="menubarItemWindowCharacter" text="Character Properties"/>
<menu-checkbox id="menubarItemWindowStage" text="Stage Data Settings"/>
<menu-checkbox id="menubarItemWindowObjectGraphic" text="Object Graphic" />
<menu-checkbox id="menubarItemWindowObjectAnims" text="Object Animations" />
<menu-checkbox id="menubarItemWindowObjectProps" text="Object Properties" />
<menu-checkbox id="menubarItemWindowCharacter" text="Character Properties" />
<menu-checkbox id="menubarItemWindowStage" text="Stage Data Settings" />
</menu>

<menu text="Help" id="menubarMenuHelp">
<menu-item id="menubarItemUserGuide" text="User Guide" shortcutText="F1" />
<menu-item id="menubarItemGoToBackupsFolder" text="Go to Backups Folder" />
<menu-item id="menubarItemAbout" text="About..." />
</menu>

<button id="menubarButtonText" text="Test Stage" toggle="true" tooltip="Test the Stage inside the Editor."/>
<button id="menubarButtonText" text="Test Stage" toggle="true" tooltip="Test the Stage inside the Editor." />
<spacer width="100%" />
<label text="PROTOTYPE Functionality is subject to change." verticalAlign="center" />
</menubar>
4 changes: 2 additions & 2 deletions exclude/data/ui/stage-editor/components/style.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,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 {
Expand Down
4 changes: 2 additions & 2 deletions exclude/data/ui/stage-editor/dialogs/about.xml
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<dialog width="500" title="About">
<vbox width="100%">
<label text="Friday Night Funkin'" horizontalAlign="center" />
<label text="Stage Editor v1.1" horizontalAlign="center" />
<label text="Built by Kolo" horizontalAlign="center" />
<label text="Stage Editor v1" horizontalAlign="center" />
<label text="Built by KoloInDaCrib" horizontalAlign="center" />
<label text="HaxeUI by Ian Harrigan" horizontalAlign="center" />
</vbox>
</dialog>
52 changes: 25 additions & 27 deletions exclude/data/ui/stage-editor/dialogs/welcome.xml
Original file line number Diff line number Diff line change
@@ -1,37 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<dialog width="800" height="575" title="Stage Editor - Open Stage" closable="false">
<hbox width="100%" height="100%">
<vbox width="25%" height="100%">
<card width="100%" height="50%" text="Open Recent">
<scrollview width="100%" height="100%" contentWidth="100%">
<vbox id="contentRecent" width="100%">
</vbox>
</scrollview>
</card>
<!--<card width="100%" height="50%" text="Import Chart">
<hbox width="100%" height="100%">
<vbox width="25%" height="100%">
<card width="100%" height="50%" text="Open Recent">
<scrollview width="100%" height="100%" contentWidth="100%">
<vbox id="contentRecent" width="100%" />
</scrollview>
</card>
<!--<card width="100%" height="50%" text="Import Chart">
<scrollview width="100%" height="100%" contentWidth="100%">
<vbox id="contentImport" width="100%">
<link id="splashImportStageLegacy" text="FNF Legacy"/>
<link id="splashImportStagePsych" text="Psych Engine" disabled="true"/>
</vbox>
</scrollview>
</card> -->
</vbox>
<card width="50%" height="500" text="Browse for Chart">
<vbox width="100%" height="100%">
<box id="boxDrag" width="100%" height="85%" styleName="uploadBG" style="border: 2px dotted #DDDDDD; padding: 5px;">
<label text="Drag and drop a stage file (.fnfs) here, or click to browse." horizontalAlign="center" verticalAlign="center" textAlign="center" style="font-size: 18px" width="100%"/>
</box>
<box width="100%" height="15%" style="spacing:0px;border:1px solid $normal-border-color;padding:1px;">
<button id="buttonNew" text="Create New Empty Stage" horizontalAlign="center" verticalAlign="center"/>
</box>
</vbox>
</card>
<card width="25%" height="500" text="Open from Presets">
<scrollview width="100%" height="100%" contentWidth="100%">
<vbox id="contentPresets" width="100%">
</vbox>
</scrollview>
</card>
</hbox>
</vbox>
<card width="50%" height="500" text="Browse for Stage">
<vbox width="100%" height="100%">
<box id="boxDrag" width="100%" height="85%" styleName="uploadBG" style="border: 2px dotted #DDDDDD; padding: 5px;">
<label text="Drag and drop a stage file (.fnfs) here, or click to browse." horizontalAlign="center" verticalAlign="center" textAlign="center" style="font-size: 18px" width="100%" />
</box>
<box width="100%" height="15%" style="spacing:0px;border:1px solid $normal-border-color;padding:1px;">
<button id="buttonNew" text="Create New Empty Stage" horizontalAlign="center" verticalAlign="center" />
</box>
</vbox>
</card>
<card width="25%" height="500" text="Open from Presets">
<scrollview width="100%" height="100%" contentWidth="100%">
<vbox id="contentPresets" width="100%" />
</scrollview>
</card>
</hbox>
</dialog>
66 changes: 31 additions & 35 deletions exclude/data/ui/stage-editor/toolboxes/character-properties.xml
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,39 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<collapsible-dialog title="Character Properties" width="325" height="465">
<collapsible-dialog title="Character Properties" width="300" height="492">
<vbox width="100%" height="100%">
<section-header text="Position"/>
<hbox width="100%">
<number-stepper id="characterPosXStepper" precision="2"/>
<number-stepper id="characterPosYStepper" precision="2"/>
<spacer width="100%" />
<button id="characterPosReset" text="Reset"/>
</hbox>

<section-header text="Z-Index"/>
<hbox width="100%">
<number-stepper id="characterZIdxStepper"/>
<spacer width="100%" />
<button id="characterZIdxReset" text="Reset"/>
</hbox>

<section-header text="Camera Offset"/>
<hbox width="100%">
<number-stepper id="characterCamXStepper" precision="1"/>
<number-stepper id="characterCamYStepper" precision="1"/>
<spacer width="100%" />
<button id="characterCamReset" text="Reset"/>
</hbox>

<section-header text="Scale"/>
<hbox width="100%">
<slider id="characterScaleSlider" pos="1" step="0.05" min="0.05" max="10" majorTicks="1" minorTicks="0.25"/>
<spacer width="100%" />
<button id="characterScaleReset" text="Reset"/>
</hbox>

<section-header text="Test as Character"/>
<button id="characterTypeButton" width="70" height="70" padding="8" iconPosition="top">
Aught
</button>
<frame text="Properties" width="100%" height="95%" horizontalAlign="center">
<vbox width="100%" height="100%">
<scrollview width="100%" height="100%" contentWidth="100%">
<grid columns="2" width="100%">
<label text="Position (X)" verticalAlign="center" horizontalAlign="center" />
<number-stepper id="charPosX" step="5" pos="0" />
<label text="Position (Y)" verticalAlign="center" horizontalAlign="center" />
<number-stepper id="charPosY" step="5" pos="0" />
<label text="Z-Index" verticalAlign="center" horizontalAlign="center" />
<number-stepper id="charZIdx" />
<label text="Scale" verticalAlign="center" horizontalAlign="center" />
<number-stepper id="charScale" step="0.05" pos="1" precision="2" min="0.05" />
<label text="Camera Offset (X)" verticalAlign="center" horizontalAlign="center" />
<number-stepper id="charCamX" step="5" pos="0" />
<label text="Camera Offset (Y)" verticalAlign="center" horizontalAlign="center" />
<number-stepper id="charCamY" step="5" pos="0" />
<label text="Opacity" verticalAlign="center" horizontalAlign="center" />
<number-stepper id="charAlpha" pos="1" min="0" max="1" step="0.05" precision="2" />
<label text="Angle" verticalAlign="center" horizontalAlign="center" />
<number-stepper id="charAngle" pos="0" min="0" max="360" />
<label text="Scroll Factor (X)" verticalAlign="center" horizontalAlign="center" />
<number-stepper id="charScrollX" step="0.05" pos="1" precision="2" />
<label text="Scroll Factor (Y)" verticalAlign="center" horizontalAlign="center" />
<number-stepper id="charScrollY" step="0.05" pos="1" precision="2" />
</grid>
</scrollview>
</vbox>
</frame>
<section-header text="Test as Character" />
<button id="charType" width="70" height="70" padding="8" iconPosition="top" />
</vbox>
</collapsible-dialog>
47 changes: 47 additions & 0 deletions exclude/data/ui/stage-editor/toolboxes/object-anims.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<?xml version="1.0" encoding="utf-8"?>
<collapsible-dialog title="Object Animations" width="425" height="360">
<vbox width="100%" height="100%">
<hbox width="100%">
<dropdown id="objAnims" width="45%" text="Search Animation" searchable="true" searchPrompt="Search Animation">
<data/> <!--fill with code-->
</dropdown>
<textfield id="objAnimName" width="55%" placeholder="Animation Name"/>
</hbox>

<hbox width="100%">
<listview id="objFrameList" width="45%" height="100%">
<item-renderer width="100%" allowHover="true">
<label id="name" horizontalAlign="left"/>
</item-renderer>
<data /> <!-- fill with code-->
</listview>

<vbox width="55%">
<textfield id="objAnimPrefix" placeholder="Frame Prefix" width="100%"/>
<textfield id="objAnimIndices" placeholder="Frame Indices (Optional)" width="100%"/>
<grid width="100%" columns="2">
<label text="Loop" verticalAlign="center" horizontalAlign="center"/>
<checkbox id="objAnimLooped" text="Enabled"/>
<label text="Flip Horizontally" verticalAlign="center" horizontalAlign="center"/>
<checkbox id="objAnimFlipX" text="Enabled"/>
<label text="Flip Vertically" verticalAlign="center" horizontalAlign="center"/>
<checkbox id="objAnimFlipY" text="Enabled"/>
<label text="Plays on Init" verticalAlign="center" horizontalAlign="center"/>
<checkbox id="objAnimStart" text="Enabled"/>
<label text="Framerate" verticalAlign="center" horizontalAlign="center"/>
<number-stepper id="objAnimFramerate" min="1" step="1" pos="24"/>
<label text="Offset (X)" verticalAlign="center" horizontalAlign="center"/>
<number-stepper id="objAnimOffsetX" step="1" pos="0"/>
<label text="Offset (Y)" verticalAlign="center" horizontalAlign="center"/>
<number-stepper id="objAnimOffsetY" step="1" pos="0"/>
</grid>
</vbox>
</hbox>

<hbox width="100%">
<spacer width="100%" />
<button id="objAnimSave" text="Save"/>
<button id="objAnimDelete" text="Remove"/>
</hbox>
</vbox>
</collapsible-dialog>
Loading
Loading