Changeset 7821

Timestamp:

2016-07-05 20:26:21 (3 years ago)

Author:

juleppaa

Message:

 

Location:

2016/24/JustusL/Object_Ball

Files:

• Object_Ball.v12.suo (modified) (previous)
• Object_Ball/Object_Ball/Object_Ball.cs (modified) (4 diffs)
• Object_Ball/Object_Ball/bin/x86/Debug/Jypeli.dll (modified) (previous)
• Object_Ball/Object_Ball/bin/x86/Debug/Object_Ball.exe (modified) (previous)
• Object_Ball/Object_Ball/bin/x86/Debug/Object_Ball.pdb (modified) (previous)
• Object_Ball/Object_Ball/obj/x86/Debug/ContentPipeline-{CD347656-A8F2-48EE-8097-A4F9AF1242F0}.xml (modified) (11 diffs)
• Object_Ball/Object_Ball/obj/x86/Debug/Object_Ball.csproj.FileListAbsolute.txt (modified) (1 diff)
• Object_Ball/Object_Ball/obj/x86/Debug/Object_Ball.csprojResolveAssemblyReference.cache (modified) (previous)
• Object_Ball/Object_Ball/obj/x86/Debug/Object_Ball.exe (modified) (previous)
• Object_Ball/Object_Ball/obj/x86/Debug/Object_Ball.pdb (modified) (previous)
• Object_Ball/Object_BallContent/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache (modified) (previous)
• Object_Ball/Object_BallContent/obj/x86/Debug/Object_BallContent.contentprojResolveAssemblyReference.cache (modified) (previous)

2016/24/JustusL/Object_Ball/Object_Ball/Object_Ball/Object_Ball.cs

