Changeset 5838 for 2014/30/AarniAR/AdventureOfStarKid/AdventureOfStarKid

Timestamp:

2015-05-12 21:49:28 (8 years ago)

Author:

esaala

Message:

 

Location:

2014/30/AarniAR/AdventureOfStarKid/AdventureOfStarKid

Files:

• AdventureOfStarKid/AdventureOfStarKid.cs (modified) (5 diffs)
• AdventureOfStarKid/bin/x86/Debug/Content/StandingShootanimation_0.xnb (added)
• AdventureOfStarKid/bin/x86/Debug/Jypeli.dll (modified) (previous)
• AdventureOfStarKidContent/AdventureOfStarKidContent.contentproj (modified) (1 diff)
• AdventureOfStarKidContent/StandingShootanimation.png (added)
• AdventureOfStarKidContent/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache (modified) (previous)

2014/30/AarniAR/AdventureOfStarKid/AdventureOfStarKid/AdventureOfStarKid/AdventureOfStarKid.cs

@@ -16 +16 @@
     {
         elamaLaskuri = new IntMeter(max, 0, max);
-        elamaLaskuri.LowerLimit += delegate {
+        elamaLaskuri.LowerLimit += delegate
+        {
             if (this.Weapon != null)
             {
@@ -110 +111 @@
         kentta.Execute(RUUDUN_KOKO, RUUDUN_KOKO);
         Level.CreateBorders();
-        Level.BackgroundColor = new Color( 150, 150, 150);
+        Level.Background.Color = new Color( 150, 150, 150);
 
         laskuri = new IntMeter(0, 0, 100);
@@ -202 +203 @@
         AddCollisionHandler(pelaaja1, "pix", Tormaapixiin);
         Add(pelaaja1);
+        pelaaja1.IgnoresCollisionResponse = false;
         AddCollisionHandler(pelaaja1, "1UP", tormaaOneUP);
         AddCollisionHandler(pelaaja1, "Heal", tormaaHealingiin);
@@ -351 +353 @@
                 Timer.SingleShot(0.3, delegate { pelaaja1.AnimIdle = new Animation(standinganimation); playerisshooting = false; });
             }
-            
         }
 
@@ -396 +397 @@
         healthMeter.Angle = Angle.RightAngle;
         healthMeter.Color = Color.Transparent;
-        healthMeter.BarColor = Color.Red;
-        healthMeter.BorderColor = Color.Black;
+        healthMeter.BarColor = Color.Beige;
+        
 
 

2014/30/AarniAR/AdventureOfStarKid/AdventureOfStarKid/AdventureOfStarKidContent/AdventureOfStarKidContent.contentproj

@@ -329 +329 @@
     <Folder Include="NewFolder2\" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="StandingShootanimation.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\$(XnaFrameworkVersion)\Microsoft.Xna.GameStudio.ContentPipeline.targets" />
   <!--  To modify your build process, add your task inside one of the targets below and uncomment it.