Merge remote-tracking branch 'origin/dev'

SkeletonAnimationLibraryDemos/assets/Knight/texture.json

@@ -0,0 +1 @@
+{"SubTexture":[{"name":"knightFolder/arrow_3","x":0,"width":83,"y":207,"height":25},{"name":"knightFolder/arrow_2","x":84,"width":83,"y":216,"height":18},{"name":"knightFolder/bow_3","x":182,"width":30,"y":0,"height":64},{"name":"knightFolder/bow_2","x":160,"width":20,"y":34,"height":50},{"name":"knightFolder/axe_2","x":0,"width":104,"y":125,"height":50},{"name":"knightFolder/axe_3","x":0,"width":106,"y":60,"height":64},{"name":"knightFolder/pike_3","x":0,"width":180,"y":0,"height":32},{"name":"knightFolder/pike_2","x":0,"width":159,"y":34,"height":24},{"name":"knightFolder/sword_3","x":106,"width":105,"y":136,"height":36},{"name":"knightFolder/sword_2","x":0,"width":90,"y":177,"height":28},{"name":"knightFolder/bow_a","x":243,"width":8,"y":80,"height":8},{"name":"knightFolder/bow_1","x":214,"width":14,"y":50,"height":50},{"name":"knightFolder/arrow_1","x":0,"width":82,"y":234,"height":10},{"name":"knightFolder/bow_b","x":230,"width":1,"y":50,"height":30},{"name":"knightFolder/axe_1","x":106,"width":85,"y":174,"height":40},{"name":"knightFolder/pike_1","x":108,"width":139,"y":118,"height":16},{"name":"knightFolder/sword_1","x":168,"width":80,"y":216,"height":18},{"name":"knightFolder/horseEye","x":182,"width":13,"y":66,"height":13},{"name":"knightFolder/horseHead_","x":214,"width":40,"y":0,"height":48},{"name":"knightFolder/body","x":233,"width":14,"y":62,"height":16},{"name":"knightFolder/leg","x":196,"width":8,"y":66,"height":16},{"name":"knightFolder/head","x":108,"width":44,"y":60,"height":40},{"name":"knightFolder/arm","x":233,"width":20,"y":50,"height":10},{"name":"knightFolder/horseBody","x":154,"width":40,"y":96,"height":20},{"name":"knightFolder/horseTail","x":233,"width":8,"y":80,"height":12},{"name":"knightFolder/horseLeg","x":182,"width":8,"y":80,"height":14}],"name":"Knight"}

SkeletonAnimationLibraryDemos/assets/Warrior_output/texture@2x.xml

@@ -0,0 +1,18 @@
+<TextureAtlas name="Warrior" width="1024" height="1024">
+  <SubTexture name="warriorFolder/outerarm_upper" width="142" height="220" x="622" y="260"/>
+  <SubTexture name="warriorFolder/outerarm_lower" width="122" height="162" x="766" y="452"/>
+  <SubTexture name="warriorFolder/outerarm_hand" width="88" height="90" x="386" y="308"/>
+  <SubTexture name="warriorFolder/lowerbody" width="212" height="252" x="488" y="0"/>
+  <SubTexture name="warriorFolder/outerleg_foot" width="172" height="120" x="212" y="308"/>
+  <SubTexture name="warriorFolder/outerleg_lower" width="132" height="250" x="488" y="254"/>
+  <SubTexture name="warriorFolder/outerleg_upper" width="218" height="284" x="80" y="0"/>
+  <SubTexture name="warriorFolder/upperbody" width="184" height="258" x="702" y="0"/>
+  <SubTexture name="warriorFolder/head" width="130" height="192" x="80" y="286"/>
+  <SubTexture name="warriorFolder/innerleg_foot" width="172" height="116" x="212" y="430"/>
+  <SubTexture name="warriorFolder/innerleg_lower" width="124" height="262" x="888" y="0"/>
+  <SubTexture name="warriorFolder/innerleg_upper" width="186" height="306" x="300" y="0"/>
+  <SubTexture name="warriorFolder/innerweapon" width="78" height="666" x="0" y="0"/>
+  <SubTexture name="warriorFolder/innerarm_upper" width="150" height="186" x="862" y="264"/>
+  <SubTexture name="warriorFolder/innerarm_lower" width="160" height="114" x="386" y="506"/>
+  <SubTexture name="warriorFolder/innerarm_hand" width="94" height="84" x="766" y="260"/>
+</TextureAtlas>