@@ -217 +217 @@
     void Palikka()
     {
-        pallo = new PhysicsObject(25.0, 25.0);
+       
+
+        maali = PhysicsObject.CreateStaticObject(70, 70);
+        maali.Tag = "maali";
+        maali.Image = Maali;
+        maali.X = 700;
+        maali.Y = -400;
+
+        Add(maali);
+
+
+
+    }
+    void LuoPallo(Vector paikka double leveys, double korkeus)
+{
+     pallo = new PhysicsObject(25.0, 25.0);
         pallo.Shape = Shape.Circle;
         pallo.Color = Color.Red;
@@ -226 +241 @@
 
         Add(pallo);
-
-        maali = PhysicsObject.CreateStaticObject(70, 70);
-        maali.Tag = "maali";
-        maali.Image = Maali;
-        maali.X = 700;
-        maali.Y = -400;
-
-        Add(maali);
-
-
-
-    }
+}
     void LuoTahti(Vector paikka, double leveys, double ko)
     {
@@ -358 +362 @@
         pausevalikko.BorderColor = Color.Red;
         pausevalikko.Font = Font.DefaultBold;
-        pausevalikko.SetButtonTextColor(Color.DarkGray);
-        pausevalikko.SetButtonColor(new Color(1.0 , 0, 0, 0.1));
+        pausevalikko.SetButtonTextColor(Color.Black);
+        pausevalikko.SetButtonColor(new Color(1.0 , 0, 0, 0.4));
         pausevalikko.SelectionColor = Color.DarkRed;
         pausevalikko.Color = Color.Transparent;
@@ -377 +381 @@
         asetukset.BorderColor = Color.Red;
         asetukset.Font = Font.DefaultBold;
-        asetukset.SetButtonTextColor(Color.DarkGray);
-        asetukset.SetButtonColor(new Color(1.0, 0, 0, 0.1));
+        asetukset.SetButtonTextColor(Color.Black);
+        asetukset.SetButtonColor(new Color(1.0, 0, 0, 0.4));
         asetukset.SelectionColor = Color.DarkRed;
         asetukset.Color = Color.Transparent;

2016/24/JustusL/Object_Ball/Object_Ball/Object_Ball/obj/x86/Debug/ContentPipeline-{CD347656-A8F2-48EE-8097-A4F9AF1242F0}.xml

@@ -8 +8 @@
       <Processor>TextureProcessor</Processor>
       <Options>None</Options>
-      <Output>C:\MyTemp\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\kaarikakka.xnb</Output>
-      <Time>2016-07-05T10:37:41.3098919+03:00</Time>
+      <Output>C:\Users\Justus\Documents\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\kaarikakka.xnb</Output>
+      <Time>2016-07-05T15:14:08.1334008+03:00</Time>
     </Item>
     <Item>
@@ -17 +17 @@
       <Processor>TextureProcessor</Processor>
       <Options>None</Options>
-      <Output>C:\MyTemp\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\kaariosa.xnb</Output>
-      <Time>2016-07-04T10:29:37.230784+03:00</Time>
+      <Output>C:\Users\Justus\Documents\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\kaariosa.xnb</Output>
+      <Time>2016-06-16T12:22:54.0854567+03:00</Time>
     </Item>
     <Item>
@@ -26 +26 @@
       <Processor>TextureProcessor</Processor>
       <Options>None</Options>
-      <Output>C:\MyTemp\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\kyna.xnb</Output>
-      <Time>2016-07-04T10:29:37.090384+03:00</Time>
+      <Output>C:\Users\Justus\Documents\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\kyna.xnb</Output>
+      <Time>2016-06-16T12:22:55.824712+03:00</Time>
     </Item>
     <Item>
@@ -35 +35 @@
       <Processor>TextureProcessor</Processor>
       <Options>None</Options>
-      <Output>C:\MyTemp\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\maali_objectBall.xnb</Output>
-      <Time>2016-07-04T10:29:37.090384+03:00</Time>
+      <Output>C:\Users\Justus\Documents\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\maali_objectBall.xnb</Output>
+      <Time>2016-06-16T11:35:20.5217772+03:00</Time>
     </Item>
     <Item>
@@ -44 +44 @@
       <Processor>TextureProcessor</Processor>
       <Options>None</Options>
-      <Output>C:\MyTemp\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\palikka kursori.xnb</Output>
-      <Time>2016-07-04T10:29:37.230784+03:00</Time>
+      <Output>C:\Users\Justus\Documents\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\palikka kursori.xnb</Output>
+      <Time>2016-06-16T11:35:20.5287781+03:00</Time>
     </Item>
     <Item>
@@ -53 +53 @@
       <Processor>TextureProcessor</Processor>
       <Options>None</Options>
-      <Output>C:\MyTemp\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\palikka.xnb</Output>
-      <Time>2016-07-04T10:29:37.090384+03:00</Time>
+      <Output>C:\Users\Justus\Documents\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\palikka.xnb</Output>
+      <Time>2016-06-16T12:22:56.4812302+03:00</Time>
     </Item>
     <Item>
@@ -62 +62 @@
       <Processor>TextureProcessor</Processor>
       <Options>None</Options>
-      <Output>C:\MyTemp\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\ruutu.xnb</Output>
-      <Time>2016-07-04T13:04:34.8082709+03:00</Time>
+      <Output>C:\Users\Justus\Documents\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\ruutu.xnb</Output>
+      <Time>2016-07-04T20:43:40.1219171+03:00</Time>
     </Item>
     <Item>
@@ -71 +71 @@
       <Processor>TextureProcessor</Processor>
       <Options>None</Options>
-      <Output>C:\MyTemp\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\kentta1.xnb</Output>
-      <Time>2016-07-04T14:53:50.6394709+03:00</Time>
+      <Output>C:\Users\Justus\Documents\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\kentta1.xnb</Output>
+      <Time>2016-07-04T20:43:40.1929412+03:00</Time>
     </Item>
     <Item>
@@ -80 +80 @@
       <Processor>TextureProcessor</Processor>
       <Options>None</Options>
-      <Output>C:\MyTemp\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\kentta2.xnb</Output>
-      <Time>2016-07-04T14:53:50.6394709+03:00</Time>
+      <Output>C:\Users\Justus\Documents\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\kentta2.xnb</Output>
+      <Time>2016-07-04T20:43:40.2029413+03:00</Time>
     </Item>
     <BuildSuccessful>true</BuildSuccessful>
@@ -90 +90 @@
       <BuildConfiguration>Debug</BuildConfiguration>
       <CompressContent>false</CompressContent>
-      <RootDirectory>C:\MyTemp\JustusL\Object_Ball\Object_Ball\Object_BallContent\</RootDirectory>
-      <LoggerRootDirectory>C:\MyTemp\JustusL\Object_Ball\Object_Ball\Object_Ball\</LoggerRootDirectory>
-      <IntermediateDirectory>C:\MyTemp\JustusL\Object_Ball\Object_Ball\Object_Ball\obj\x86\Debug\</IntermediateDirectory>
-      <OutputDirectory>C:\MyTemp\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\</OutputDirectory>
+      <RootDirectory>C:\Users\Justus\Documents\JustusL\Object_Ball\Object_Ball\Object_BallContent\</RootDirectory>
+      <LoggerRootDirectory>C:\Users\Justus\Documents\JustusL\Object_Ball\Object_Ball\Object_Ball\</LoggerRootDirectory>
+      <IntermediateDirectory>C:\Users\Justus\Documents\JustusL\Object_Ball\Object_Ball\Object_Ball\obj\x86\Debug\</IntermediateDirectory>
+      <OutputDirectory>C:\Users\Justus\Documents\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\</OutputDirectory>
     </Settings>
     <Assemblies>
       <Assembly>
-        <Key>C:\Program Files (x86)\Jypeli\lib\ContentExtensions\TextFileContentExtension.dll</Key>
-        <Value>2015-02-09T20:18:44+02:00</Value>
+        <Key>C:\Users\Justus\Jypeli\lib\ContentExtensions\TextFileContentExtension.dll</Key>
+        <Value>2015-04-01T18:41:16+03:00</Value>
       </Assembly>
       <Assembly>
@@ -125 +125 @@
       </Assembly>
       <Assembly>
-        <Key>C:\Program Files (x86)\Jypeli\lib\ContentExtensions\AnimationExtension.dll</Key>
-        <Value>2015-02-17T22:27:18+02:00</Value>
+        <Key>C:\Users\Justus\Jypeli\lib\ContentExtensions\AnimationExtension.dll</Key>
+        <Value>2015-04-01T18:41:16+03: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>2015-09-16T19:42:13.6500946+03:00</Value>
+        <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>2015-12-15T06:54:21.9346879+02:00</Value>
       </Assembly>
     </Assemblies>

2016/24/JustusL/Object_Ball/Object_Ball/Object_Ball/obj/x86/Debug/Object_Ball.csproj.FileListAbsolute.txt

@@ -46 +46 @@
 C:\MyTemp\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\kentta1.xnb
 C:\MyTemp\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\kentta2.xnb
+C:\Users\Justus\Documents\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\kentta1.xnb
+C:\Users\Justus\Documents\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\kentta2.xnb