Skip to content

Commit f0fa308

Browse files
TheZoroForce240TheZoroForce240
committed
Merge remote-tracking branch 'origin/internal-merge' into imgui
2 parents b6560b6 + e32a5ee commit f0fa308

66 files changed

Lines changed: 987 additions & 437 deletions

Some content is hidden

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

‎assets/data/editors/layouts/stage/characterEditScreen.xml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,36 @@
156156
}
157157
char.name = posName;
158158

159+
function saveXY(name:String, x:UINumericStepper, y:UINumericStepper) {
160+
button.xml.remove(name + "");
161+
button.xml.remove(name + "x");
162+
button.xml.remove(name + "y");
163+
164+
if(x.value == y.value)
165+
button.xml.set(name, x.value);
166+
else {
167+
button.xml.set(name + "x", x.value);
168+
button.xml.set(name + "y", y.value);
169+
}
170+
}
171+
172+
if (!StringTools.startsWith(char.name, "NO_DELETE_"))
173+
button.xml.set("name", char.name);
174+
saveXY("", xStepper, yStepper);
175+
button.xml.set("camxoffset", camxStepper.value);
176+
button.xml.set("camyoffset", camyStepper.value);
177+
178+
saveXY("scale", scaleXStepper, scaleYStepper);
179+
saveXY("scroll", scrollXStepper, scrollYStepper);
180+
button.xml.set("zoomfactor", zoomFactorStepper.value);
181+
button.xml.set("alpha", alphaStepper.value);
182+
button.xml.set("angle", angleStepper.value);
183+
button.xml.set("skewx", skewXStepper.value);
184+
button.xml.set("skewy", skewYStepper.value);
185+
186+
button.xml.remove("flip");
187+
button.xml.remove("flipX");
188+
button.xml.set("flip", flipXCheckbox.checked);
159189
}
160190
</exec>
161191
</window>

‎assets/data/editors/layouts/stage/spriteEditScreen.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -229,9 +229,6 @@
229229
button.xml.set(name, value);
230230
}
231231

232-
// TODO: remove old attributes to prevent possible errors
233-
// button.xml.remove();
234-
235232
button.xml.set("name", nameTextBox.label.text);
236233
button.xml.set("sprite", spriteTextBox.label.text);
237234
button.xml.set("x", xStepper.value);

‎assets/images/editors/folder.png‎

618 Bytes
Loading

‎assets/languages/en/Editors.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@
4444
<group name="ChartEditor">
4545
<group name="CharterSelection" prefix="charterSelection.">
4646
<str id="desc">Select a song to modify the charts from.</str>
47+
<str id="acceptFolder">Press ACCEPT to edit this folder.</str>
48+
<str id="desc-folder">Select a song to modify the charts from in {0}</str>
4749
<str id="acceptSong">Press ACCEPT to choose a difficulty to edit.</str>
4850
<str id="acceptVariation">Press ACCEPT to choose a song variation to edit.</str>
4951
<str id="acceptDifficulty">Press ACCEPT to edit the chart for the selected difficulty.</str>
@@ -470,6 +472,8 @@
470472
<str id="newTypeface">New Typeface</str>
471473
<str id="newTypefaceDesc">Press ACCEPT to create a new typeface.</str>
472474
<str id="desc">Select a typeface to edit</str>
475+
<str id="desc-folder">Select a typeface to edit in {0}</str>
476+
<str id="acceptFolder">Press ACCEPT to edit this folder.</str>
473477

474478
<group name="Warnings" prefix="warnings.">
475479
<str id="notImplemented-title">New Typeface: Feature Not Implemented!</str>
@@ -530,6 +534,8 @@
530534
<str id="acceptStage">Press ACCEPT to edit this stage.</str>
531535
<str id="newStage">New Stage</str>
532536
<str id="acceptNewStage">Press ACCEPT to create a new stage.</str>
537+
<str id="acceptFolder">Press ACCEPT to edit this folder.</str>
538+
<str id="desc-folder">Select a stage to edit in {0}</str>
533539
</group>
534540

535541
<group name="StageEditor" prefix="stageEditor.">

‎assets/languages/en/Options.xml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,12 @@
7070
<str id="framerate-desc">Pretty self explanatory, isn't it?</str>
7171
<str id="framerate-unlimited">Unlimited</str>
7272

73+
<str id="fpsCounter-name">FPS Counter</str>
74+
<str id="fpsCounter-desc">If checked, displays the Framerate and Memory counter in the top left.</str>
75+
76+
<str id="fpsAdvanced-name">More Options</str>
77+
<str id="fpsAdvanced-desc">Use this menu to toggle the debug info categories on the FPS counter.</str>
78+
7379
<str id="flashingMenu-name">Flashing Menu</str>
7480
<str id="flashingMenu-desc">If unchecked, will disable menu flashing when you select an option in the Main Menu, and other flashes will be slower.</str>
7581

@@ -98,6 +104,23 @@
98104
<str id="gpuOnlyBitmaps-name">VRAM-Only Sprites</str>
99105
<str id="gpuOnlyBitmaps-desc">If checked, will only store the bitmaps in the GPU, freeing a LOT of memory (EXPERIMENTAL). Turning this off will consume a lot of memory, especially on bigger sprites. If you aren't sure, leave this on.</str>
100106
</group>
107+
108+
<group name="AppearanceOptionsFramerate" prefix="Advanced.">
109+
<str id="fpsCounterConductor-name">Show Conductor Info</str>
110+
<str id="fpsCounterConductor-desc">If checked, will display information relating to the conductor on the debug FPS Counter menu.</str>
111+
112+
<str id="fpsCounterFlixel-name">Show Flixel Info</str>
113+
<str id="fpsCounterFlixel-desc">If checked, will display information relating to Flixel on the debug FPS Counter menu.</str>
114+
115+
<str id="fpsCounterSystem-name">Show System Info</str>
116+
<str id="fpsCounterSystem-desc">If checked, will display information relating to your system on the debug FPS Counter menu.</str>
117+
118+
<str id="fpsCounterAssets-name">Show Assets Tree Info</str>
119+
<str id="fpsCounterAssets-desc">If checked, will display information relating to the assets tree on the debug FPS Counter menu.</str>
120+
121+
<str id="fpsCounterStats-name">Show Stats Info</str>
122+
<str id="fpsCounterStats-desc">If checked, will Fuck idk</str>
123+
</group>
101124
</group>
102125