SkeletonAnimationLibraryDemos/assets/images/aeon.tps

@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<data version="1.0">
+    <struct type="Settings">
+        <key>variation</key>
+        <string>main</string>
+        <key>verbose</key>
+        <false/>
+        <key>autoSDSettings</key>
+        <array/>
+        <key>allowRotation</key>
+        <false/>
+        <key>quiet</key>
+        <false/>
+        <key>premultiplyAlpha</key>
+        <false/>
+        <key>shapeDebug</key>
+        <false/>
+        <key>dpi</key>
+        <uint>72</uint>
+        <key>allowFreeSize</key>
+        <false/>
+        <key>dataFormat</key>
+        <string>sparrow</string>
+        <key>textureFileName</key>
+        <filename>aeon.png</filename>
+        <key>flipPVR</key>
+        <false/>
+        <key>ditherType</key>
+        <enum type="SettingsBase::DitherType">NearestNeighbour</enum>
+        <key>backgroundColor</key>
+        <uint>0</uint>
+        <key>libGdx</key>
+        <struct type="LibGDX">
+            <key>filtering</key>
+            <struct type="LibGDXFiltering">
+                <key>x</key>
+                <enum type="LibGDXFiltering::Filtering">Linear</enum>
+                <key>y</key>
+                <enum type="LibGDXFiltering::Filtering">Linear</enum>
+            </struct>
+        </struct>
+        <key>shapePadding</key>
+        <uint>2</uint>
+        <key>jpgQuality</key>
+        <uint>80</uint>
+        <key>textureSubPath</key>
+        <string></string>
+        <key>textureFormat</key>
+        <enum type="SettingsBase::TextureFormat">png</enum>
+        <key>borderPadding</key>
+        <uint>2</uint>
+        <key>maxTextureSize</key>
+        <QSize>
+            <key>width</key>
+            <int>2048</int>
+            <key>height</key>
+            <int>2048</int>
+        </QSize>
+        <key>fixedTextureSize</key>
+        <QSize>
+            <key>width</key>
+            <int>-1</int>
+            <key>height</key>
+            <int>-1</int>
+        </QSize>
+        <key>reduceBorderArtifacts</key>
+        <false/>
+        <key>algorithmSettings</key>
+        <struct type="AlgorithmSettings">
+            <key>algorithm</key>
+            <enum type="AlgorithmSettings::AlgorithmId">MaxRects</enum>
+            <key>freeSizeMode</key>
+            <enum type="AlgorithmSettings::AlgorithmFreeSizeMode">Best</enum>
+            <key>maxRects</key>
+            <struct type="AlgorithmMaxRectsSettings">
+                <key>heuristic</key>
+                <enum type="AlgorithmMaxRectsSettings::Heuristic">Best</enum>
+            </struct>
+            <key>basic</key>
+            <struct type="AlgorithmBasicSettings">
+                <key>sortBy</key>
+                <enum type="AlgorithmBasicSettings::SortBy">Best</enum>
+                <key>order</key>
+                <enum type="AlgorithmBasicSettings::Order">Ascending</enum>
+            </struct>
+        </struct>
+        <key>andEngine</key>
+        <struct type="AndEngine">
+            <key>minFilter</key>
+            <enum type="AndEngine::MinFilter">Linear</enum>
+            <key>packageName</key>
+            <string>Texture</string>
+            <key>javaFileName</key>
+            <filename>aeon.java</filename>
+            <key>wrap</key>
+            <struct type="AndEngineWrap">
+                <key>s</key>
+                <enum type="AndEngineWrap::Wrap">Clamp</enum>
+                <key>t</key>
+                <enum type="AndEngineWrap::Wrap">Clamp</enum>
+            </struct>
+            <key>magFilter</key>
+            <enum type="AndEngine::MagFilter">MagLinear</enum>
+        </struct>
+        <key>dataFileName</key>
+        <filename>aeon.xml</filename>
+        <key>defaultExtension</key>
+        <string></string>
+        <key>outputFormat</key>
+        <enum type="SettingsBase::OutputFormat">RGBA8888</enum>
+        <key>autoAliasEnabled</key>
+        <true/>
+        <key>trimSpriteNames</key>
+        <false/>
+        <key>globalSpriteSettings</key>
+        <struct type="SpriteSettings">
+            <key>scale</key>
+            <double>1</double>
+            <key>scaleMode</key>
+            <enum type="ScaleMode">Smooth</enum>
+            <key>crop</key>
+            <false/>
+            <key>innerPadding</key>
+            <uint>0</uint>
+            <key>extrude</key>
+            <uint>1</uint>
+            <key>trimThreshold</key>
+            <uint>1</uint>
+            <key>trim</key>
+            <true/>
+            <key>heuristicMask</key>
+            <false/>
+        </struct>
+        <key>fileList</key>
+        <array>
+            <filename>aeon</filename>
+        </array>
+        <key>ignoreFileList</key>
+        <array/>
+        <key>replaceList</key>
+        <array/>
+        <key>commonDivisorX</key>
+        <uint>1</uint>
+        <key>commonDivisorY</key>
+        <uint>1</uint>
+    </struct>
+</data>

