Skip to content

Commit 4e3d5d7

Browse files
committed
Merge remote-tracking branch 'origin/main'
2 parents 3196195 + e08fac3 commit 4e3d5d7

File tree

30 files changed

+139
-13
lines changed

30 files changed

+139
-13
lines changed
229 KB
Binary file not shown.

art/flashFiles/TitleEnter.fla

6.69 KB
Binary file not shown.
-6.03 MB
Binary file not shown.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<stepper name="alphaStepper" label="${translate('alpha')}" value="char.alpha / 0.75" x="col(0)" y="curY" precision="2" step="0.01" width="100" />
5252
<stepper name="angleStepper" label="${translate('angle')}" value="char.angle" x="last.x + last.bWidth + XOFFSET - 20" y="curY" precision="2" step="0.01" width="100" />
5353

54-
<stepper name="zoomFactorStepper" label="${translate('zoomFactor')" value="char.zoomFactor" x="col(1)" y="curY" precision="2" step="0.01" width="100" />
54+
<stepper name="zoomFactorStepper" label="${translate('zoomFactor')}" value="char.zoomFactor" x="col(1)" y="curY" precision="2" step="0.01" width="100" />
5555

5656
<section if="!StringTools.startsWith(char.name, 'NO_DELETE_')">
5757
<textbox name="charName" label="${translate('positionName')}" value="char.name" x="col(2)" y="curY" width="100"/>
65.1 KB
Loading
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<TextureAtlas imagePath="credits.png" width="3020" height="169">
3+
<SubTexture name="credits basic0000" x="1" y="1" width="430" height="114" frameX="-0" frameY="-0" frameWidth="430" frameHeight="114"/>
4+
<SubTexture name="credits basic0001" x="1" y="1" width="430" height="114" frameX="-0" frameY="-0" frameWidth="430" frameHeight="114"/>
5+
<SubTexture name="credits basic0002" x="1" y="1" width="430" height="114" frameX="-0" frameY="-0" frameWidth="430" frameHeight="114"/>
6+
<SubTexture name="credits basic0003" x="433" y="1" width="430" height="114" frameX="-0" frameY="-0" frameWidth="430" frameHeight="114"/>
7+
<SubTexture name="credits basic0004" x="433" y="1" width="430" height="114" frameX="-0" frameY="-0" frameWidth="430" frameHeight="114"/>
8+
<SubTexture name="credits basic0005" x="433" y="1" width="430" height="114" frameX="-0" frameY="-0" frameWidth="430" frameHeight="114"/>
9+
<SubTexture name="credits basic0006" x="865" y="1" width="430" height="114" frameX="-0" frameY="-0" frameWidth="430" frameHeight="114"/>
10+
<SubTexture name="credits basic0007" x="865" y="1" width="430" height="114" frameX="-0" frameY="-0" frameWidth="430" frameHeight="114"/>
11+
<SubTexture name="credits basic0008" x="865" y="1" width="430" height="114" frameX="-0" frameY="-0" frameWidth="430" frameHeight="114"/>
12+
<SubTexture name="credits white0000" x="1297" y="1" width="574" height="164" frameX="-0" frameY="24" frameWidth="574" frameHeight="169"/>
13+
<SubTexture name="credits white0001" x="2446" y="1" width="573" height="167" frameX="-0" frameY="25" frameWidth="574" frameHeight="169"/>
14+
<SubTexture name="credits white0002" x="1873" y="1" width="571" height="165" frameX="-0" frameY="21" frameWidth="574" frameHeight="169"/>
15+
</TextureAtlas>
114 KB
Loading
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<TextureAtlas imagePath="freeplay.png" width="941" height="864">
3+
<SubTexture name="freeplay basic0000" x="1" y="508" width="659" height="117" frameX="-0" frameY="-0" frameWidth="659" frameHeight="117"/>
4+
<SubTexture name="freeplay basic0001" x="1" y="508" width="659" height="117" frameX="-0" frameY="-0" frameWidth="659" frameHeight="117"/>
5+
<SubTexture name="freeplay basic0002" x="1" y="508" width="659" height="117" frameX="-0" frameY="-0" frameWidth="659" frameHeight="117"/>
6+
<SubTexture name="freeplay basic0003" x="1" y="627" width="659" height="117" frameX="-0" frameY="-0" frameWidth="659" frameHeight="117"/>
7+
<SubTexture name="freeplay basic0004" x="1" y="627" width="659" height="117" frameX="-0" frameY="-0" frameWidth="659" frameHeight="117"/>
8+
<SubTexture name="freeplay basic0005" x="1" y="627" width="659" height="117" frameX="-0" frameY="-0" frameWidth="659" frameHeight="117"/>
9+
<SubTexture name="freeplay basic0006" x="1" y="746" width="659" height="117" frameX="-0" frameY="-0" frameWidth="659" frameHeight="117"/>
10+
<SubTexture name="freeplay basic0007" x="1" y="746" width="659" height="117" frameX="-0" frameY="-0" frameWidth="659" frameHeight="117"/>
11+
<SubTexture name="freeplay basic0008" x="1" y="746" width="659" height="117" frameX="-0" frameY="-0" frameWidth="659" frameHeight="117"/>
12+
<SubTexture name="freeplay white0000" x="1" y="173" width="939" height="167" frameX="-1" frameY="17" frameWidth="941" frameHeight="170"/>
13+
<SubTexture name="freeplay white0001" x="1" y="1" width="939" height="170" frameX="-0" frameY="20" frameWidth="941" frameHeight="170"/>
14+
<SubTexture name="freeplay white0002" x="1" y="342" width="938" height="164" frameX="-1" frameY="16" frameWidth="941" frameHeight="170"/>
15+
</TextureAtlas>
47.9 KB
Loading
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<TextureAtlas imagePath="options.png" width="2449" height="159">
3+
<SubTexture name="options basic0000" x="1" y="1" width="343" height="113" frameX="-0" frameY="-0" frameWidth="343" frameHeight="113"/>
4+
<SubTexture name="options basic0001" x="1" y="1" width="343" height="113" frameX="-0" frameY="-0" frameWidth="343" frameHeight="113"/>
5+
<SubTexture name="options basic0002" x="1" y="1" width="343" height="113" frameX="-0" frameY="-0" frameWidth="343" frameHeight="113"/>
6+
<SubTexture name="options basic0003" x="346" y="1" width="343" height="113" frameX="-0" frameY="-0" frameWidth="343" frameHeight="113"/>
7+
<SubTexture name="options basic0004" x="346" y="1" width="343" height="113" frameX="-0" frameY="-0" frameWidth="343" frameHeight="113"/>
8+
<SubTexture name="options basic0005" x="346" y="1" width="343" height="113" frameX="-0" frameY="-0" frameWidth="343" frameHeight="113"/>
9+
<SubTexture name="options basic0006" x="691" y="1" width="343" height="113" frameX="-0" frameY="-0" frameWidth="343" frameHeight="113"/>
10+
<SubTexture name="options basic0007" x="691" y="1" width="343" height="113" frameX="-0" frameY="-0" frameWidth="343" frameHeight="113"/>
11+
<SubTexture name="options basic0008" x="691" y="1" width="343" height="113" frameX="-0" frameY="-0" frameWidth="343" frameHeight="113"/>
12+
<SubTexture name="options white0000" x="1036" y="1" width="474" height="156" frameX="-0" frameY="15" frameWidth="474" frameHeight="157"/>
13+
<SubTexture name="options white0001" x="1512" y="1" width="465" height="156" frameX="-6" frameY="14" frameWidth="474" frameHeight="157"/>
14+
<SubTexture name="options white0002" x="1979" y="1" width="469" height="157" frameX="-4" frameY="15" frameWidth="474" frameHeight="157"/>
15+
</TextureAtlas>

0 commit comments

Comments
 (0)