Skip to content

Commit 3210dd6

Browse files
RaltyroSrtHero278betpowo
committed
Backport 5 commits from internal-merge
- 9f2cacb (SrtHero278 <srtpro278@gmail.com>) - fd3dd81 (SrtHero278 <srtpro278@gmail.com>) - d788e9f (Betopia <73242725+betpowo@users.noreply.github.com>) - e6e367f (Betopia <73242725+betpowo@users.noreply.github.com>) - 3a590a5 (Betopia <73242725+betpowo@users.noreply.github.com>) Two commits have not been synced as following: - Multiple File Extensions (Need fix on conflicts) - f5104eb (Frakits <90983918+Frakits@users.noreply.github.com>) - 33549f5 (Betopia <73242725+betpowo@users.noreply.github.com>) Co-authored-by: SrtHero278 <srtpro278@gmail.com> Co-authored-by: Betopia <73242725+betpowo@users.noreply.github.com>
1 parent 028adfd commit 3210dd6

34 files changed

Lines changed: 469 additions & 169 deletions

‎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/solidEditScreen.xml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,12 +132,17 @@
132132
button.xml.set("name", nameTextBox.label.text);
133133
button.xml.set("x", xStepper.value);
134134
button.xml.set("y", yStepper.value);
135-
button.xml.set("zoom", zoomFactorStepper.value);
135+
button.xml.set("zoomfactor", zoomFactorStepper.value);
136136
button.xml.set("angle", angleStepper.value);
137137
button.xml.set("alpha", alphaStepper.value);
138+
button.xml.remove("blend");
139+
if (sprite.blend != null)
140+
button.xml.set("blend", blendMode.value);
138141

139142
saveXY(sprite.scrollFactor, "scroll", scrollXStepper, scrollYStepper);
140143
saveXY(sprite.skew, "skew", skewXStepper, skewYStepper);
144+
if (isSolid)
145+
button.xml.remove("updateHitbox");
141146
for (att in ["width", "height", "color"])
142147
button.xml.remove(att);
143148
XMLUtil.loadSpriteFromXML(sprite, button.xml, "", 0, false);

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -214,18 +214,18 @@
214214
button.xml.set(name, value);
215215
}
216216

217-
// TODO: remove old attributes to prevent possible errors
218-
// button.xml.remove();
219-
220217
button.xml.set("name", nameTextBox.label.text);
221218
button.xml.set("sprite", spriteTextBox.label.text);
222219
button.xml.set("x", xStepper.value);
223220
button.xml.set("y", yStepper.value);
224-
button.xml.set("zoom", zoomFactorStepper.value);
221+
button.xml.set("zoomfactor", zoomFactorStepper.value);
225222
button.xml.set("type", animTypeToString(animType.value));
226223
button.xml.set("antialiasing", antialiasingCheckbox.checked);
227224
button.xml.set("angle", angleStepper.value);
228225
button.xml.set("alpha", alphaStepper.value);
226+
button.xml.remove("blend");
227+
if (sprite.blend != null)
228+
button.xml.set("blend", blendMode.value);
229229

230230
getEx('anims').clear();
231231
var allowedAnims:Array&lt;String&gt; = [for (b in animations.buttons.members) b.animData.name];

‎assets/data/stages/test.xml‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎assets/languages/en/Editors.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -743,4 +743,9 @@
743743
<str id="createdTitle">Created mod config!</str>
744744
<str id="createdDesc">Your mod config file has been created at {0}!</str>
745745
</group>
746+
747+
<group name="ModAPIWarning" prefix="modApiWarning.">
748+
<str id="warningTitle">Outdated API Version! (v{0} &lt; v{1})</str>
749+
<str id="warningDesc">Your mod's config runs on an outdated API Version! This WILL cause compatiblilty and code issues!\n\nIt is recommended that you make changes to your mod and its config file to fit the new version.\n\nMeanwhile, the game will try its best to make your mod compatible, but you should still update your mod.\n\n(PS: If this is not your mod please disable Developer mode, and notify the mod developers if needed.)</str>
750+
</group>
746751
</language>