SkeletonAnimationLibraryDemos/assets/images/aeon.xml

@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with TexturePacker http://texturepacker.com-->
+<!-- $TexturePacker:SmartUpdate:135537addc2564d0e3549eb6aa363627$ -->
+<TextureAtlas imagePath="aeon.png">
+    <SubTexture name="arial_0" x="19" y="85" width="256" height="28" frameX="0" frameY="0" frameWidth="256" frameHeight="64"/>
+    <SubTexture name="button-disabled-skin" x="166" y="55" width="82" height="22"/>
+    <SubTexture name="button-down-skin" x="217" y="3" width="82" height="22"/>
+    <SubTexture name="button-hover-skin" x="147" y="29" width="82" height="22"/>
+    <SubTexture name="button-selected-disabled-skin" x="303" y="3" width="64" height="22"/>
+    <SubTexture name="button-selected-down-skin" x="301" y="29" width="64" height="22"/>
+    <SubTexture name="button-selected-hover-skin" x="252" y="55" width="64" height="22"/>
+    <SubTexture name="button-selected-up-skin" x="233" y="29" width="64" height="22"/>
+    <SubTexture name="button-up-skin" x="61" y="29" width="82" height="22"/>
+    <SubTexture name="check-disabled-icon" x="396" y="57" width="14" height="14"/>
+    <SubTexture name="check-down-icon" x="388" y="83" width="14" height="14"/>
+    <SubTexture name="check-hover-icon" x="407" y="3" width="14" height="14"/>
+    <SubTexture name="check-selected-disabled-icon" x="405" y="21" width="14" height="14"/>
+    <SubTexture name="check-selected-down-icon" x="394" y="39" width="14" height="14"/>
+    <SubTexture name="check-selected-hover-icon" x="378" y="65" width="14" height="14"/>
+    <SubTexture name="check-selected-up-icon" x="370" y="109" width="14" height="14"/>
+    <SubTexture name="check-up-icon" x="370" y="91" width="14" height="14"/>
+    <SubTexture name="grouped-list-header-background-skin" x="11" y="85" width="4" height="30"/>
+    <SubTexture name="header-background-skin" x="3" y="86" width="4" height="30"/>
+    <SubTexture name="horizontal-scroll-bar-decrement-button-icon" x="73" y="117" width="4" height="7" frameX="0" frameY="0" frameWidth="6" frameHeight="7"/>
+    <SubTexture name="horizontal-scroll-bar-increment-button-icon" x="65" y="117" width="4" height="7" frameX="-2" frameY="0" frameWidth="6" frameHeight="7"/>
+    <SubTexture name="horizontal-scroll-bar-step-button-disabled-skin" x="297" y="100" width="14" height="15"/>
+    <SubTexture name="horizontal-scroll-bar-step-button-down-skin" x="297" y="81" width="14" height="15"/>
+    <SubTexture name="horizontal-scroll-bar-step-button-hover-skin" x="279" y="100" width="14" height="15"/>
+    <SubTexture name="horizontal-scroll-bar-step-button-up-skin" x="279" y="81" width="14" height="15"/>
+    <SubTexture name="horizontal-scroll-bar-thumb-down-skin" x="425" y="3" width="52" height="13" frameX="0" frameY="0" frameWidth="52" frameHeight="15"/>
+    <SubTexture name="horizontal-scroll-bar-thumb-hover-skin" x="423" y="21" width="52" height="13" frameX="0" frameY="0" frameWidth="52" frameHeight="15"/>
+    <SubTexture name="horizontal-scroll-bar-thumb-icon" x="3" y="120" width="7" height="5"/>
+    <SubTexture name="horizontal-scroll-bar-thumb-up-skin" x="412" y="39" width="52" height="13" frameX="0" frameY="0" frameWidth="52" frameHeight="15"/>
+    <SubTexture name="horizontal-scroll-bar-track-skin" x="315" y="81" width="4" height="15"/>
+    <SubTexture name="hslider-thumb-disabled-skin" x="479" y="37" width="13" height="13"/>
+    <SubTexture name="hslider-thumb-down-skin" x="496" y="20" width="13" height="13"/>
+    <SubTexture name="hslider-thumb-hover-skin" x="479" y="20" width="13" height="13"/>
+    <SubTexture name="hslider-thumb-up-skin" x="481" y="3" width="13" height="13"/>
+    <SubTexture name="hslider-track-skin" x="154" y="117" width="79" height="3"/>
+    <SubTexture name="item-renderer-hover-skin" x="146" y="117" width="4" height="4"/>
+    <SubTexture name="item-renderer-selected-up-skin" x="138" y="117" width="4" height="4"/>
+    <SubTexture name="item-renderer-up-skin" x="130" y="117" width="4" height="4"/>
+    <SubTexture name="list-accessory-drill-down-icon" x="48" y="117" width="4" height="8"/>
+    <SubTexture name="page-indicator-normal-skin" x="36" y="117" width="8" height="8"/>
+    <SubTexture name="page-indicator-selected-skin" x="24" y="117" width="8" height="8"/>
+    <SubTexture name="panel-background-skin" x="389" y="3" width="14" height="14"/>
+    <SubTexture name="picker-list-disabled-icon" x="387" y="21" width="14" height="14"/>
+    <SubTexture name="picker-list-down-icon" x="376" y="47" width="14" height="14"/>
+    <SubTexture name="picker-list-hover-icon" x="376" y="47" width="14" height="14"/>
+    <SubTexture name="picker-list-up-icon" x="352" y="109" width="14" height="14"/>
+    <SubTexture name="progress-bar-fill-skin" x="122" y="117" width="4" height="4"/>
+    <SubTexture name="radio-disabled-icon" x="360" y="73" width="14" height="14"/>
+    <SubTexture name="radio-down-icon" x="352" y="91" width="14" height="14"/>
+    <SubTexture name="radio-hover-icon" x="371" y="3" width="14" height="14"/>
+    <SubTexture name="radio-selected-disabled-icon" x="369" y="29" width="14" height="14"/>
+    <SubTexture name="radio-selected-down-icon" x="334" y="109" width="14" height="14"/>
+    <SubTexture name="radio-selected-hover-icon" x="358" y="55" width="14" height="14"/>
+    <SubTexture name="radio-selected-up-icon" x="342" y="73" width="14" height="14"/>
+    <SubTexture name="radio-up-icon" x="334" y="91" width="14" height="14"/>
+    <SubTexture name="simple-border-background-skin" x="14" y="119" width="6" height="6"/>
+    <SubTexture name="text-input-background-disabled-skin" x="61" y="3" width="152" height="22"/>
+    <SubTexture name="text-input-background-skin" x="10" y="59" width="152" height="22"/>
+    <SubTexture name="vertical-scroll-bar-decrement-button-icon" x="111" y="117" width="7" height="4" frameX="0" frameY="0" frameWidth="7" frameHeight="6"/>
+    <SubTexture name="vertical-scroll-bar-increment-button-icon" x="100" y="117" width="7" height="4" frameX="0" frameY="-2" frameWidth="7" frameHeight="6"/>
+    <SubTexture name="vertical-scroll-bar-step-button-disabled-skin" x="339" y="55" width="15" height="14"/>
+    <SubTexture name="vertical-scroll-bar-step-button-down-skin" x="323" y="73" width="15" height="14"/>
+    <SubTexture name="vertical-scroll-bar-step-button-hover-skin" x="315" y="100" width="15" height="14"/>
+    <SubTexture name="vertical-scroll-bar-step-button-up-skin" x="320" y="55" width="15" height="14"/>
+    <SubTexture name="vertical-scroll-bar-thumb-down-skin" x="44" y="3" width="13" height="52" frameX="-1" frameY="0" frameWidth="15" frameHeight="52"/>
+    <SubTexture name="vertical-scroll-bar-thumb-hover-skin" x="27" y="3" width="13" height="52" frameX="-1" frameY="0" frameWidth="15" frameHeight="52"/>
+    <SubTexture name="vertical-scroll-bar-thumb-icon" x="56" y="117" width="5" height="7"/>
+    <SubTexture name="vertical-scroll-bar-thumb-up-skin" x="10" y="3" width="13" height="52" frameX="-1" frameY="0" frameWidth="15" frameHeight="52"/>
+    <SubTexture name="vertical-scroll-bar-track-skin" x="81" y="117" width="15" height="4"/>
+    <SubTexture name="vslider-thumb-disabled-skin" x="414" y="56" width="13" height="13"/>
+    <SubTexture name="vslider-thumb-down-skin" x="406" y="75" width="13" height="13"/>
+    <SubTexture name="vslider-thumb-hover-skin" x="405" y="101" width="13" height="13"/>
+    <SubTexture name="vslider-thumb-up-skin" x="388" y="101" width="13" height="13"/>
+    <SubTexture name="vslider-track-skin" x="3" y="3" width="3" height="79"/>
+</TextureAtlas>

