Changeset 6554

Timestamp:

2015-06-30 10:08:52 (8 years ago)

Author:

jivesuor

Message:

Pongista poistettu kuvat ja nostettu max.pistemäärä 10 > 20

Location:

2015/27/JimiS/Pong

Files:

• Pong.suo (modified) (previous)
• Pong/Pong/Pong.cs (modified) (3 diffs)
• Pong/Pong/bin/x86/Release/Content/jalkapallo.xnb (deleted)
• Pong/Pong/bin/x86/Release/Content/jalkapallokenttä.xnb (deleted)
• Pong/Pong/bin/x86/Release/Pong.exe (modified) (previous)
• Pong/Pong/bin/x86/Release/Pong.pdb (modified) (previous)
• Pong/Pong/obj/x86/Release/ContentPipeline-{43441B02-A17B-4AA5-9B96-F0812FDBF432}.xml (modified) (2 diffs)
• Pong/Pong/obj/x86/Release/Pong.csproj.FileListAbsolute.txt (modified) (2 diffs)
• Pong/Pong/obj/x86/Release/Pong.csprojResolveAssemblyReference.cache (added)
• Pong/Pong/obj/x86/Release/Pong.exe (modified) (previous)
• Pong/Pong/obj/x86/Release/Pong.pdb (modified) (previous)
• Pong/Pong/obj/x86/Release/cachefile-{43441B02-A17B-4AA5-9B96-F0812FDBF432}-targetpath.txt (deleted)
• Pong/PongContent/PongContent.contentproj (modified) (1 diff)
• Pong/PongContent/jalkapallo.png (deleted)
• Pong/PongContent/jalkapallokenttä.png (deleted)
• Pong/PongContent/obj/x86/Release/PongContent.contentprojResolveAssemblyReference.cache (modified) (previous)

2015/27/JimiS/Pong/Pong/Pong/Pong.cs

@@ -23 +23 @@
     IntMeter pelaajan1Pisteet;
     IntMeter pelaajan2Pisteet;
-    Image pallokuva = LoadImage("jalkapallo");
-    Image pallokenttä = LoadImage("jalkapallokenttä");
 
     public override void Begin()
@@ -41 +39 @@
         pallo.X = 200.0;
         pallo.Y = 0.0;
-        pallo.Image = pallokuva;
         //Kentän reunat, vasen
         vasenReuna = Level.CreateLeftBorder();
@@ -130 +127 @@
     {
         IntMeter laskuri = new IntMeter(0);
-        laskuri.MaxValue = 10;
+        laskuri.MaxValue = 20;
         Label naytto = new Label();
         naytto.BindTo(laskuri);

2015/27/JimiS/Pong/Pong/Pong/obj/x86/Release/ContentPipeline-{43441B02-A17B-4AA5-9B96-F0812FDBF432}.xml

@@ -2 +2 @@
 <XnaContent xmlns:Pipeline="Microsoft.Xna.Framework.Content.Pipeline">
   <Asset Type="Pipeline:BuildItemCollection">
-    <Item>
-      <Source>jalkapallo.png</Source>
-      <Name>jalkapallo</Name>
-      <Importer>TextureImporter</Importer>
-      <Processor>TextureProcessor</Processor>
-      <Options>None</Options>
-      <Output>C:\MyTemp\JimiS\Pong\Pong\Pong\bin\x86\Release\Content\jalkapallo.xnb</Output>
-      <Time>2015-06-29T13:39:58.6999532+03:00</Time>
-    </Item>
-    <Item>
-      <Source>jalkapallokenttä.png</Source>
-      <Name>jalkapallokenttä</Name>
-      <Importer>TextureImporter</Importer>
-      <Processor>TextureProcessor</Processor>
-      <Options>None</Options>
-      <Output>C:\MyTemp\JimiS\Pong\Pong\Pong\bin\x86\Release\Content\jalkapallokenttä.xnb</Output>
-      <Time>2015-06-29T13:42:56.6095532+03:00</Time>
-    </Item>
     <BuildSuccessful>true</BuildSuccessful>
     <Settings>
@@ -34 +16 @@
     <Assemblies>
       <Assembly>
-        <Key>C:\Program Files (x86)\Jypeli\lib\ContentExtensions\TextFileContentExtension.dll</Key>
-        <Value>2014-11-26T00:23:34+02:00</Value>
-      </Assembly>
-      <Assembly>
-        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.XImporter.dll</Key>
-        <Value>2011-09-01T16:22:30+03:00</Value>
-      </Assembly>
-      <Assembly>
-        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.VideoImporters.dll</Key>
-        <Value>2011-09-01T16:22:30+03:00</Value>
-      </Assembly>
-      <Assembly>
-        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.TextureImporter.dll</Key>
-        <Value>2011-09-01T16:22:30+03:00</Value>
-      </Assembly>
-      <Assembly>
-        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.FBXImporter.dll</Key>
-        <Value>2011-09-01T16:22:30+03:00</Value>
-      </Assembly>
-      <Assembly>
-        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.EffectImporter.dll</Key>
-        <Value>2011-09-01T16:22:30+03:00</Value>
-      </Assembly>
-      <Assembly>
-        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.AudioImporters.dll</Key>
-        <Value>2011-09-01T16:22:30+03:00</Value>
-      </Assembly>
-      <Assembly>
-        <Key>C:\Program Files (x86)\Jypeli\lib\ContentExtensions\AnimationExtension.dll</Key>
-        <Value>2014-11-26T00:23:36+02:00</Value>
-      </Assembly>
-      <Assembly>
         <Key>C:\Windows\Microsoft.Net\assembly\GAC_32\Microsoft.Xna.Framework.Content.Pipeline\v4.0_4.0.0.0__842cf8be1de50553\Microsoft.Xna.Framework.Content.Pipeline.dll</Key>
-        <Value>2014-04-23T00:22:29.3372049+03:00</Value>
+        <Value>2012-03-16T14:35:21.2332043+02:00</Value>
       </Assembly>
     </Assemblies>

2015/27/JimiS/Pong/Pong/Pong/obj/x86/Release/Pong.csproj.FileListAbsolute.txt

@@ -1 @@
-C:\MyTemp\JimiS\Pong\Pong\Pong\bin\x86\Release\Content\jalkapallo.xnb
-C:\MyTemp\JimiS\Pong\Pong\Pong\bin\x86\Release\Content\jalkapallokenttÀ.xnb
 C:\MyTemp\JimiS\Pong\Pong\Pong\bin\x86\Release\Pong.exe
 C:\MyTemp\JimiS\Pong\Pong\Pong\bin\x86\Release\Pong.pdb
@@ -8 +6 @@
 C:\MyTemp\JimiS\Pong\Pong\Pong\obj\x86\Release\Pong.exe
 C:\MyTemp\JimiS\Pong\Pong\Pong\obj\x86\Release\Pong.pdb
+C:\MyTemp\JimiS\Pong\Pong\Pong\obj\x86\Release\Pong.csprojResolveAssemblyReference.cache

2015/27/JimiS/Pong/Pong/PongContent/PongContent.contentproj

@@ -45 +45 @@
     <Reference Include="AnimationExtension" />
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="jalkapallo.png">
-      <Name>jalkapallo</Name>
-      <Importer>TextureImporter</Importer>
-      <Processor>TextureProcessor</Processor>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="jalkapallokenttä.png">
-      <Name>jalkapallokenttä</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.