Skip to content

Commit

Permalink
source code cleanup and optimizations
Browse files Browse the repository at this point in the history
  • Loading branch information
TheRealJake12 committed Oct 19, 2024
1 parent 1a4c8e5 commit e00215d
Show file tree
Hide file tree
Showing 389 changed files with 1,393 additions and 318,334 deletions.
5 changes: 1 addition & 4 deletions Project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,9 @@
<!-- <define name="PRELOAD_ALL" /> -->
<define name="PRELOAD_ALL" unless="web" />
<define name="NO_PRELOAD_ALL" unless="PRELOAD_ALL" />
<assets path="assets/songs" library="songs" exclude="*.ogg" if="web" />
<assets path="assets/songs" library="songs" exclude="*.mp3" unless="web" />
<assets path="assets/videos" embed="false" if="VIDEOS" />
<assets path="assets/shared" exclude="*.ogg" if="web" />
<assets path="assets/shared" exclude="*.mp3" unless="web" />
<assets path="assets/weeks" library="weeks" rename="assets" exclude="*.ogg" if="web" />
<assets path="assets/weeks" library="weeks" rename="assets" exclude="*.mp3" unless="web" />
<assets path="assets/sm" library="sm" if="FEATURE_STEPMANIA" />
<assets path="mods" embed="false" if="FEATURE_MODCORE" />
<assets path="art/readme.txt" rename="do NOT readme.txt" />
Expand Down Expand Up @@ -129,6 +125,7 @@
</section>
<!-- Basically Allows Videos To Render In Higher Quality On Higher Resoluttions -->
<haxedef name="openfl_dpi_aware" unless="web" />

<haxedef name="haxeui_focus_out_on_click" />
<!-- Tired Of HaxeUI Breaking Things -->
<haxeflag name="--macro" value="include('haxe.ui.backend.flixel.components')" />
Expand Down
2 changes: 1 addition & 1 deletion assets/shared/data/characters/parents-christmas.json
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
"iconAnimated": false,
"antialiasing": true,
"deadChar": "",
"name": "parents-christmas",
"name": "parents",
"replacesGF": false,
"scale": 1
}
1 change: 0 additions & 1 deletion assets/shared/data/editors/character.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
</vbox>
<menu-separator />
<hbox>
<checkbox id="charIconAnimated" text="Animated Icon?" verticalAlign="center" />
<label text="Animation Name" verticalAlign="center" />
<textfield id="charIconAnimName" text="" verticalAlign="center" />
</hbox>
Expand Down
85 changes: 85 additions & 0 deletions assets/shared/data/editors/charter.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
<?xml version="1.0" encoding="utf-8"?>
<vbox width="100%" height="100%">
<menubar id="bar" width="100%" paddingLeft="180">
<style>
.menu {
// The width of the individual menu items
width: 160px;
}
</style>
<menu text="Chart" style="padding: 5px;">
<menu-item id="chartSave" text="Save Chart" />
<menu-item id="chartReload" text="Reload Chart" />
<menu-item id="chartLoadAuto" text="Load Autosave" />
<menu-item id="chartClear" text="Clear Chart" />
</menu>
<menu text="Preferences" style="padding: 5px;">
<menu-checkbox id="editorDrag" text="Drag Editor" />
<menu-item id="editorReset" text="Reset Editor Position" />
<menu-separator />
<vbox width="100%" style="padding: 5px;">
<label width="100%" styleName="menuHeader" text="Metronome Volume" verticalAlign="center" />
<slider id="editorMetroVol" majorTicks="10" minorTicks="5" pos="100" verticalAlign="center" />
</vbox>
<menu-checkbox id="editorHitsoundP" text="Player Hitsounds" />
<menu-checkbox id="editorHitsoundsE" text="Enemy Hitsounds" />
</menu>
<menu text="Game" style="padding: 5px;">
<menu-item id="editorPlaytest" text="Playtest Chart Ingame" />
<menu-checkbox id="editorOpponentMode" text="Opponent Mode" />
</menu>
</menubar>
<spacer height="280" />
<tabview id="tabs" width="400" height="400" style="padding: 5px; spacing : 5px;">
<vbox text="Assets">
<frame width="350" height="350">
<vbox>
<hbox>
<label text="Player" horizontalAlign="center" />
<spacer width="75" />
<label text="GF" horizontalAlign="center" />
<spacer width="75" />
<label text="Opponent" verticalAlign="center" />
</hbox>
<hbox>
<dropdown id="playerSelect" width="75" horizontalAlign="center" />
<spacer />
<dropdown id="gfSelect" width="75" horizontalAlign="center" />
<spacer />
<dropdown id="opponentSelect" width="75" horizontalAlign="center" />
</hbox>
<menu-separator />
<hbox>
<label text="Stage" width="100" horizontalAlign="center" />
<label text="Style" width="100" horizontalAlign="center" />
<label text="Difficulty" width="100" horizontalAlign="center" />
</hbox>
<hbox>
<dropdown id="stageSelect" width="90" horizontalAlign="center" />
<dropdown id="styleSelect" width="90" horizontalAlign="center" />
<dropdown id="diffSelect" width="90" horizontalAlign="center" />
</hbox>
</vbox>
</frame>
</vbox>
<vbox text="Section">

</vbox>
<vbox text="Song">
<frame>
<grid>
<label text="Song ID" verticalAlign="center" />
<textfield id="dataID" verticalAlign="center" />
<label text="Song Name" verticalAlign="center" />
<textfield id="dataName" verticalAlign="center" />
<label text="Audio Path" verticalAlign="center" />
<textfield id="dataAudio" verticalAlign="center" />
<label text="Start BPM" verticalAlign="center" />
<number-stepper id="dataBPM" pos="100" step="0.1" verticalAlign="center" />
<label text="Scroll Speed" verticalAlign="center" />
<number-stepper id="dataSpeed" pos="100" step="0.1" verticalAlign="center" />
</grid>
</frame>
</vbox>
</tabview>
</vbox>
12 changes: 12 additions & 0 deletions assets/shared/data/editors/gameplay.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<panel>
<box width="100%" style="padding: 20px;">
<frame>
<vbox>
<checkbox id="rating" text="Show Rating" verticalAlign="center"/>
<checkbox id="combo" text="Show Combo" verticalAlign="center"/>
<checkbox id="timing" text="Show MS Timing" verticalAlign="center"/>
</vbox>
</frame>
</box>
</panel>
6 changes: 3 additions & 3 deletions assets/shared/data/freeplaySonglist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ blammed:pico:3:#6F133C
satin-panties:mom:4:#CB84BE
high:mom:4:#CB84BE
milf:mom:4:#CB84BE
cocoa:parents-christmas:5:#8DA5CE
eggnog:parents-christmas:5:#8DA5CE
winter-horrorland:monster-christmas:5:#a10000
cocoa:parents:5:#8DA5CE
eggnog:parents:5:#8DA5CE
winter-horrorland:monster:5:#a10000
senpai:senpai:6:#B25C93
roses:senpai:6:#B25C93
thorns:spirit:6:#17005c
Expand Down
Loading

0 comments on commit e00215d

Please sign in to comment.