SkeletonAnimationLibraryDemos/assets/particles/particle.pex

@@ -0,0 +1,38 @@
+<particleEmitterConfig>
+  <texture name="texture.png"/>
+  <sourcePosition x="300.00" y="300.00"/>
+  <sourcePositionVariance x="0" y="0"/>
+  <speed value="40"/>
+  <speedVariance value="33.33"/>
+  <particleLifeSpan value="0.48"/>
+  <particleLifespanVariance value="1.1300000000000001"/>
+  <angle value="270"/>
+  <angleVariance value="0"/>
+  <gravity x="0" y="0"/>
+  <radialAcceleration value="0"/>
+  <tangentialAcceleration value="0"/>
+  <radialAccelVariance value="0"/>
+  <tangentialAccelVariance value="0"/>
+  <startColor red="1" green="0" blue="0" alpha="1"/>
+  <startColorVariance red="0" green="0" blue="0" alpha="0"/>
+  <finishColor red="1" green="0" blue="0" alpha="0"/>
+  <finishColorVariance red="0" green="0" blue="0" alpha="0"/>
+  <maxParticles value="29.650000000000002"/>
+  <startParticleSize value="21.93"/>
+  <startParticleSizeVariance value="34.84"/>
+  <finishParticleSize value="4.2700000000000005"/>
+  <FinishParticleSizeVariance value="5"/>
+  <duration value="-1.00"/>
+  <emitterType value="0"/>
+  <maxRadius value="108.97"/>
+  <maxRadiusVariance value="0"/>
+  <minRadius value="0"/>
+  <rotatePerSecond value="0"/>
+  <rotatePerSecondVariance value="0"/>
+  <blendFuncSource value="770"/>
+  <blendFuncDestination value="1"/>
+  <rotationStart value="0.00"/>
+  <rotationStartVariance value="0"/>
+  <rotationEnd value="0"/>
+  <rotationEndVariance value="0"/>
+</particleEmitterConfig>