103126
<group name="GameplayOptions" prefix="GameplayOptions.">

‎assets/languages/es/assets/images/menus/mainmenu/credits.png‎

99.6 KB
Loading

‎assets/languages/es/assets/images/menus/mainmenu/credits.xml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Created with Funkin Packer v0.1.3 https://neeeoo.github.io/funkin-packer/
4+
-->
5+
<TextureAtlas imagePath="credits.png" width="1174" height="508">
6+
<SubTexture name="credits basic0000" x="722" y="342" width="445" height="112" frameX="-0" frameY="-0" frameWidth="445" frameHeight="112"/>
7+
<SubTexture name="credits basic0001" x="722" y="342" width="445" height="112" frameX="-0" frameY="-0" frameWidth="445" frameHeight="112"/>
8+
<SubTexture name="credits basic0002" x="722" y="342" width="445" height="112" frameX="-0" frameY="-0" frameWidth="445" frameHeight="112"/>
9+
<SubTexture name="credits basic0003" x="724" y="5" width="445" height="112" frameX="-0" frameY="-0" frameWidth="445" frameHeight="112"/>
10+
<SubTexture name="credits basic0004" x="724" y="5" width="445" height="112" frameX="-0" frameY="-0" frameWidth="445" frameHeight="112"/>
11+
<SubTexture name="credits basic0005" x="724" y="5" width="445" height="112" frameX="-0" frameY="-0" frameWidth="445" frameHeight="112"/>
12+
<SubTexture name="credits basic0006" x="724" y="122" width="445" height="112" frameX="-0" frameY="-0" frameWidth="445" frameHeight="112"/>
13+
<SubTexture name="credits basic0007" x="724" y="122" width="445" height="112" frameX="-0" frameY="-0" frameWidth="445" frameHeight="112"/>
14+
<SubTexture name="credits basic0008" x="724" y="122" width="445" height="112" frameX="-0" frameY="-0" frameWidth="445" frameHeight="112"/>
15+
<SubTexture name="credits white0000" x="5" y="5" width="714" height="164" frameX="-0" frameY="27" frameWidth="714" frameHeight="165"/>
16+
<SubTexture name="credits white0001" x="5" y="342" width="712" height="161" frameX="-1" frameY="25" frameWidth="714" frameHeight="165"/>
17+
<SubTexture name="credits white0002" x="5" y="174" width="713" height="163" frameX="-0" frameY="25" frameWidth="714" frameHeight="165"/>
18+
</TextureAtlas>

‎assets/languages/es/assets/images/menus/mainmenu/donate.png‎

70.9 KB
Loading

‎assets/languages/es/assets/images/menus/mainmenu/donate.xml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Created with Funkin Packer v0.1.3 https://neeeoo.github.io/funkin-packer/
4+
-->
5+
<TextureAtlas imagePath="donate.png" width="2968" height="164">
6+
<SubTexture name="donate basic0000" x="1627" y="5" width="442" height="114" frameX="-0" frameY="-0" frameWidth="443" frameHeight="114"/>
7+
<SubTexture name="donate basic0001" x="1627" y="5" width="442" height="114" frameX="-0" frameY="-0" frameWidth="443" frameHeight="114"/>
8+
<SubTexture name="donate basic0002" x="1627" y="5" width="442" height="114" frameX="-0" frameY="-0" frameWidth="443" frameHeight="114"/>
9+
<SubTexture name="donate basic0003" x="2074" y="5" width="442" height="114" frameX="-0" frameY="-0" frameWidth="443" frameHeight="114"/>
10+
<SubTexture name="donate basic0004" x="2074" y="5" width="442" height="114" frameX="-0" frameY="-0" frameWidth="443" frameHeight="114"/>
11+
<SubTexture name="donate basic0005" x="2074" y="5" width="442" height="114" frameX="-0" frameY="-0" frameWidth="443" frameHeight="114"/>
12+
<SubTexture name="donate basic0006" x="2521" y="5" width="442" height="114" frameX="-0" frameY="-0" frameWidth="443" frameHeight="114"/>
13+
<SubTexture name="donate basic0007" x="2521" y="5" width="442" height="114" frameX="-0" frameY="-0" frameWidth="443" frameHeight="114"/>
14+
<SubTexture name="donate basic0008" x="2521" y="5" width="442" height="114" frameX="-0" frameY="-0" frameWidth="443" frameHeight="114"/>
15+
<SubTexture name="donate white0000" x="1088" y="5" width="534" height="152" frameX="-1" frameY="-0" frameWidth="537" frameHeight="155"/>
16+
<SubTexture name="donate white0001" x="547" y="5" width="536" height="154" frameX="-0" frameY="-1" frameWidth="537" frameHeight="155"/>
17+
<SubTexture name="donate white0002" x="5" y="5" width="537" height="154" frameX="-0" frameY="-0" frameWidth="537" frameHeight="155"/>
18+
</TextureAtlas>

‎assets/languages/es/assets/images/menus/mainmenu/freeplay.png‎

124 KB
Loading

0 commit comments

Comments
 (0)