Changeset 7770 for 2016/24


Ignore:
Timestamp:
2016-07-05 12:01:38 (3 years ago)
Author:
juleppaa
Message:
 
Location:
2016/24/JustusL/Object_Ball
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • 2016/24/JustusL/Object_Ball/Object_Ball/Object_Ball/Object_Ball.cs

    r7767 r7770  
    4242        Gravity = new Vector(0, -70); 
    4343 
    44         Level.Width = 5000; 
    45         Level.Height = 5000; 
     44        Level.Width = 10000; 
     45        Level.Height = 10000; 
    4646        Level.CreateBorders(); 
    4747 
     
    295295    void PalloLiikkeelle() 
    296296    { 
    297  
    298         //Camera.Follow(pallo); 
     297        //Add(pallo); 
     298        Camera.Follow(pallo); 
    299299        Keyboard.Disable(Key.Enter); 
    300300        pallo.IgnoresPhysicsLogics = false; 
    301301        if (haamu != null) haamu.Destroy(); 
     302        //tyokalu = -1; 
    302303 
    303304        liikkes = true; 
     
    327328    void LuoSlider() 
    328329    { 
    329         DoubleMeter zoomausKerroin = new DoubleMeter(0, -2, 0); 
     330        DoubleMeter zoomausKerroin = new DoubleMeter(0, -100, 0); 
    330331        zoomausKerroin.Changed += ZoomaaKenttaa; 
    331332 
     
    407408    void Uudestaan()  
    408409    { 
    409          
     410        IsPaused = false; 
    410411        ClearAll(); 
    411412        tyokalu = -1; 
    412413        Begin(); 
    413         IsPaused = false; 
    414414    } 
    415415             
  • 2016/24/JustusL/Object_Ball/Object_Ball/Object_Ball/obj/x86/Debug/ContentPipeline-{CD347656-A8F2-48EE-8097-A4F9AF1242F0}.xml

    r7767 r7770  
    88      <Processor>TextureProcessor</Processor> 
    99      <Options>None</Options> 
    10 <<<<<<< .mine 
    1110      <Output>C:\MyTemp\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\kaarikakka.xnb</Output> 
    1211      <Time>2016-07-05T10:37:41.3098919+03:00</Time> 
    13 ======= 
    14       <Output>C:\Users\Justus\Documents\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\kaarikakka.xnb</Output> 
    15       <Time>2016-06-16T11:35:20.4922466+03:00</Time> 
    16 >>>>>>> .r7763 
    1712    </Item> 
    1813    <Item> 
     
    2217      <Processor>TextureProcessor</Processor> 
    2318      <Options>None</Options> 
    24       <Output>C:\Users\Justus\Documents\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\kaariosa.xnb</Output> 
    25       <Time>2016-06-16T12:22:54.0854567+03:00</Time> 
     19      <Output>C:\MyTemp\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\kaariosa.xnb</Output> 
     20      <Time>2016-07-04T10:29:37.230784+03:00</Time> 
    2621    </Item> 
    2722    <Item> 
     
    3126      <Processor>TextureProcessor</Processor> 
    3227      <Options>None</Options> 
    33       <Output>C:\Users\Justus\Documents\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\kyna.xnb</Output> 
    34       <Time>2016-06-16T12:22:55.824712+03:00</Time> 
     28      <Output>C:\MyTemp\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\kyna.xnb</Output> 
     29      <Time>2016-07-04T10:29:37.090384+03:00</Time> 
    3530    </Item> 
    3631    <Item> 
     
    4035      <Processor>TextureProcessor</Processor> 
    4136      <Options>None</Options> 
    42       <Output>C:\Users\Justus\Documents\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\maali_objectBall.xnb</Output> 
    43       <Time>2016-06-16T11:35:20.5217772+03:00</Time> 
     37      <Output>C:\MyTemp\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\maali_objectBall.xnb</Output> 
     38      <Time>2016-07-04T10:29:37.090384+03:00</Time> 
    4439    </Item> 
    4540    <Item> 
     
    4944      <Processor>TextureProcessor</Processor> 
    5045      <Options>None</Options> 
    51       <Output>C:\Users\Justus\Documents\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\palikka kursori.xnb</Output> 
    52       <Time>2016-06-16T11:35:20.5287781+03:00</Time> 
     46      <Output>C:\MyTemp\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\palikka kursori.xnb</Output> 
     47      <Time>2016-07-04T10:29:37.230784+03:00</Time> 
    5348    </Item> 
    5449    <Item> 
     
    5853      <Processor>TextureProcessor</Processor> 
    5954      <Options>None</Options> 
    60       <Output>C:\Users\Justus\Documents\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\palikka.xnb</Output> 
    61       <Time>2016-06-16T12:22:56.4812302+03:00</Time> 
     55      <Output>C:\MyTemp\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\palikka.xnb</Output> 
     56      <Time>2016-07-04T10:29:37.090384+03:00</Time> 
    6257    </Item> 
    6358    <Item> 
     
    6762      <Processor>TextureProcessor</Processor> 
    6863      <Options>None</Options> 
    69       <Output>C:\Users\Justus\Documents\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\ruutu.xnb</Output> 
    70       <Time>2016-07-04T20:43:40.1219171+03:00</Time> 
     64      <Output>C:\MyTemp\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\ruutu.xnb</Output> 
     65      <Time>2016-07-04T13:04:34.8082709+03:00</Time> 
    7166    </Item> 
    72 <<<<<<< .mine 
    7367    <Item> 
    7468      <Source>kentta1.png</Source> 
     
    8983      <Time>2016-07-04T14:53:50.6394709+03:00</Time> 
    9084    </Item> 
    91 ======= 
    92     <Item> 
    93       <Source>kentta1.png</Source> 
    94       <Name>kentta1</Name> 
    95       <Importer>TextureImporter</Importer> 
    96       <Processor>TextureProcessor</Processor> 
    97       <Options>None</Options> 
    98       <Output>C:\Users\Justus\Documents\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\kentta1.xnb</Output> 
    99       <Time>2016-07-04T20:43:40.1929412+03:00</Time> 
    100     </Item> 
    101     <Item> 
    102       <Source>kentta2.png</Source> 
    103       <Name>kentta2</Name> 
    104       <Importer>TextureImporter</Importer> 
    105       <Processor>TextureProcessor</Processor> 
    106       <Options>None</Options> 
    107       <Output>C:\Users\Justus\Documents\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\kentta2.xnb</Output> 
    108       <Time>2016-07-04T20:43:40.2029413+03:00</Time> 
    109     </Item> 
    110 >>>>>>> .r7763 
    11185    <BuildSuccessful>true</BuildSuccessful> 
    11286    <Settings> 
     
    11690      <BuildConfiguration>Debug</BuildConfiguration> 
    11791      <CompressContent>false</CompressContent> 
    118       <RootDirectory>C:\Users\Justus\Documents\JustusL\Object_Ball\Object_Ball\Object_BallContent\</RootDirectory> 
    119       <LoggerRootDirectory>C:\Users\Justus\Documents\JustusL\Object_Ball\Object_Ball\Object_Ball\</LoggerRootDirectory> 
    120       <IntermediateDirectory>C:\Users\Justus\Documents\JustusL\Object_Ball\Object_Ball\Object_Ball\obj\x86\Debug\</IntermediateDirectory> 
    121       <OutputDirectory>C:\Users\Justus\Documents\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\</OutputDirectory> 
     92      <RootDirectory>C:\MyTemp\JustusL\Object_Ball\Object_Ball\Object_BallContent\</RootDirectory> 
     93      <LoggerRootDirectory>C:\MyTemp\JustusL\Object_Ball\Object_Ball\Object_Ball\</LoggerRootDirectory> 
     94      <IntermediateDirectory>C:\MyTemp\JustusL\Object_Ball\Object_Ball\Object_Ball\obj\x86\Debug\</IntermediateDirectory> 
     95      <OutputDirectory>C:\MyTemp\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\</OutputDirectory> 
    12296    </Settings> 
    12397    <Assemblies> 
    12498      <Assembly> 
    125         <Key>C:\Users\Justus\Jypeli\lib\ContentExtensions\TextFileContentExtension.dll</Key> 
    126         <Value>2015-04-01T18:41:16+03:00</Value> 
     99        <Key>C:\Program Files (x86)\Jypeli\lib\ContentExtensions\TextFileContentExtension.dll</Key> 
     100        <Value>2015-02-09T20:18:44+02:00</Value> 
    127101      </Assembly> 
    128102      <Assembly> 
     
    151125      </Assembly> 
    152126      <Assembly> 
    153         <Key>C:\Users\Justus\Jypeli\lib\ContentExtensions\AnimationExtension.dll</Key> 
    154         <Value>2015-04-01T18:41:16+03:00</Value> 
     127        <Key>C:\Program Files (x86)\Jypeli\lib\ContentExtensions\AnimationExtension.dll</Key> 
     128        <Value>2015-02-17T22:27:18+02:00</Value> 
    155129      </Assembly> 
    156130      <Assembly> 
    157         <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> 
    158         <Value>2015-12-15T06:54:21.9346879+02:00</Value> 
     131        <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> 
     132        <Value>2015-09-16T19:42:13.6500946+03:00</Value> 
    159133      </Assembly> 
    160134    </Assemblies> 
  • 2016/24/JustusL/Object_Ball/Object_Ball/Object_Ball/obj/x86/Debug/Object_Ball.csproj.FileListAbsolute.txt

    r7767 r7770  
    4444C:\MyTemp\JustusL\Object_Ball\Object_Ball\Object_Ball\obj\x86\Debug\Object_Ball.exe 
    4545C:\MyTemp\JustusL\Object_Ball\Object_Ball\Object_Ball\obj\x86\Debug\Object_Ball.pdb 
    46 <<<<<<< .mine 
    4746C:\MyTemp\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\kentta1.xnb 
    4847C:\MyTemp\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\kentta2.xnb 
    49 ======= 
    50 C:\Users\Justus\Documents\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\kentta1.xnb 
    51 C:\Users\Justus\Documents\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\kentta2.xnb 
    52 >>>>>>> .r7763 
Note: See TracChangeset for help on using the changeset viewer.