Changeset 6636 for 2015


Ignore:
Timestamp:
2015-07-01 10:07:13 (6 years ago)
Author:
maankari
Message:
 
Location:
2015/27/BenjaminE/BenJaMarkPeli
Files:
3 added
1 deleted
14 edited

Legend:

Unmodified
Added
Removed

  • 2015/27/BenjaminE/BenJaMarkPeli/HacknSlash/HacknSlash/HacknSlash/HacknSlash.cs

    r6614 r6636  
    2727 
    2828{ 
    29     Image tokaP2Kuva = LoadImage("res/ekapelaaja2"); 
    3029    Image ekaPlKuva = LoadImage("res/ekaPelaaja"); 
     30    Image ekaPlKuva2 = LoadImage("res/ekaPelaaja2"); 
     31    Image ekaPlKuva3 = LoadImage("res/ekaPelaaja3"); 
     32    Image ekaPlKuva4 = LoadImage("res/ekaPelaaja4"); 
     33  
    3134    Image miekkaKuva = LoadImage("res/miekka"); 
    32     Image kolmasP3Kuva = LoadImage("res/ekapelaaja3"); 
    33     Image tokaP4Kuva = LoadImage("res/ekapelaaja4"); 
     35   
    3436    Pelaaja ekaPelaaja; 
    3537 
    … …  
    4446    { 
    4547        ekaPelaaja = new Pelaaja(ekaPlKuva); 
     48 
     49 
     50 
    4651        Add(ekaPelaaja); 
    4752        Ohjet(ekaPelaaja); 
    … …  
    5661 
    5762        Keyboard.Listen(Key.Up, ButtonState.Down, AsetaNopeus, "Liiku ylös.", pelaaja, ylos); 
    58         Keyboard.Listen(Key.Up, ButtonState.Pressed, AsetaKuva, null, pelaaja, ekaPlKuva); 
     63        Keyboard.Listen(Key.Up, ButtonState.Pressed, AsetaKuva, null, pelaaja, ekaPlKuva4); 
    5964        Keyboard.Listen(Key.Up, ButtonState.Released, AsetaNopeus, null, pelaaja, Vector.Zero); 
    6065 
    … …  
    6469 
    6570        Keyboard.Listen(Key.Right, ButtonState.Down, AsetaNopeus, "Liiku oikealle.", pelaaja, oikea); 
    66         Keyboard.Listen(Key.Right, ButtonState.Pressed, AsetaKuva, null, pelaaja, ekaPlKuva); 
     71        Keyboard.Listen(Key.Right, ButtonState.Pressed, AsetaKuva, null, pelaaja, ekaPlKuva2); 
    6772        Keyboard.Listen(Key.Right, ButtonState.Released, AsetaNopeus, null, pelaaja, Vector.Zero); 
    6873 
    6974        Keyboard.Listen(Key.Left, ButtonState.Down, AsetaNopeus, "Liiku vasemalle.", pelaaja, vasema); 
    70         Keyboard.Listen(Key.Left, ButtonState.Pressed, AsetaKuva, null, pelaaja, ekaPlKuva); 
     75        Keyboard.Listen(Key.Left, ButtonState.Pressed, AsetaKuva, null, pelaaja, ekaPlKuva3); 
    7176        Keyboard.Listen(Key.Left, ButtonState.Released, AsetaNopeus, null, pelaaja, Vector.Zero); 
    7277 

  • 2015/27/BenjaminE/BenJaMarkPeli/HacknSlash/HacknSlash/HacknSlash/HacknSlash.csproj.Debug.cachefile

    r6594 r6636  
    1 Content\res\ekaPelaaja.xnb 
    21Content\res\tausta.xnb 
    32Content\res\miekka.xnb 
     3Content\res\ekaPelaaja2.xnb 
     4Content\res\ekaPelaaja3.xnb 
     5Content\res\ekaPelaaja4.xnb 
     6Content\res\ekaPelaaja.xnb 

  • 2015/27/BenjaminE/BenJaMarkPeli/HacknSlash/HacknSlash/HacknSlash/obj/x86/Debug/ContentPipeline-{B50C5C81-ED9D-42F4-AD31-25D2EE77B745}.xml

    r6609 r6636  
    22<XnaContent xmlns:Pipeline="Microsoft.Xna.Framework.Content.Pipeline"> 
    33  <Asset Type="Pipeline:BuildItemCollection"> 
    4     <Item> 
    5       <Source>res\ekaPelaaja.png</Source> 
    6       <Name>res\ekaPelaaja</Name> 
    7       <Importer>TextureImporter</Importer> 
    8       <Processor>TextureProcessor</Processor> 
    9       <Options>None</Options> 
    10       <Output>C:\MyTemp\BenjaminE\BenJaMarkPeli\HacknSlash\HacknSlash\HacknSlash\bin\x86\Debug\Content\res\ekaPelaaja.xnb</Output> 
    11       <Time>2015-06-30T12:28:27.7739212+03:00</Time> 
    12     </Item> 
    134    <Item> 
    145      <Source>res\tausta.png</Source> 
    … …  
    178      <Processor>TextureProcessor</Processor> 
    189      <Options>None</Options> 
    19       <Output>C:\MyTemp\BenjaminE\BenJaMarkPeli\HacknSlash\HacknSlash\HacknSlash\bin\x86\Debug\Content\res\tausta.xnb</Output> 
    20       <Time>2015-06-30T12:28:27.7739212+03:00</Time> 
     10      <Output>C:\MyTemp\MarkR\BenJaMarkPeli\HacknSlash\HacknSlash\HacknSlash\bin\x86\Debug\Content\res\tausta.xnb</Output> 
     11      <Time>2015-07-01T09:58:37.1335406+03:00</Time> 
    2112    </Item> 
    2213    <Item> 
    … …  
    2617      <Processor>TextureProcessor</Processor> 
    2718      <Options>None</Options> 
    28       <Output>C:\MyTemp\BenjaminE\BenJaMarkPeli\HacknSlash\HacknSlash\HacknSlash\bin\x86\Debug\Content\res\miekka.xnb</Output> 
    29       <Time>2015-06-30T14:06:33.2677212+03:00</Time> 
     19      <Output>C:\MyTemp\MarkR\BenJaMarkPeli\HacknSlash\HacknSlash\HacknSlash\bin\x86\Debug\Content\res\miekka.xnb</Output> 
     20      <Time>2015-07-01T09:58:37.1235406+03:00</Time> 
     21    </Item> 
     22    <Item> 
     23      <Source>res\ekaPelaaja2.png</Source> 
     24      <Name>res\ekaPelaaja2</Name> 
     25      <Importer>TextureImporter</Importer> 
     26      <Processor>TextureProcessor</Processor> 
     27      <Options>None</Options> 
     28      <Output>C:\MyTemp\MarkR\BenJaMarkPeli\HacknSlash\HacknSlash\HacknSlash\bin\x86\Debug\Content\res\ekaPelaaja2.xnb</Output> 
     29      <Time>2015-07-01T09:58:37.1235406+03:00</Time> 
     30    </Item> 
     31    <Item> 
     32      <Source>res\ekaPelaaja3.png</Source> 
     33      <Name>res\ekaPelaaja3</Name> 
     34      <Importer>TextureImporter</Importer> 
     35      <Processor>TextureProcessor</Processor> 
     36      <Options>None</Options> 
     37      <Output>C:\MyTemp\MarkR\BenJaMarkPeli\HacknSlash\HacknSlash\HacknSlash\bin\x86\Debug\Content\res\ekaPelaaja3.xnb</Output> 
     38      <Time>2015-07-01T09:58:37.1235406+03:00</Time> 
     39    </Item> 
     40    <Item> 
     41      <Source>res\ekaPelaaja4.png</Source> 
     42      <Name>res\ekaPelaaja4</Name> 
     43      <Importer>TextureImporter</Importer> 
     44      <Processor>TextureProcessor</Processor> 
     45      <Options>None</Options> 
     46      <Output>C:\MyTemp\MarkR\BenJaMarkPeli\HacknSlash\HacknSlash\HacknSlash\bin\x86\Debug\Content\res\ekaPelaaja4.xnb</Output> 
     47      <Time>2015-07-01T09:58:37.1335406+03:00</Time> 
     48    </Item> 
     49    <Item> 
     50      <Source>res\ekaPelaaja.png</Source> 
     51      <Name>res\ekaPelaaja</Name> 
     52      <Importer>TextureImporter</Importer> 
     53      <Processor>TextureProcessor</Processor> 
     54      <Options>None</Options> 
     55      <Output>C:\MyTemp\MarkR\BenJaMarkPeli\HacknSlash\HacknSlash\HacknSlash\bin\x86\Debug\Content\res\ekaPelaaja.xnb</Output> 
     56      <Time>2015-07-01T09:58:37.1135406+03:00</Time> 
    3057    </Item> 
    3158    <BuildSuccessful>true</BuildSuccessful> 
    … …  
    3663      <BuildConfiguration>Debug</BuildConfiguration> 
    3764      <CompressContent>false</CompressContent> 
    38       <RootDirectory>C:\MyTemp\BenjaminE\BenJaMarkPeli\HacknSlash\HacknSlash\HacknSlashContent\</RootDirectory> 
    39       <LoggerRootDirectory>C:\MyTemp\BenjaminE\BenJaMarkPeli\HacknSlash\HacknSlash\HacknSlash\</LoggerRootDirectory> 
    40       <IntermediateDirectory>C:\MyTemp\BenjaminE\BenJaMarkPeli\HacknSlash\HacknSlash\HacknSlash\obj\x86\Debug\</IntermediateDirectory> 
    41       <OutputDirectory>C:\MyTemp\BenjaminE\BenJaMarkPeli\HacknSlash\HacknSlash\HacknSlash\bin\x86\Debug\Content\</OutputDirectory> 
     65      <RootDirectory>C:\MyTemp\MarkR\BenJaMarkPeli\HacknSlash\HacknSlash\HacknSlashContent\</RootDirectory> 
     66      <LoggerRootDirectory>C:\MyTemp\MarkR\BenJaMarkPeli\HacknSlash\HacknSlash\HacknSlash\</LoggerRootDirectory> 
     67      <IntermediateDirectory>C:\MyTemp\MarkR\BenJaMarkPeli\HacknSlash\HacknSlash\HacknSlash\obj\x86\Debug\</IntermediateDirectory> 
     68      <OutputDirectory>C:\MyTemp\MarkR\BenJaMarkPeli\HacknSlash\HacknSlash\HacknSlash\bin\x86\Debug\Content\</OutputDirectory> 
    4269    </Settings> 
    4370    <Assemblies> 
    … …  
    4875      <Assembly> 
    4976        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.XImporter.dll</Key> 
    50         <Value>2011-09-01T17:22:30+03:00</Value> 
     77        <Value>2011-09-01T16:22:30+03:00</Value> 
    5178      </Assembly> 
    5279      <Assembly> 
    5380        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.VideoImporters.dll</Key> 
    54         <Value>2011-09-01T17:22:30+03:00</Value> 
     81        <Value>2011-09-01T16:22:30+03:00</Value> 
    5582      </Assembly> 
    5683      <Assembly> 
    5784        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.TextureImporter.dll</Key> 
    58         <Value>2011-09-01T17:22:30+03:00</Value> 
     85        <Value>2011-09-01T16:22:30+03:00</Value> 
    5986      </Assembly> 
    6087      <Assembly> 
    6188        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.FBXImporter.dll</Key> 
    62         <Value>2011-09-01T17:22:30+03:00</Value> 
     89        <Value>2011-09-01T16:22:30+03:00</Value> 
    6390      </Assembly> 
    6491      <Assembly> 
    6592        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.EffectImporter.dll</Key> 
    66         <Value>2011-09-01T17:22:30+03:00</Value> 
     93        <Value>2011-09-01T16:22:30+03:00</Value> 
    6794      </Assembly> 
    6895      <Assembly> 
    6996        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.AudioImporters.dll</Key> 
    70         <Value>2011-09-01T17:22:30+03:00</Value> 
     97        <Value>2011-09-01T16:22:30+03:00</Value> 
    7198      </Assembly> 
    7299      <Assembly> 
    … …  
    76103      <Assembly> 
    77104        <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> 
    78         <Value>2012-03-16T14:33:41.9515583+02:00</Value> 
     105        <Value>2012-07-09T09:25:46.7449733+03:00</Value> 
    79106      </Assembly> 
    80107    </Assemblies> 

  • 2015/27/BenjaminE/BenJaMarkPeli/HacknSlash/HacknSlash/HacknSlash/obj/x86/Debug/HacknSlash.csproj.FileListAbsolute.txt

    r6609 r6636  
    1010C:\MyTemp\BenjaminE\BenJaMarkPeli\HacknSlash\HacknSlash\HacknSlash\obj\x86\Debug\HacknSlash.pdb 
    1111C:\MyTemp\BenjaminE\BenJaMarkPeli\HacknSlash\HacknSlash\HacknSlash\bin\x86\Debug\Content\res\miekka.xnb 
     12C:\MyTemp\MarkR\BenJaMarkPeli\HacknSlash\HacknSlash\HacknSlash\bin\x86\Debug\Content\res\tausta.xnb 
     13C:\MyTemp\MarkR\BenJaMarkPeli\HacknSlash\HacknSlash\HacknSlash\bin\x86\Debug\Content\res\miekka.xnb 
     14C:\MyTemp\MarkR\BenJaMarkPeli\HacknSlash\HacknSlash\HacknSlash\bin\x86\Debug\Content\res\ekaPelaaja2.xnb 
     15C:\MyTemp\MarkR\BenJaMarkPeli\HacknSlash\HacknSlash\HacknSlash\bin\x86\Debug\Content\res\ekaPelaaja3.xnb 
     16C:\MyTemp\MarkR\BenJaMarkPeli\HacknSlash\HacknSlash\HacknSlash\bin\x86\Debug\Content\res\ekaPelaaja4.xnb 
     17C:\MyTemp\MarkR\BenJaMarkPeli\HacknSlash\HacknSlash\HacknSlash\bin\x86\Debug\Content\res\ekaPelaaja.xnb 
     18C:\MyTemp\MarkR\BenJaMarkPeli\HacknSlash\HacknSlash\HacknSlash\bin\x86\Debug\HacknSlash.exe 
     19C:\MyTemp\MarkR\BenJaMarkPeli\HacknSlash\HacknSlash\HacknSlash\bin\x86\Debug\HacknSlash.pdb 
     20C:\MyTemp\MarkR\BenJaMarkPeli\HacknSlash\HacknSlash\HacknSlash\bin\x86\Debug\Jypeli.dll 
     21C:\MyTemp\MarkR\BenJaMarkPeli\HacknSlash\HacknSlash\HacknSlash\bin\x86\Debug\Jypeli.xml 
     22C:\MyTemp\MarkR\BenJaMarkPeli\HacknSlash\HacknSlash\HacknSlash\obj\x86\Debug\HacknSlash.csprojResolveAssemblyReference.cache 
     23C:\MyTemp\MarkR\BenJaMarkPeli\HacknSlash\HacknSlash\HacknSlash\obj\x86\Debug\Microsoft.Xna.Framework.RuntimeProfile.txt 
     24C:\MyTemp\MarkR\BenJaMarkPeli\HacknSlash\HacknSlash\HacknSlash\obj\x86\Debug\HacknSlash.exe 
     25C:\MyTemp\MarkR\BenJaMarkPeli\HacknSlash\HacknSlash\HacknSlash\obj\x86\Debug\HacknSlash.pdb 

  • 2015/27/BenjaminE/BenJaMarkPeli/HacknSlash/HacknSlash/HacknSlash/obj/x86/Debug/cachefile-{B50C5C81-ED9D-42F4-AD31-25D2EE77B745}-targetpath.txt

    r6600 r6636  
    1 Content\res\ekaPelaaja.xnb 
    21Content\res\tausta.xnb 
    32Content\res\miekka.xnb 
     3Content\res\ekaPelaaja2.xnb 
     4Content\res\ekaPelaaja3.xnb 
     5Content\res\ekaPelaaja4.xnb 
     6Content\res\ekaPelaaja.xnb 

  • 2015/27/BenjaminE/BenJaMarkPeli/HacknSlash/HacknSlash/HacknSlashContent/obj/x86/Debug/HacknSlashContent.contentproj.FileListAbsolute.txt

    r6609 r6636  
    11C:\MyTemp\BenjaminE\BenJaMarkPeli\HacknSlash\HacknSlash\HacknSlashContent\obj\x86\Debug\HacknSlashContent.contentprojResolveAssemblyReference.cache 
     2C:\MyTemp\MarkR\BenJaMarkPeli\HacknSlash\HacknSlash\HacknSlashContent\obj\x86\Debug\HacknSlashContent.contentprojResolveAssemblyReference.cache 
Note: See TracChangeset for help on using the changeset viewer.