Skip to content

Commit 34fd992

Browse files
HundrecHundrec
committed
2 parents b8d72a1 + a8d15fe commit 34fd992

File tree

336 files changed

+273321
-93530
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

336 files changed

+273321
-93530
lines changed

‎exclude/data/credits.json‎

Lines changed: 50 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,19 @@
3434
{ "line": "ninjamuffin99" }
3535
]
3636
},
37+
{
38+
"header": "Mobile Lead",
39+
"body": [
40+
{ "line": "MoonDroid (Zack)"}
41+
]
42+
},
43+
{
44+
"header": "Team Organizers",
45+
"body": [
46+
{ "line": "Hundrec" },
47+
{ "line": "AbnormalPoof" }
48+
]
49+
},
3750
{
3851
"header": "Producer",
3952
"body": [
@@ -139,7 +152,8 @@
139152
"header": "Programming",
140153
"body": [
141154
{ "line": "Eric \"EliteMasterEric\" Myllyoja" },
142-
{ "line": "fabs" }
155+
{ "line": "fabs" },
156+
{ "line": "KadeDev" }
143157
]
144158
},
145159
{
@@ -154,7 +168,18 @@
154168
{ "line": "Emma (MtH)" },
155169
{ "line": "George Kurelic" },
156170
{ "line": "Will Blanton" },
157-
{ "line": "Victor - Cheemsandfriends" }
171+
{ "line": "Victor - Cheemsandfriends" },
172+
{ "line": "Hundrec" },
173+
{ "line": "AbnormalPoof" }
174+
]
175+
},
176+
{
177+
"header": "Mobile Porting",
178+
"body": [
179+
{ "line": "MAJigsaw77" },
180+
{ "line": "Luckydog7" },
181+
{ "line": "Karim Akra" },
182+
{ "line": "sector_5" }
158183
]
159184
},
160185
{
@@ -259,7 +284,7 @@
259284
{
260285
"header": "Cameron would like to specially thank",
261286
"body": [
262-
{ "line": "wanda, henry, snackers, digi, joemega, caddy, pewpew" },
287+
{ "line": "henry, snackers, digi, joemega, caddy, pewpew" },
263288
{ "line": "milkhead jack" },
264289
{ "line": "katt" },
265290
{ "line": "arko, pepe, cashu, ookiyo" },
@@ -301,7 +326,28 @@
301326
{ "line": "d1ggo" }
302327

303328
]
329+
},
330+
{
331+
"header": "Mobile Team special thanks",
332+
"body": [
333+
{ "line": "cub, setai" },
334+
{ "line": "GalacticBaguette, Yowze, Snovi" },
335+
{ "line": "AguaCrunch, pb_lauro, Rulet, Rusron, Megalo_palewhite, Serizyu" },
336+
{ "line": "8-bitryan" },
337+
{ "line": "Stax, NoraYotsu, AndroidSharky, IdioticLuwuke" },
338+
{ "line": "PeppyWall, Klavier, Roadr, Limon" },
339+
{ "line": "Koniro, Key, Zuki, LunaMyria, Rattatuwu, ToffeeCaramel" },
340+
{ "line": "Ninkey, Snak, Codist" },
341+
{ "line": "ValenPratama" },
342+
{ "line": "yetet (June), IDontCareAbtKaz" },
343+
{ "line": "Schepka" },
344+
{ "line": "Amari, DatRand (Vlad), Ressu2, Kekkra, CaptainRoku" },
345+
{ "line": "cat (Ariel), deathgobrr" },
346+
{ "line": "Mario Master (MasterX)" },
347+
{ "line": "richTrash21, PurSnake, Naisonji, HopKa, Matr4ss" },
348+
{ "line": "Redar13, Sirox, Shufa, D.Dregz, Sodaree" },
349+
{ "line": "dUmer, G0lda, Voodoo, Vemer, Sadshrimp" }
350+
]
304351
}
305-
306352
]
307353
}

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

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<menu-separator />
2020
<menu-item id="menubarItemExit" text="Exit" shortcutText="Ctrl+Q" />
2121
</menu>
22-
<menu text="Edit">
22+
<menu text="Edit" width="208px;">
2323
<menu-item id="menubarItemUndo" text="Undo" shortcutText="Ctrl+Z" />
2424
<menu-item id="menubarItemRedo" text="Redo" shortcutText="Ctrl+Y" />
2525
<menu-separator />
@@ -28,6 +28,7 @@
2828
<menu-item id="menubarItemPaste" text="Paste" shortcutText="Ctrl+V" />
2929
<menu-item id="menubarItemPasteUnsnapped" text="Paste (Unsnapped)" shortcutText="Ctrl+Shift+V" />
3030
<menu-item id="menubarItemDelete" text="Delete" shortcutText="Delete" />
31+
<menu-item id="menubarItemDeleteStacked" text="Delete Stacked Notes" shortcutText="Shift + Delete" />
3132
<menu-separator />
3233
<menu-item id="menubarItemFlipNotes" text="Flip Selected Notes" shortcutText="Ctrl+F" />
3334
<menu-separator />
@@ -39,6 +40,15 @@
3940
<menu-item id="menubarItemSelectBeforeCursor" text="Select Before Cursor" shortcutText="Shift+Home" disabled="true" />
4041
<menu-item id="menubarItemSelectAfterCursor" text="Select After Cursor" shortcutText="Shift+End" disabled="true" />
4142
<menu-separator />
43+
<hbox>
44+
<label text="Note Stack Threshold" styleName="menuLabel" paddingLeft="12px;" horizontalAlign="left" verticalAlign="center" />
45+
<dropdown id="menuBarStackedNoteThreshold" width="100%">
46+
<data>
47+
<item text="Exact" />
48+
</data>
49+
</dropdown>
50+
</hbox>
51+
<menu-separator />
4252
<menu text="Note Snapping">
4353
<menu-item id="menuBarItemNoteSnapDecrease" text="Decrease Note Snap Precision" shortcutText="Left Arrow" />
4454
<menu-item id="menuBarItemNoteSnapIncrease" text="Increase Note Snap Precision" shortcutText="Right Arrow" />
@@ -56,6 +66,8 @@
5666
<menu-option-box id="menuBarItemThemeDark" text="Dark" group="menubarItemThemeGroup" />
5767
</menu>
5868
<menu-separator />
69+
<menu-checkbox id="menubarItemViewIndicators" text="Note Kind Indicator" tooltip="Show an indicator if a note is of a non-default kind." />
70+
<menu-separator />
5971
<menu-item id="menubarItemDifficultyUp" text="Increase Difficulty" tooltip="Manage Difficulties with the Difficulty Toolbox" shortcutText="Ctrl+Left" />
6072
<menu-item id="menubarItemDifficultyDown" text="Decrease Difficulty" tooltip="Manage Difficulties with the Difficulty Toolbox" shortcutText="Ctrl+Right" />
6173
</menu>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
<box id="playbar" width="100%" height="48" styleName="playbar">
66
<hbox>
77
<label horizontalAlign="left" id="playbarSongPos" text="0:32" styleName="playbarDuration" />
8+
<rule direction="vertical" height="80%" />
9+
<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." />
10+
<rule direction="vertical" height="80%" />
11+
<label horizontalAlign="left" verticalAlign="center" id="playbarStepNum" text="Step: 0" styleName="playbarStatus" tooltip="The current position in the song in steps." />
812
</hbox>
913
<hbox horizontalAlign="center">
1014
<button allowFocus="false" styleName="playbarButton" tooltip="Skip to Start" id="playbarStart" text="|<" />

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,15 @@
7474
padding-left: 0px;
7575
}
7676
.dialog-close-button {
77-
resource: "haxeui-flixel/styles/flixel-ui/images/close.png";
77+
resource: "shared:assets/shared/images/ui/chart-editor/close.png";
7878
vertical-align: "center";
7979
cursor: "pointer";
8080
pointer-events: true;
8181
padding: 3px;
8282
border-radius: 2px;
8383
}
8484
.dialog-close-button:hover {
85-
resource: $close-hover;
85+
resource: "shared:assets/shared/images/ui/chart-editor/close.png";
8686
background-color: $selection-background-color;
8787
}
8888
.dialog-minimize-button {

‎exclude/data/ui/stage-editor/components/menu.xml‎

Lines changed: 23 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -6,60 +6,56 @@
66
width: 160px;
77
}
88
</style>
9-
109
<menu text="File" id="menubarMenuFile">
11-
<menu-item id="menubarItemNewStage" text="New Stage"/>
10+
<menu-item id="menubarItemNewStage" text="New Stage" />
1211
<menu-separator />
1312
<menu-item id="menubarItemOpenStage" text="Open Stage..." shortcutText="Ctrl+O" />
1413
<menu id="menubarItemOpenRecent" text="Open Recent" />
1514
<menu-separator />
1615
<menu-item id="menubarItemSaveStage" text="Save Stage" shortcutText="Ctrl+S" />
1716
<menu-item id="menubarItemSaveStageAs" text="Save Stage As..." shortcutText="Ctrl+Shift+S" />
1817
<menu-separator />
19-
<menu-item id="menubarItemClearAssets" text="Clear Assets" style="color: indianred"/>
18+
<menu-item id="menubarItemClearAssets" text="Clear Assets" style="color: indianred" />
2019
<menu-separator />
21-
<menu-item id="menubarItemExit" text="Exit" shortcutText="Esc" />
20+
<menu-item id="menubarItemExit" text="Exit" shortcutText="Ctrl + Q" />
2221
</menu>
23-
2422
<menu text="Edit" id="menubarMenuEdit">
25-
<menu-item id="menubarItemUndo" text="Undo" shortcutText="Ctrl + Z"/>
26-
<menu-item id="menubarItemRedo" text="Redo" shortcutText="Ctrl + Y"/>
23+
<menu-item id="menubarItemUndo" text="Undo" shortcutText="Ctrl + Z" />
24+
<menu-item id="menubarItemRedo" text="Redo" shortcutText="Ctrl + Y" />
2725
<menu-separator />
28-
<menu-item id="menubarItemCopy" text="Copy Object" shortcutText="Ctrl + C"/>
29-
<menu-item id="menubarItemCut" text="Cut Object" shortcutText="Ctrl + X"/>
30-
<menu-item id="menubarItemPaste" text="Paste Object" shortcutText="Ctrl + V"/>
31-
<menu-item id="menubarItemDelete" text="Delete Object" shortcutText="Ctrl + Del" style="color: indianred"/>
26+
<menu-item id="menubarItemCopy" text="Copy Object" shortcutText="Ctrl + C" />
27+
<menu-item id="menubarItemCut" text="Cut Object" shortcutText="Ctrl + X" />
28+
<menu-item id="menubarItemPaste" text="Paste Object" shortcutText="Ctrl + V" />
29+
<menu-item id="menubarItemDelete" text="Delete Object" shortcutText="Ctrl + Del" style="color: indianred" />
3230
<menu-separator />
33-
<menu-item id="menubarItemNewObj" text="New Object"/>
34-
<menu-item id="menubarItemFindObj" text="Find Object" shortcutText="Ctrl + F"/>
31+
<menu-item id="menubarItemNewObj" text="New Object" />
32+
<menu-item id="menubarItemFindObj" text="Find Object" shortcutText="Ctrl + F" />
3533
</menu>
36-
3734
<menu text="View" id="menubarMenuView">
3835
<menu text="Theme">
39-
<menu-option-box id="menubarItemThemeLight" text="Light" group="menubarItemThemeGroup" tooltip="Change the Background's Color Scheme to Light Mode."/>
36+
<menu-option-box id="menubarItemThemeLight" text="Light" group="menubarItemThemeGroup" tooltip="Change the Background's Color Scheme to Light Mode." />
4037
<menu-option-box id="menubarItemThemeDark" text="Dark" group="menubarItemThemeGroup" tooltip="Change the Background's Color Scheme to Dark Mode." />
4138
</menu>
4239
<menu-separator />
43-
<menu-checkbox id="menubarItemViewChars" text="View Characters" selected="true" tooltip="Show Characters."/>
44-
<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."/>
45-
<menu-checkbox id="menubarItemViewFloorLines" text="View Floor Lines" tooltip="Show Lines that indicate the Floor of Characters."/>
46-
<menu-checkbox id="menubarItemViewPosMarkers" text="View Position Markers" tooltip="Show Circles that show the Feet Position of Characters."/>
47-
<menu-checkbox id="menubarItemViewCamBounds" text="View Camera Bounds" tooltip="Show Rectangles representing the Camera View upon being focused on a Character."/>
40+
<menu-checkbox id="menubarItemViewChars" text="View Characters" selected="true" tooltip="Show Characters." />
41+
<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." />
42+
<menu-checkbox id="menubarItemViewFloorLines" text="View Floor Lines" tooltip="Show Lines that indicate the Floor of Characters." />
43+
<menu-checkbox id="menubarItemViewPosMarkers" text="View Position Markers" tooltip="Show Circles that show the Feet Position of Characters." />
44+
<menu-checkbox id="menubarItemViewCamBounds" text="View Camera Bounds" tooltip="Show Rectangles representing the Camera View upon being focused on a Character." />
4845
</menu>
49-
5046
<menu text="Windows" id="menubarMenuWindow">
51-
<menu-checkbox id="menubarItemWindowObject" text="Object Properties"/>
52-
<menu-checkbox id="menubarItemWindowCharacter" text="Character Properties"/>
53-
<menu-checkbox id="menubarItemWindowStage" text="Stage Data Settings"/>
47+
<menu-checkbox id="menubarItemWindowObjectGraphic" text="Object Graphic" />
48+
<menu-checkbox id="menubarItemWindowObjectAnims" text="Object Animations" />
49+
<menu-checkbox id="menubarItemWindowObjectProps" text="Object Properties" />
50+
<menu-checkbox id="menubarItemWindowCharacter" text="Character Properties" />
51+
<menu-checkbox id="menubarItemWindowStage" text="Stage Data Settings" />
5452
</menu>
55-
5653
<menu text="Help" id="menubarMenuHelp">
5754
<menu-item id="menubarItemUserGuide" text="User Guide" shortcutText="F1" />
5855
<menu-item id="menubarItemGoToBackupsFolder" text="Go to Backups Folder" />
5956
<menu-item id="menubarItemAbout" text="About..." />
6057
</menu>
61-
62-
<button id="menubarButtonText" text="Test Stage" toggle="true" tooltip="Test the Stage inside the Editor."/>
58+
<button id="menubarButtonText" text="Test Stage" toggle="true" tooltip="Test the Stage inside the Editor." />
6359
<spacer width="100%" />
6460
<label text="PROTOTYPE Functionality is subject to change." verticalAlign="center" />
6561
</menubar>

