Skip to content

Commit 155c3cb

Browse files
superlancelotsuperlancelot
committed
Merge remote-tracking branch 'origin/dev'
2 parents 077b96b + 8b72d19 commit 155c3cb

33 files changed

Lines changed: 3555 additions & 1854 deletions

‎ASLibraryDemos/assets/Cyborg_AnimationMixing.dbswf‎

-311 Bytes
Binary file not shown.

‎ASLibraryDemos/assets/Robot.dbswf‎

9.23 KB
Binary file not shown.

‎ASLibraryDemos/assets/Robot_output.swf‎

-9.12 KB
Binary file not shown.

‎ASLibraryDemos/assets/SpringBrother.dbswf‎

137 KB
Binary file not shown.

‎ASLibraryDemos/assets/Warrior_output/skeleton.xml‎

Lines changed: 1049 additions & 589 deletions
Large diffs are not rendered by default.

‎ASLibraryDemos/assets/Warrior_output/texture.png‎

-638 Bytes
Loading

‎ASLibraryDemos/assets/Warrior_output/texture.xml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
<TextureAtlas name="Warrior" width="512" height="512">
2-
<SubTexture name="warriorFolder/outerarm_upper" width="71" height="110" x="41" y="144"/>
3-
<SubTexture name="warriorFolder/outerarm_lower" width="61" height="81" x="449" y="0"/>
4-
<SubTexture name="warriorFolder/outerarm_hand" width="44" height="45" x="449" y="127"/>
5-
<SubTexture name="warriorFolder/lowerbody" width="106" height="126" x="247" y="0"/>
6-
<SubTexture name="warriorFolder/outerleg_foot" width="86" height="60" x="379" y="229"/>
7-
<SubTexture name="warriorFolder/outerleg_lower" width="66" height="125" x="311" y="131"/>
8-
<SubTexture name="warriorFolder/outerleg_upper" width="109" height="142" x="41" y="0"/>
9-
<SubTexture name="warriorFolder/upperbody" width="92" height="129" x="355" y="0"/>
10-
<SubTexture name="warriorFolder/head" width="65" height="96" x="379" y="131"/>
11-
<SubTexture name="warriorFolder/innerleg_foot" width="86" height="58" x="114" y="250"/>
12-
<SubTexture name="warriorFolder/innerleg_lower" width="62" height="131" x="247" y="128"/>
13-
<SubTexture name="warriorFolder/innerleg_upper" width="93" height="153" x="152" y="0"/>
14-
<SubTexture name="warriorFolder/innerweapon" width="39" height="333" x="0" y="0"/>
15-
<SubTexture name="warriorFolder/innerarm_upper" width="75" height="93" x="114" y="155"/>
16-
<SubTexture name="warriorFolder/innerarm_lower" width="80" height="57" x="202" y="261"/>
17-
<SubTexture name="warriorFolder/innerarm_hand" width="47" height="42" x="449" y="83"/>
1+
<TextureAtlas name="Warrior" imagePath="texture.png">
2+
<SubTexture name="warriorFolder/outerarm_upper" x="312" y="130" width="71" height="110"/>
3+
<SubTexture name="warriorFolder/outerarm_lower" x="385" y="227" width="61" height="81"/>
4+
<SubTexture name="warriorFolder/outerarm_hand" x="193" y="155" width="44" height="45"/>
5+
<SubTexture name="warriorFolder/lowerbody" x="244" y="0" width="106" height="126"/>
6+
<SubTexture name="warriorFolder/outerleg_foot" x="106" y="155" width="86" height="60"/>
7+
<SubTexture name="warriorFolder/outerleg_lower" x="244" y="127" width="66" height="125"/>
8+
<SubTexture name="warriorFolder/outerleg_upper" x="40" y="0" width="109" height="142"/>
9+
<SubTexture name="warriorFolder/upperbody" x="351" y="0" width="92" height="129"/>
10+
<SubTexture name="warriorFolder/head" x="40" y="144" width="65" height="96"/>
11+
<SubTexture name="warriorFolder/innerleg_foot" x="106" y="216" width="86" height="58"/>
12+
<SubTexture name="warriorFolder/innerleg_lower" x="444" y="0" width="62" height="131"/>
13+
<SubTexture name="warriorFolder/innerleg_upper" x="150" y="0" width="93" height="153"/>
14+
<SubTexture name="warriorFolder/innerweapon" x="0" y="0" width="39" height="333"/>
15+
<SubTexture name="warriorFolder/innerarm_upper" x="433" y="132" width="75" height="93"/>
16+
<SubTexture name="warriorFolder/innerarm_lower" x="193" y="253" width="80" height="57"/>
17+
<SubTexture name="warriorFolder/innerarm_hand" x="385" y="130" width="47" height="42"/>
1818
</TextureAtlas>