SkeletonAnimationLibraryDemos/src/Dragon_ChaseStarling.as

@@ -97,11 +97,16 @@
 
 		private function onMouseMoveHandler(_e:TouchEvent):void
 		{
-			var _p:Point = _e.getTouch(stage).getLocation(stage);
-			mouseX = _p.x;
-			mouseY = _p.y;
-			starlingBird.x=mouseX-73;
-			starlingBird.y=mouseY-73;
+			try
+			{
+				var _p:Point = _e.getTouch(stage).getLocation(stage);
+				mouseX = _p.x;
+				mouseY = _p.y;
+				starlingBird.x=mouseX-73;
+				starlingBird.y=mouseY-73;
+			}
+			catch(e:Error)
+			{}
 		}
 		private function updateBehavior(dir:int):void 
 		{

SkeletonAnimationLibraryDemos/src/Example_Animation.as → SkeletonAnimationLibraryDemos/src/Example_AnimationCopy.as

@@ -5,9 +5,9 @@
 	import starling.core.Starling;
 
     [SWF(width="800", height="600", frameRate="30", backgroundColor="#cccccc")]
-	public class Example_Animation extends flash.display.Sprite {
+	public class Example_AnimationCopy extends flash.display.Sprite {
 
-		public function Example_Animation() {
+		public function Example_AnimationCopy() {
 			stage.addEventListener(MouseEvent.CLICK, mouseHandler);
 			starlingInit();
 		}