‎assets/languages/en/Options.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@
6767
<group name="AppearanceOptions" prefix="AppearanceOptions.">
6868
<str id="framerate-name">Framerate</str>
6969
<str id="framerate-desc">Pretty self explanatory, isn't it?</str>
70+
<str id="framerate-unlimited">Unlimited</str>
7071

7172
<str id="flashingMenu-name">Flashing Menu</str>
7273
<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>

‎assets/languages/es/Editors.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -639,4 +639,17 @@
639639
<str id="saveAndExitToMenu">Guardar y Volver al Menú</str>
640640
<str id="cancel">Cancelar</str>
641641
</group>
642+
643+
<group name="ModConfigWarning" prefix="modConfigWarning.">
644+
<str id="warningTitle">¡Falta la configuración del mod!</str>
645+
<str id="warningDesc">¡Tu mod actualmente no tiene un archivo de configuración!\n\n¿Quisieras generar uno automáticamente?\n\n(PD: Si este no es tu mod por favor deshabilita el Modo Desarrollador para que no aparezca esta ventana.)</str>
646+
647+
<str id="createdTitle">¡Configuración creada!</str>
648+
<str id="createdDesc">¡Tu archivo de configuración se creó en {0}!</str>
649+
</group>
650+
651+
<group name="ModAPIWarning" prefix="modApiWarning.">
652+
<str id="warningTitle">¡Versión de API desactualizada! (v{0} &lt; v{1})</str>
653+
<str id="warningDesc">¡La configuración de tu mod usa una versión API antigua! ¡Esto CAUSARÁ problemas con código y compatibilidad!\n\nSe recomienda que cambies el código y configuración de tu mod para encajar con la versión nueva.\n\nMientras tanto, se hará lo mejor posible para compatibilizar el código actual, pero aún se recomienda actualizarlo.\n\n(PD: Si este no es tu mod por favor deshabilita el Modo Desarrollador, y notifique a los desarrolladores del mod si es necesario.)</str>
654+
</group>
642655
</language>

‎assets/languages/es/Options.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
<group name="AppearanceOptions" prefix="AppearanceOptions.">
6666
<str id="framerate-name">FPS</str>
6767
<str id="framerate-desc">Yo creo que se explica sólo.</str>
68+
<str id="framerate-unlimited">Ilimitado</str>
6869

6970
<str id="flashingMenu-name">Luces Intermitentes</str>
7071
<str id="flashingMenu-desc">Si está desactivado, el menú no parpadeará, y otros parpadeos serán más lentos.</str>
@@ -76,6 +77,12 @@
7677
<str id="week6PixelPerfect-desc">Si está activado, Week 6 tendrá un efecto que alinea todos los píxeles en la pantalla.</str>
7778

7879
<group name="AppearanceOptionsAdvanced" prefix="Advanced.">
80+
<str id="quality-name">CALIDAD</str>
81+
<str id="quality-desc">Modos de calidad del cual elegir, "BAJA" = Quitar efectos fuertes del juego para correr mejor, "ALTA" = Habilita todos los efectos, a costo de rendimiento, "PERSONALIZADA" = Deja cambiar todas las opciones a su gusto.</str>
82+
<str id="quality-low">BAJA</str>
83+
<str id="quality-high">ALTA</str>
84+
<str id="quality-custom">PERSONALIZADA</str>
85+
7986
<str id="antialiasing-desc">Si está desactivado, desactivará el antialiasing en todos los sprites, lo cual puede aumentar el rendimiento pero hará los visuales más pixelados.</str>
8087

8188
<str id="lowMemoryMode-name">Modo de Baja Memoria</str>

‎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>

0 commit comments

Comments
 (0)