Josh Engebretson 11 years ago
parent
commit
a629e59618

+ 41 - 26
PhysicsPlatformer/Resources/Components/Avatar.js

@@ -63,34 +63,51 @@ function start() {
 function handleAnimation() {
 function handleAnimation() {
 
 
     var vel = body.linearVelocity;
     var vel = body.linearVelocity;
+    
+    if (contactCount ) {
 
 
-    if (vel[0] < -0.75) {
-        if (!flipped) {
-            sprite.flipX = true;
-            flipped = true;
-
-        }
-        if (anim != "Run") {
-            sprite.setAnimation(animationSet, "Run");
-            anim = "Run";
-        }
-    } else if (vel[0] > 0.75) {
-
-        if (flipped) {
-            sprite.flipX = false;
-            flipped = false;
-
-        }
-        if (anim != "Run") {
-            sprite.setAnimation(animationSet, "Run");
-            anim = "Run";
+        if (vel[0] < -0.75) {
+            if (!flipped) {
+                sprite.flipX = true;
+                flipped = true;
+    
+            }
+            if (anim != "Run") {
+                sprite.setAnimation(animationSet, "Run");
+                anim = "Run";
+            }
+        } else if (vel[0] > 0.75) {
+    
+            if (flipped) {
+                sprite.flipX = false;
+                flipped = false;
+    
+            }
+            if (anim != "Run") {
+                sprite.setAnimation(animationSet, "Run");
+                anim = "Run";
+            }
+        } else {
+            if (anim != "Idle") {
+                sprite.setAnimation(animationSet, "Idle");
+                anim = "Idle";
+            }
         }
         }
     } else {
     } else {
-        if (anim != "Idle") {
-            sprite.setAnimation(animationSet, "Idle");
-            anim = "Idle";
-        }
+        
+        if ( vel[1] > 0 && anim != "Jump")
+            {
+                sprite.setAnimation(animationSet, "Jump");
+                anim = "Jump";
+            }
+        else if ( vel[1] < 0 && anim != "Land")
+            {
+                sprite.setAnimation(animationSet, "Land");
+                anim = "Land";
+            }
+        
     }
     }
+    
 
 
 
 
 }
 }
@@ -140,8 +157,6 @@ function handleInput(timeStep) {
     if (camera.zoom < .75)
     if (camera.zoom < .75)
         camera.zoom = .75;
         camera.zoom = .75;
 
 
-    print(camera.zoom);
-
     if (left && vel[0] > -MAX_VELOCITY) {
     if (left && vel[0] > -MAX_VELOCITY) {
         body.applyLinearImpulse([-2, 0], pos, true);
         body.applyLinearImpulse([-2, 0], pos, true);
     } else if (right && vel[0] < MAX_VELOCITY) {
     } else if (right && vel[0] < MAX_VELOCITY) {

+ 46 - 0
PhysicsPlatformer/Resources/Components/UI.js

@@ -0,0 +1,46 @@
+gameui = GetGameUI();
+
+var hearts = [];
+
+var count = 0;
+
+function update(timeStep) {
+
+
+}
+
+function start() {
+
+    // Construct new Text object
+    scoreText = new Atomic.Text();
+
+    scoreText.text = "Score: 0";
+    var font = cache.getResource("Font", "Fonts/Anonymous Pro.ttf");
+
+    scoreText.setFont(font, 30);
+    scoreText.color = [0, 1, 0, 1];
+
+    //-- Align Text center-screen
+    scoreText.horizontalAlignment = Atomic.HA_LEFT;
+    scoreText.verticalAlignment = Atomic.VA_TOP;
+
+    gameui.addChild(scoreText);
+
+    var heartContainer = new Atomic.UIElement();
+    heartContainer.setPosition(-16, 48);
+    heartContainer.horizontalAlignment = Atomic.HA_RIGHT;
+    heartContainer.layoutMode = Atomic.LM_HORIZONTAL;
+    heartContainer.layoutSpacing = 16;
+    gameui.addChild(heartContainer);
+
+    var heart = cache.getResource("Texture2D", "UI/UI_HEART_FULL.png");
+
+    for (var i = 0; i < 3; i++) {
+        image = new Atomic.Sprite();
+        image.setTexture(heart);
+        image.setFixedSize(48, 48);
+        heartContainer.addChild(image);
+        hearts.push(image);
+    }
+
+}

+ 4 - 0
PhysicsPlatformer/Resources/PhysicsPlatformer.js

@@ -49,6 +49,10 @@ function CreateScene() {
     var viewport = new Atomic.Viewport(scene, camera);
     var viewport = new Atomic.Viewport(scene, camera);
     renderer.setViewport(0, viewport);
     renderer.setViewport(0, viewport);
     
     
+    uiNode = scene.createChild("UI");
+    uiNode.createJSComponent("UI");
+
+    
     levelNode = scene.createChild("Level");
     levelNode = scene.createChild("Level");
     levelNode.createJSComponent("Level");
     levelNode.createJSComponent("Level");
     avatarNode = scene.createChild("Avatar");
     avatarNode = scene.createChild("Avatar");

BIN
PhysicsPlatformer/Resources/Sprites/GoldIcon.png


+ 10 - 0
PhysicsPlatformer/Resources/Sprites/GoldIcon.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with TexturePacker http://texturepacker.com-->
+<!-- $TexturePacker:SmartUpdate:86ac5203aadd5795b3e45516bcd6834b$ -->
+<TextureAtlas imagePath="GoldIcon.png">
+    <SubTexture name="1" x="2" y="2" width="60" height="60" frameX="-2" frameY="-2" frameWidth="64" frameHeight="64"/>
+    <SubTexture name="2" x="64" y="2" width="42" height="60" frameX="-11" frameY="-2" frameWidth="64" frameHeight="64"/>
+    <SubTexture name="3" x="108" y="2" width="17" height="60"/>
+    <SubTexture name="4" x="2" y="64" width="58" height="60" frameX="-3" frameY="-2" frameWidth="64" frameHeight="64"/>
+    <SubTexture name="5" x="62" y="64" width="42" height="60" frameX="-11" frameY="-1" frameWidth="64" frameHeight="64"/>
+</TextureAtlas>

+ 103 - 21
PhysicsPlatformer/Resources/Sprites/Hero/Hero.scml

@@ -21,6 +21,16 @@
         <file id="17" name="Run__006.png" width="415" height="507" pivot_x="0" pivot_y="1"/>
         <file id="17" name="Run__006.png" width="415" height="507" pivot_x="0" pivot_y="1"/>
         <file id="18" name="Run__007.png" width="415" height="507" pivot_x="0" pivot_y="1"/>
         <file id="18" name="Run__007.png" width="415" height="507" pivot_x="0" pivot_y="1"/>
         <file id="19" name="Run__008.png" width="415" height="507" pivot_x="0" pivot_y="1"/>
         <file id="19" name="Run__008.png" width="415" height="507" pivot_x="0" pivot_y="1"/>
+        <file id="20" name="Jump__005.png" width="407" height="536" pivot_x="0" pivot_y="1"/>
+        <file id="21" name="Jump__000.png" width="407" height="536" pivot_x="0" pivot_y="1"/>
+        <file id="22" name="Jump__001.png" width="407" height="536" pivot_x="0" pivot_y="1"/>
+        <file id="23" name="Jump__002.png" width="407" height="536" pivot_x="0" pivot_y="1"/>
+        <file id="24" name="Jump__003.png" width="407" height="536" pivot_x="0" pivot_y="1"/>
+        <file id="25" name="Jump__004.png" width="407" height="536" pivot_x="0" pivot_y="1"/>
+        <file id="26" name="Jump__006.png" width="407" height="536" pivot_x="0" pivot_y="1"/>
+        <file id="27" name="Jump__007.png" width="407" height="536" pivot_x="0" pivot_y="1"/>
+        <file id="28" name="Jump__008.png" width="407" height="536" pivot_x="0" pivot_y="1"/>
+        <file id="29" name="Jump__009.png" width="407" height="536" pivot_x="0" pivot_y="1"/>
     </folder>
     </folder>
     <entity id="0" name="Hero">
     <entity id="0" name="Hero">
         <animation id="0" name="Run" length="750" interval="100">
         <animation id="0" name="Run" length="750" interval="100">
@@ -61,38 +71,110 @@
             </mainline>
             </mainline>
             <timeline id="0" name="Run__000">
             <timeline id="0" name="Run__000">
                 <key id="0" spin="0">
                 <key id="0" spin="0">
-                    <object folder="0" file="11" x="-41.75" y="76.75"/>
+                    <object folder="0" file="11" x="-41.75" y="76.75" angle="0"/>
                 </key>
                 </key>
                 <key id="1" time="75" spin="0">
                 <key id="1" time="75" spin="0">
-                    <object folder="0" file="12" x="-41.75" y="76.75"/>
+                    <object folder="0" file="12" x="-41.75" y="76.75" angle="0"/>
                 </key>
                 </key>
                 <key id="2" time="150" spin="0">
                 <key id="2" time="150" spin="0">
-                    <object folder="0" file="13" x="-41.75" y="76.75"/>
+                    <object folder="0" file="13" x="-41.75" y="76.75" angle="0"/>
                 </key>
                 </key>
                 <key id="3" time="225" spin="0">
                 <key id="3" time="225" spin="0">
-                    <object folder="0" file="14" x="-41.75" y="76.75"/>
+                    <object folder="0" file="14" x="-41.75" y="76.75" angle="0"/>
                 </key>
                 </key>
                 <key id="4" time="300" spin="0">
                 <key id="4" time="300" spin="0">
-                    <object folder="0" file="15" x="-41.75" y="76.75"/>
+                    <object folder="0" file="15" x="-41.75" y="76.75" angle="0"/>
                 </key>
                 </key>
                 <key id="5" time="375" spin="0">
                 <key id="5" time="375" spin="0">
-                    <object folder="0" file="16" x="-41.75" y="76.75"/>
+                    <object folder="0" file="16" x="-41.75" y="76.75" angle="0"/>
                 </key>
                 </key>
                 <key id="6" time="450" spin="0">
                 <key id="6" time="450" spin="0">
-                    <object folder="0" file="17" x="-41.75" y="76.75"/>
+                    <object folder="0" file="17" x="-41.75" y="76.75" angle="0"/>
                 </key>
                 </key>
                 <key id="7" time="525" spin="0">
                 <key id="7" time="525" spin="0">
-                    <object folder="0" file="18" x="-41.75" y="76.75"/>
+                    <object folder="0" file="18" x="-41.75" y="76.75" angle="0"/>
                 </key>
                 </key>
                 <key id="8" time="600" spin="0">
                 <key id="8" time="600" spin="0">
-                    <object folder="0" file="19" x="-41.75" y="76.75"/>
+                    <object folder="0" file="19" x="-41.75" y="76.75" angle="0"/>
                 </key>
                 </key>
                 <key id="9" time="675" spin="0">
                 <key id="9" time="675" spin="0">
-                    <object folder="0" file="10" x="-41.75" y="76.75"/>
+                    <object folder="0" file="10" x="-41.75" y="76.75" angle="0"/>
                 </key>
                 </key>
             </timeline>
             </timeline>
         </animation>
         </animation>
-        <animation id="1" name="Idle" length="1000" interval="100">
+        <animation id="1" name="Jump" length="250" interval="100" looping="false">
+            <mainline>
+                <key id="0">
+                    <object_ref id="0" timeline="0" key="0" z_index="0"/>
+                </key>
+                <key id="1" time="41">
+                    <object_ref id="0" timeline="0" key="1" z_index="0"/>
+                </key>
+                <key id="2" time="83">
+                    <object_ref id="0" timeline="0" key="2" z_index="0"/>
+                </key>
+                <key id="3" time="125">
+                    <object_ref id="0" timeline="0" key="3" z_index="0"/>
+                </key>
+                <key id="4" time="166">
+                    <object_ref id="0" timeline="0" key="4" z_index="0"/>
+                </key>
+                <key id="5" time="208">
+                    <object_ref id="0" timeline="0" key="5" z_index="0"/>
+                </key>
+            </mainline>
+            <timeline id="0" name="Jump__000">
+                <key id="0" spin="0">
+                    <object folder="0" file="21" x="-41.75" y="76.75"/>
+                </key>
+                <key id="1" time="41" spin="0">
+                    <object folder="0" file="22" x="-41.75" y="76.75"/>
+                </key>
+                <key id="2" time="83" spin="0">
+                    <object folder="0" file="23" x="-41.75" y="76.75"/>
+                </key>
+                <key id="3" time="125" spin="0">
+                    <object folder="0" file="24" x="-41.75" y="76.75"/>
+                </key>
+                <key id="4" time="166" spin="0">
+                    <object folder="0" file="25" x="-41.75" y="76.75"/>
+                </key>
+                <key id="5" time="250" spin="0">
+                    <object folder="0" file="20" x="-41.75" y="76.75"/>
+                </key>
+            </timeline>
+        </animation>
+        <animation id="2" name="Land" length="250" interval="100" looping="false">
+            <mainline>
+                <key id="0">
+                    <object_ref id="0" timeline="0" key="0" z_index="0"/>
+                </key>
+                <key id="1" time="62">
+                    <object_ref id="0" timeline="0" key="1" z_index="0"/>
+                </key>
+                <key id="2" time="125">
+                    <object_ref id="0" timeline="0" key="2" z_index="0"/>
+                </key>
+                <key id="3" time="187">
+                    <object_ref id="0" timeline="0" key="3" z_index="0"/>
+                </key>
+            </mainline>
+            <timeline id="0" name="Jump__006">
+                <key id="0" spin="0">
+                    <object folder="0" file="26" x="-41.75" y="76.75"/>
+                </key>
+                <key id="1" time="62" spin="0">
+                    <object folder="0" file="27" x="-41.75" y="76.75"/>
+                </key>
+                <key id="2" time="125" spin="0">
+                    <object folder="0" file="28" x="-41.75" y="76.75"/>
+                </key>
+                <key id="3" time="250" spin="0">
+                    <object folder="0" file="29" x="-41.75" y="76.75"/>
+                </key>
+            </timeline>
+        </animation>
+        <animation id="3" name="Idle" length="1000" interval="100">
             <mainline>
             <mainline>
                 <key id="0">
                 <key id="0">
                     <object_ref id="0" timeline="0" key="0" z_index="0"/>
                     <object_ref id="0" timeline="0" key="0" z_index="0"/>
@@ -127,34 +209,34 @@
             </mainline>
             </mainline>
             <timeline id="0" name="Idle">
             <timeline id="0" name="Idle">
                 <key id="0" spin="0">
                 <key id="0" spin="0">
-                    <object folder="0" file="1" x="-41.75" y="76.75"/>
+                    <object folder="0" file="1" x="-41.75" y="76.75" angle="0"/>
                 </key>
                 </key>
                 <key id="1" time="100" spin="0">
                 <key id="1" time="100" spin="0">
-                    <object folder="0" file="2" x="-41.75" y="76.75"/>
+                    <object folder="0" file="2" x="-41.75" y="76.75" angle="0"/>
                 </key>
                 </key>
                 <key id="2" time="200" spin="0">
                 <key id="2" time="200" spin="0">
-                    <object folder="0" file="3" x="-41.75" y="76.75"/>
+                    <object folder="0" file="3" x="-41.75" y="76.75" angle="0"/>
                 </key>
                 </key>
                 <key id="3" time="300" spin="0">
                 <key id="3" time="300" spin="0">
-                    <object folder="0" file="4" x="-41.75" y="76.75"/>
+                    <object folder="0" file="4" x="-41.75" y="76.75" angle="0"/>
                 </key>
                 </key>
                 <key id="4" time="400" spin="0">
                 <key id="4" time="400" spin="0">
-                    <object folder="0" file="5" x="-41.75" y="76.75"/>
+                    <object folder="0" file="5" x="-41.75" y="76.75" angle="0"/>
                 </key>
                 </key>
                 <key id="5" time="500" spin="0">
                 <key id="5" time="500" spin="0">
-                    <object folder="0" file="6" x="-41.75" y="76.75"/>
+                    <object folder="0" file="6" x="-41.75" y="76.75" angle="0"/>
                 </key>
                 </key>
                 <key id="6" time="600" spin="0">
                 <key id="6" time="600" spin="0">
-                    <object folder="0" file="7" x="-41.75" y="76.75"/>
+                    <object folder="0" file="7" x="-41.75" y="76.75" angle="0"/>
                 </key>
                 </key>
                 <key id="7" time="700" spin="0">
                 <key id="7" time="700" spin="0">
-                    <object folder="0" file="8" x="-41.75" y="76.75"/>
+                    <object folder="0" file="8" x="-41.75" y="76.75" angle="0"/>
                 </key>
                 </key>
                 <key id="8" time="800" spin="0">
                 <key id="8" time="800" spin="0">
-                    <object folder="0" file="9" x="-41.75" y="76.75"/>
+                    <object folder="0" file="9" x="-41.75" y="76.75" angle="0"/>
                 </key>
                 </key>
                 <key id="9" time="900" spin="0">
                 <key id="9" time="900" spin="0">
-                    <object folder="0" file="0" x="-41.75" y="76.75"/>
+                    <object folder="0" file="0" x="-41.75" y="76.75" angle="0"/>
                 </key>
                 </key>
             </timeline>
             </timeline>
         </animation>
         </animation>

BIN
PhysicsPlatformer/Resources/UI/UI_HEART_EMPTY.png


BIN
PhysicsPlatformer/Resources/UI/UI_HEART_FULL.png


BIN
PhysicsPlatformer/Resources/UI/UI_HEART_HALF.png


+ 103 - 21
PhysicsPlatformer/SourceArt/Hero/Hero.scml

@@ -21,6 +21,16 @@
         <file id="17" name="Run__006.png" width="415" height="507" pivot_x="0" pivot_y="1"/>
         <file id="17" name="Run__006.png" width="415" height="507" pivot_x="0" pivot_y="1"/>
         <file id="18" name="Run__007.png" width="415" height="507" pivot_x="0" pivot_y="1"/>
         <file id="18" name="Run__007.png" width="415" height="507" pivot_x="0" pivot_y="1"/>
         <file id="19" name="Run__008.png" width="415" height="507" pivot_x="0" pivot_y="1"/>
         <file id="19" name="Run__008.png" width="415" height="507" pivot_x="0" pivot_y="1"/>
+        <file id="20" name="Jump__005.png" width="407" height="536" pivot_x="0" pivot_y="1"/>
+        <file id="21" name="Jump__000.png" width="407" height="536" pivot_x="0" pivot_y="1"/>
+        <file id="22" name="Jump__001.png" width="407" height="536" pivot_x="0" pivot_y="1"/>
+        <file id="23" name="Jump__002.png" width="407" height="536" pivot_x="0" pivot_y="1"/>
+        <file id="24" name="Jump__003.png" width="407" height="536" pivot_x="0" pivot_y="1"/>
+        <file id="25" name="Jump__004.png" width="407" height="536" pivot_x="0" pivot_y="1"/>
+        <file id="26" name="Jump__006.png" width="407" height="536" pivot_x="0" pivot_y="1"/>
+        <file id="27" name="Jump__007.png" width="407" height="536" pivot_x="0" pivot_y="1"/>
+        <file id="28" name="Jump__008.png" width="407" height="536" pivot_x="0" pivot_y="1"/>
+        <file id="29" name="Jump__009.png" width="407" height="536" pivot_x="0" pivot_y="1"/>
     </folder>
     </folder>
     <entity id="0" name="Hero">
     <entity id="0" name="Hero">
         <animation id="0" name="Run" length="750" interval="100">
         <animation id="0" name="Run" length="750" interval="100">
@@ -61,38 +71,110 @@
             </mainline>
             </mainline>
             <timeline id="0" name="Run__000">
             <timeline id="0" name="Run__000">
                 <key id="0" spin="0">
                 <key id="0" spin="0">
-                    <object folder="0" file="11" x="-41.75" y="76.75"/>
+                    <object folder="0" file="11" x="-41.75" y="76.75" angle="0"/>
                 </key>
                 </key>
                 <key id="1" time="75" spin="0">
                 <key id="1" time="75" spin="0">
-                    <object folder="0" file="12" x="-41.75" y="76.75"/>
+                    <object folder="0" file="12" x="-41.75" y="76.75" angle="0"/>
                 </key>
                 </key>
                 <key id="2" time="150" spin="0">
                 <key id="2" time="150" spin="0">
-                    <object folder="0" file="13" x="-41.75" y="76.75"/>
+                    <object folder="0" file="13" x="-41.75" y="76.75" angle="0"/>
                 </key>
                 </key>
                 <key id="3" time="225" spin="0">
                 <key id="3" time="225" spin="0">
-                    <object folder="0" file="14" x="-41.75" y="76.75"/>
+                    <object folder="0" file="14" x="-41.75" y="76.75" angle="0"/>
                 </key>
                 </key>
                 <key id="4" time="300" spin="0">
                 <key id="4" time="300" spin="0">
-                    <object folder="0" file="15" x="-41.75" y="76.75"/>
+                    <object folder="0" file="15" x="-41.75" y="76.75" angle="0"/>
                 </key>
                 </key>
                 <key id="5" time="375" spin="0">
                 <key id="5" time="375" spin="0">
-                    <object folder="0" file="16" x="-41.75" y="76.75"/>
+                    <object folder="0" file="16" x="-41.75" y="76.75" angle="0"/>
                 </key>
                 </key>
                 <key id="6" time="450" spin="0">
                 <key id="6" time="450" spin="0">
-                    <object folder="0" file="17" x="-41.75" y="76.75"/>
+                    <object folder="0" file="17" x="-41.75" y="76.75" angle="0"/>
                 </key>
                 </key>
                 <key id="7" time="525" spin="0">
                 <key id="7" time="525" spin="0">
-                    <object folder="0" file="18" x="-41.75" y="76.75"/>
+                    <object folder="0" file="18" x="-41.75" y="76.75" angle="0"/>
                 </key>
                 </key>
                 <key id="8" time="600" spin="0">
                 <key id="8" time="600" spin="0">
-                    <object folder="0" file="19" x="-41.75" y="76.75"/>
+                    <object folder="0" file="19" x="-41.75" y="76.75" angle="0"/>
                 </key>
                 </key>
                 <key id="9" time="675" spin="0">
                 <key id="9" time="675" spin="0">
-                    <object folder="0" file="10" x="-41.75" y="76.75"/>
+                    <object folder="0" file="10" x="-41.75" y="76.75" angle="0"/>
                 </key>
                 </key>
             </timeline>
             </timeline>
         </animation>
         </animation>
-        <animation id="1" name="Idle" length="1000" interval="100">
+        <animation id="1" name="Jump" length="250" interval="100" looping="false">
+            <mainline>
+                <key id="0">
+                    <object_ref id="0" timeline="0" key="0" z_index="0"/>
+                </key>
+                <key id="1" time="41">
+                    <object_ref id="0" timeline="0" key="1" z_index="0"/>
+                </key>
+                <key id="2" time="83">
+                    <object_ref id="0" timeline="0" key="2" z_index="0"/>
+                </key>
+                <key id="3" time="125">
+                    <object_ref id="0" timeline="0" key="3" z_index="0"/>
+                </key>
+                <key id="4" time="166">
+                    <object_ref id="0" timeline="0" key="4" z_index="0"/>
+                </key>
+                <key id="5" time="208">
+                    <object_ref id="0" timeline="0" key="5" z_index="0"/>
+                </key>
+            </mainline>
+            <timeline id="0" name="Jump__000">
+                <key id="0" spin="0">
+                    <object folder="0" file="21" x="-41.75" y="76.75"/>
+                </key>
+                <key id="1" time="41" spin="0">
+                    <object folder="0" file="22" x="-41.75" y="76.75"/>
+                </key>
+                <key id="2" time="83" spin="0">
+                    <object folder="0" file="23" x="-41.75" y="76.75"/>
+                </key>
+                <key id="3" time="125" spin="0">
+                    <object folder="0" file="24" x="-41.75" y="76.75"/>
+                </key>
+                <key id="4" time="166" spin="0">
+                    <object folder="0" file="25" x="-41.75" y="76.75"/>
+                </key>
+                <key id="5" time="250" spin="0">
+                    <object folder="0" file="20" x="-41.75" y="76.75"/>
+                </key>
+            </timeline>
+        </animation>
+        <animation id="2" name="Land" length="250" interval="100" looping="false">
+            <mainline>
+                <key id="0">
+                    <object_ref id="0" timeline="0" key="0" z_index="0"/>
+                </key>
+                <key id="1" time="62">
+                    <object_ref id="0" timeline="0" key="1" z_index="0"/>
+                </key>
+                <key id="2" time="125">
+                    <object_ref id="0" timeline="0" key="2" z_index="0"/>
+                </key>
+                <key id="3" time="187">
+                    <object_ref id="0" timeline="0" key="3" z_index="0"/>
+                </key>
+            </mainline>
+            <timeline id="0" name="Jump__006">
+                <key id="0" spin="0">
+                    <object folder="0" file="26" x="-41.75" y="76.75"/>
+                </key>
+                <key id="1" time="62" spin="0">
+                    <object folder="0" file="27" x="-41.75" y="76.75"/>
+                </key>
+                <key id="2" time="125" spin="0">
+                    <object folder="0" file="28" x="-41.75" y="76.75"/>
+                </key>
+                <key id="3" time="250" spin="0">
+                    <object folder="0" file="29" x="-41.75" y="76.75"/>
+                </key>
+            </timeline>
+        </animation>
+        <animation id="3" name="Idle" length="1000" interval="100">
             <mainline>
             <mainline>
                 <key id="0">
                 <key id="0">
                     <object_ref id="0" timeline="0" key="0" z_index="0"/>
                     <object_ref id="0" timeline="0" key="0" z_index="0"/>
@@ -127,34 +209,34 @@
             </mainline>
             </mainline>
             <timeline id="0" name="Idle">
             <timeline id="0" name="Idle">
                 <key id="0" spin="0">
                 <key id="0" spin="0">
-                    <object folder="0" file="1" x="-41.75" y="76.75"/>
+                    <object folder="0" file="1" x="-41.75" y="76.75" angle="0"/>
                 </key>
                 </key>
                 <key id="1" time="100" spin="0">
                 <key id="1" time="100" spin="0">
-                    <object folder="0" file="2" x="-41.75" y="76.75"/>
+                    <object folder="0" file="2" x="-41.75" y="76.75" angle="0"/>
                 </key>
                 </key>
                 <key id="2" time="200" spin="0">
                 <key id="2" time="200" spin="0">
-                    <object folder="0" file="3" x="-41.75" y="76.75"/>
+                    <object folder="0" file="3" x="-41.75" y="76.75" angle="0"/>
                 </key>
                 </key>
                 <key id="3" time="300" spin="0">
                 <key id="3" time="300" spin="0">
-                    <object folder="0" file="4" x="-41.75" y="76.75"/>
+                    <object folder="0" file="4" x="-41.75" y="76.75" angle="0"/>
                 </key>
                 </key>
                 <key id="4" time="400" spin="0">
                 <key id="4" time="400" spin="0">
-                    <object folder="0" file="5" x="-41.75" y="76.75"/>
+                    <object folder="0" file="5" x="-41.75" y="76.75" angle="0"/>
                 </key>
                 </key>
                 <key id="5" time="500" spin="0">
                 <key id="5" time="500" spin="0">
-                    <object folder="0" file="6" x="-41.75" y="76.75"/>
+                    <object folder="0" file="6" x="-41.75" y="76.75" angle="0"/>
                 </key>
                 </key>
                 <key id="6" time="600" spin="0">
                 <key id="6" time="600" spin="0">
-                    <object folder="0" file="7" x="-41.75" y="76.75"/>
+                    <object folder="0" file="7" x="-41.75" y="76.75" angle="0"/>
                 </key>
                 </key>
                 <key id="7" time="700" spin="0">
                 <key id="7" time="700" spin="0">
-                    <object folder="0" file="8" x="-41.75" y="76.75"/>
+                    <object folder="0" file="8" x="-41.75" y="76.75" angle="0"/>
                 </key>
                 </key>
                 <key id="8" time="800" spin="0">
                 <key id="8" time="800" spin="0">
-                    <object folder="0" file="9" x="-41.75" y="76.75"/>
+                    <object folder="0" file="9" x="-41.75" y="76.75" angle="0"/>
                 </key>
                 </key>
                 <key id="9" time="900" spin="0">
                 <key id="9" time="900" spin="0">
-                    <object folder="0" file="0" x="-41.75" y="76.75"/>
+                    <object folder="0" file="0" x="-41.75" y="76.75" angle="0"/>
                 </key>
                 </key>
             </timeline>
             </timeline>
         </animation>
         </animation>

+ 1 - 1
PhysicsPlatformer/SourceArt/Hero/Hero.tps

@@ -160,7 +160,7 @@
             <string></string>
             <string></string>
         </struct>
         </struct>
         <key>autoAliasEnabled</key>
         <key>autoAliasEnabled</key>
-        <true/>
+        <false/>
         <key>trimSpriteNames</key>
         <key>trimSpriteNames</key>
         <false/>
         <false/>
         <key>prependSmartFolderName</key>
         <key>prependSmartFolderName</key>