‎ASLibraryDemos/assets/Warrior_output/texture@0.3x.png‎

-1.79 KB
Loading

‎ASLibraryDemos/assets/Warrior_output/texture@0.3x.xml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
<TextureAtlas name="Warrior" width="128" height="128">
2-
<SubTexture name="warriorFolder/outerarm_upper" width="22" height="33" x="78" y="81"/>
3-
<SubTexture name="warriorFolder/outerarm_lower" width="19" height="25" x="57" y="79"/>
4-
<SubTexture name="warriorFolder/outerarm_hand" width="14" height="14" x="109" y="55"/>
5-
<SubTexture name="warriorFolder/lowerbody" width="32" height="38" x="79" y="0"/>
6-
<SubTexture name="warriorFolder/outerleg_foot" width="26" height="18" x="14" y="88"/>
7-
<SubTexture name="warriorFolder/outerleg_lower" width="20" height="38" x="35" y="48"/>
8-
<SubTexture name="warriorFolder/outerleg_upper" width="33" height="43" x="14" y="0"/>
9-
<SubTexture name="warriorFolder/upperbody" width="28" height="39" x="79" y="40"/>
10-
<SubTexture name="warriorFolder/head" width="20" height="29" x="57" y="48"/>
11-
<SubTexture name="warriorFolder/innerleg_foot" width="26" height="18" x="42" y="106"/>
12-
<SubTexture name="warriorFolder/innerleg_lower" width="19" height="40" x="14" y="45"/>
13-
<SubTexture name="warriorFolder/innerleg_upper" width="28" height="46" x="49" y="0"/>
14-
<SubTexture name="warriorFolder/innerweapon" width="12" height="100" x="0" y="0"/>
15-
<SubTexture name="warriorFolder/innerarm_upper" width="23" height="28" x="102" y="81"/>
16-
<SubTexture name="warriorFolder/innerarm_lower" width="24" height="18" x="0" y="108"/>
17-
<SubTexture name="warriorFolder/innerarm_hand" width="15" height="13" x="109" y="40"/>
1+
<TextureAtlas name="Warrior" imagePath="texture.png">
2+
<SubTexture name="warriorFolder/outerarm_upper" x="78" y="81" width="22" height="33"/>
3+
<SubTexture name="warriorFolder/outerarm_lower" x="57" y="79" width="19" height="25"/>
4+
<SubTexture name="warriorFolder/outerarm_hand" x="109" y="55" width="14" height="14"/>
5+
<SubTexture name="warriorFolder/lowerbody" x="79" y="0" width="32" height="38"/>
6+
<SubTexture name="warriorFolder/outerleg_foot" x="42" y="106" width="26" height="18"/>
7+
<SubTexture name="warriorFolder/outerleg_lower" x="35" y="48" width="20" height="38"/>
8+
<SubTexture name="warriorFolder/outerleg_upper" x="14" y="0" width="33" height="43"/>
9+
<SubTexture name="warriorFolder/upperbody" x="79" y="40" width="28" height="39"/>
10+
<SubTexture name="warriorFolder/head" x="57" y="48" width="20" height="29"/>
11+
<SubTexture name="warriorFolder/innerleg_foot" x="14" y="88" width="26" height="18"/>
12+
<SubTexture name="warriorFolder/innerleg_lower" x="14" y="45" width="19" height="40"/>
13+
<SubTexture name="warriorFolder/innerleg_upper" x="49" y="0" width="28" height="46"/>
14+
<SubTexture name="warriorFolder/innerweapon" x="0" y="0" width="12" height="100"/>
15+
<SubTexture name="warriorFolder/innerarm_upper" x="102" y="81" width="23" height="28"/>
16+
<SubTexture name="warriorFolder/innerarm_lower" x="0" y="108" width="24" height="18"/>
17+
<SubTexture name="warriorFolder/innerarm_hand" x="109" y="40" width="15" height="13"/>
1818
</TextureAtlas>

‎ASLibraryDemos/assets/Warrior_output/texture@0.5x.png‎

-1.09 KB
Loading

0 commit comments

Comments
 (0)