‎exclude/data/ui/stage-editor/components/style.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,15 @@
6565
padding-left: 0px;
6666
}
6767
.dialog-close-button {
68-
resource: "haxeui-flixel/styles/flixel-ui/images/close.png";
68+
resource: "shared:assets/shared/images/ui/chart-editor/close.png";
6969
vertical-align: "center";
7070
cursor: "pointer";
7171
pointer-events: true;
7272
padding: 3px;
7373
border-radius: 2px;
7474
}
7575
.dialog-close-button:hover {
76-
resource: $close-hover;
76+
resource: "shared:assets/shared/images/ui/chart-editor/close.png";
7777
background-color: $selection-background-color;
7878
}
7979
.dialog-minimize-button {

‎exclude/data/ui/stage-editor/dialogs/about.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<dialog width="500" title="About">
33
<vbox width="100%">
44
<label text="Friday Night Funkin'" horizontalAlign="center" />
5-
<label text="Stage Editor v1.1" horizontalAlign="center" />
6-
<label text="Built by Kolo" horizontalAlign="center" />
5+
<label text="Stage Editor v1" horizontalAlign="center" />
6+
<label text="Built by KoloInDaCrib" horizontalAlign="center" />
77
<label text="HaxeUI by Ian Harrigan" horizontalAlign="center" />
88
</vbox>
99
</dialog>

‎exclude/data/ui/stage-editor/dialogs/welcome.xml‎

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,35 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<dialog width="800" height="575" title="Stage Editor - Open Stage" closable="false">
3-
<hbox width="100%" height="100%">
4-
<vbox width="25%" height="100%">
5-
<card width="100%" height="50%" text="Open Recent">
6-
<scrollview width="100%" height="100%" contentWidth="100%">
7-
<vbox id="contentRecent" width="100%">
8-
</vbox>
9-
</scrollview>
10-
</card>
11-
<!--<card width="100%" height="50%" text="Import Chart">
3+
<hbox width="100%" height="100%">
4+
<vbox width="25%" height="100%">
5+
<card width="100%" height="50%" text="Open Recent">
6+
<scrollview width="100%" height="100%" contentWidth="100%">
7+
<vbox id="contentRecent" width="100%" />
8+
</scrollview>
9+
</card>
10+
<!--<card width="100%" height="50%" text="Import Chart">
1211
<scrollview width="100%" height="100%" contentWidth="100%">
1312
<vbox id="contentImport" width="100%">
1413
<link id="splashImportStageLegacy" text="FNF Legacy"/>
1514
<link id="splashImportStagePsych" text="Psych Engine" disabled="true"/>
1615
</vbox>
1716
</scrollview>
1817
</card> -->
19-
</vbox>
20-
<card width="50%" height="500" text="Browse for Chart">
21-
<vbox width="100%" height="100%">
22-
<box id="boxDrag" width="100%" height="85%" styleName="uploadBG" style="border: 2px dotted #DDDDDD; padding: 5px;">
23-
<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%"/>
24-
</box>
25-
<box width="100%" height="15%" style="spacing:0px;border:1px solid $normal-border-color;padding:1px;">
26-
<button id="buttonNew" text="Create New Empty Stage" horizontalAlign="center" verticalAlign="center"/>
27-
</box>
28-
</vbox>
29-
</card>
30-
<card width="25%" height="500" text="Open from Presets">
31-
<scrollview width="100%" height="100%" contentWidth="100%">
32-
<vbox id="contentPresets" width="100%">
33-
</vbox>
34-
</scrollview>
35-
</card>
36-
</hbox>
18+
</vbox>
19+
<card width="50%" height="500" text="Browse for Stage">
20+
<vbox width="100%" height="100%">
21+
<box id="boxDrag" width="100%" height="85%" styleName="uploadBG" style="border: 2px dotted #DDDDDD; padding: 5px;">
22+
<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%" />
23+
</box>
24+
<box width="100%" height="15%" style="spacing:0px;border:1px solid $normal-border-color;padding:1px;">
25+
<button id="buttonNew" text="Create New Empty Stage" horizontalAlign="center" verticalAlign="center" />
26+
</box>
27+
</vbox>
28+
</card>
29+
<card width="25%" height="500" text="Open from Presets">
30+
<scrollview width="100%" height="100%" contentWidth="100%">
31+
<vbox id="contentPresets" width="100%" />
32+
</scrollview>
33+
</card>
34+
</hbox>
3735
</dialog>

0 commit comments

Comments
 (0)