Changeset 5997 for 2015

Timestamp:

2015-06-10 13:51:27 (6 years ago)

Author:

iisaaira

Message:

 

Location:

2015/24/TuroR/Omapeli

Files:

• Omapeli.suo (modified) (previous)
• Omapeli.v11.suo (added)
• Omapeli/Omapeli/Omapeli.cs (modified) (5 diffs)
• Omapeli/Omapeli/Omapeli.csproj.Debug.cachefile (modified) (1 diff)
• Omapeli/Omapeli/bin/x86/Debug/Content/pall o o.xnb (added)
• Omapeli/Omapeli/bin/x86/Debug/Omapeli.exe (modified) (previous)
• Omapeli/Omapeli/bin/x86/Debug/Omapeli.pdb (modified) (previous)
• Omapeli/Omapeli/obj/x86/Debug/ContentPipeline-{595E6F62-26BF-42FB-ABC6-C9280882E6ED}.xml (modified) (1 diff)
• Omapeli/Omapeli/obj/x86/Debug/Omapeli.csproj.FileListAbsolute.txt (modified) (1 diff)
• Omapeli/Omapeli/obj/x86/Debug/Omapeli.exe (modified) (previous)
• Omapeli/Omapeli/obj/x86/Debug/Omapeli.pdb (modified) (previous)
• Omapeli/Omapeli/obj/x86/Debug/cachefile-{595E6F62-26BF-42FB-ABC6-C9280882E6ED}-targetpath.txt (modified) (1 diff)
• Omapeli/OmapeliContent/OmapeliContent.contentproj (modified) (1 diff)
• Omapeli/OmapeliContent/pall o o.png (added)
• UpgradeLog2.htm (added)

2015/24/TuroR/Omapeli/Omapeli/Omapeli/Omapeli.cs

@@ -18 +18 @@
     Image panoksenKuva = LoadImage("panos");
 
-    Image[] pallonKuvat = LoadImages("apina", "UUS APINA", "sukkamato", "silma", "kännykkä", "Cannon", "possu", "tamm", "putin");
+    Image[] pallonKuvat = LoadImages("apina", "UUS APINA", "sukkamato", "silma", "kännykkä", "Cannon", "possu", "tamm", "putin", "pall o o");
 
     AssaultRifle pelaajan1Ase;
@@ -58 +58 @@
         Add(ukko);
         ukko.Image = ukonKuva;
-        //ukko.Animation = new Animation(ukkoAmpuu);
 
         pelaajan1Ase = new AssaultRifle(30, 10);
@@ -91 +90 @@
             Timer.SingleShot(2.0, delegate { LuoUusiApina(); });
             kohde.Destroy();
-            Explosion rajahdys = new Explosion(100);
+            Explosion rajahdys = new Explosion(1100);
             rajahdys.Position = ammus.Position;
             Add(rajahdys);
@@ -103 +102 @@
     {
         PhysicsObject ammus = ase.Shoot();
+        
 
         if (ammus != null)
@@ -121 +121 @@
     void Hyppääukolla(PlatformCharacter2 ukko)
     {
-        ukko.Jump(500.0);
+        ukko.ForceJump(500.0);
     }
 

2015/24/TuroR/Omapeli/Omapeli/Omapeli/Omapeli.csproj.Debug.cachefile

@@ -11 +11 @@
 Content\Tamm.xnb
 Content\putin.xnb
+Content\pall o o.xnb

2015/24/TuroR/Omapeli/Omapeli/Omapeli/obj/x86/Debug/ContentPipeline-{595E6F62-26BF-42FB-ABC6-C9280882E6ED}.xml

@@ -110 +110 @@
       <Time>2015-06-10T11:22:27.9375718+03:00</Time>
     </Item>
+    <Item>
+      <Source>pall o o.png</Source>
+      <Name>pall o o</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+      <Options>None</Options>
+      <Output>C:\MyTemp\TuroR\UusiPeli\Omapeli\Omapeli\Omapeli\bin\x86\Debug\Content\pall o o.xnb</Output>
+      <Time>2015-06-10T12:37:40.4670799+03:00</Time>
+    </Item>
     <BuildSuccessful>true</BuildSuccessful>
     <Settings>

2015/24/TuroR/Omapeli/Omapeli/Omapeli/obj/x86/Debug/Omapeli.csproj.FileListAbsolute.txt

@@ -29 +29 @@
 C:\MyTemp\TuroR\UusiPeli\Omapeli\Omapeli\Omapeli\bin\x86\Debug\Content\Tamm.xnb
 C:\MyTemp\TuroR\UusiPeli\Omapeli\Omapeli\Omapeli\bin\x86\Debug\Content\putin.xnb
+C:\MyTemp\TuroR\UusiPeli\Omapeli\Omapeli\Omapeli\bin\x86\Debug\Content\pall o o.xnb

2015/24/TuroR/Omapeli/Omapeli/Omapeli/obj/x86/Debug/cachefile-{595E6F62-26BF-42FB-ABC6-C9280882E6ED}-targetpath.txt

@@ -11 +11 @@
 Content\Tamm.xnb
 Content\putin.xnb
+Content\pall o o.xnb

2015/24/TuroR/Omapeli/Omapeli/OmapeliContent/OmapeliContent.contentproj

@@ -129 +129 @@
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="pall o o.png">
+      <Name>pall o o</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </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.