Changeset 5358

Timestamp:

2014-07-03 14:14:01 (9 years ago)

Author:

nikranna

Message:

 

Location:

2014/27/NikoA

Files:

• ChickenFite!/TaisteluAreena/TaisteluAreena/TaisteluAreenaContent/Megusta.png (added)
• Megusta.png (added)
• kokeilu/kokeilu/kokeilu/bin/x86/Debug/Content/Megusta.xnb (added)
• kokeilu/kokeilu/kokeilu/bin/x86/Debug/kokeilu.exe (modified) (previous)
• kokeilu/kokeilu/kokeilu/bin/x86/Debug/kokeilu.pdb (modified) (previous)
• kokeilu/kokeilu/kokeilu/kokeilu.cs (modified) (2 diffs)
• kokeilu/kokeilu/kokeilu/kokeilu.csproj.Debug.cachefile (modified) (1 diff)
• kokeilu/kokeilu/kokeilu/obj/x86/Debug/ContentPipeline-{44E802C6-CBAF-4358-82D1-537B47A53768}.xml (modified) (1 diff)
• kokeilu/kokeilu/kokeilu/obj/x86/Debug/cachefile-{44E802C6-CBAF-4358-82D1-537B47A53768}-targetpath.txt (modified) (1 diff)
• kokeilu/kokeilu/kokeilu/obj/x86/Debug/kokeilu.csproj.FileListAbsolute.txt (modified) (1 diff)
• kokeilu/kokeilu/kokeilu/obj/x86/Debug/kokeilu.exe (modified) (previous)
• kokeilu/kokeilu/kokeilu/obj/x86/Debug/kokeilu.pdb (modified) (previous)
• kokeilu/kokeilu/kokeiluContent/Megusta.png (added)
• kokeilu/kokeilu/kokeiluContent/kokeiluContent.contentproj (modified) (1 diff)

2014/27/NikoA/kokeilu/kokeilu/kokeilu/kokeilu.cs

@@ -78 +78 @@
         Add(pelaaja1);
 
-        pelaaja1.Weapon = new PlasmaCannon(0, 0);
+        pelaaja1.Weapon = new Cannon(0, 0);
         pelaaja1.Weapon.X = +15;
         pelaaja1.Weapon.Y = -1;
@@ -136 +136 @@
         if (ammus != null)
         {
-            //ammus.Size *= 3;
-            //ammus.Image = ...
-            //ammus.MaximumLifetime = TimeSpan.FromSeconds(2.0);
+            ammus.Size *= 3;
+            ammus.Image = LoadImage ("Megusta");
+            ammus.MaximumLifetime = TimeSpan.FromSeconds(2.0);
         }
 

2014/27/NikoA/kokeilu/kokeilu/kokeilu/kokeilu.csproj.Debug.cachefile

@@ -13 +13 @@
 Content\laava.xnb
 Content\piikki.xnb
+Content\Megusta.xnb

2014/27/NikoA/kokeilu/kokeilu/kokeilu/obj/x86/Debug/ContentPipeline-{44E802C6-CBAF-4358-82D1-537B47A53768}.xml

@@ -128 +128 @@
       <Time>2014-07-03T13:38:37.8502853+03:00</Time>
     </Item>
+    <Item>
+      <Source>Megusta.png</Source>
+      <Name>Megusta</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+      <Options>None</Options>
+      <Output>C:\MyTemp\NikoA\kokeilu\kokeilu\kokeilu\bin\x86\Debug\Content\Megusta.xnb</Output>
+      <Time>2014-07-03T13:57:02.7167609+03:00</Time>
+    </Item>
     <BuildSuccessful>true</BuildSuccessful>
     <Settings>

2014/27/NikoA/kokeilu/kokeilu/kokeilu/obj/x86/Debug/cachefile-{44E802C6-CBAF-4358-82D1-537B47A53768}-targetpath.txt

@@ -13 +13 @@
 Content\laava.xnb
 Content\piikki.xnb
+Content\Megusta.xnb

2014/27/NikoA/kokeilu/kokeilu/kokeilu/obj/x86/Debug/kokeilu.csproj.FileListAbsolute.txt

@@ -21 +21 @@
 C:\MyTemp\NikoA\kokeilu\kokeilu\kokeilu\bin\x86\Debug\Content\laava.xnb
 C:\MyTemp\NikoA\kokeilu\kokeilu\kokeilu\bin\x86\Debug\Content\piikki.xnb
+C:\MyTemp\NikoA\kokeilu\kokeilu\kokeilu\bin\x86\Debug\Content\Megusta.xnb

2014/27/NikoA/kokeilu/kokeilu/kokeiluContent/kokeiluContent.contentproj

@@ -137 +137 @@
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Megusta.png">
+      <Name>Megusta</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.