Changeset 5264


Ignore:
Timestamp:
2014-07-02 10:22:36 (5 years ago)
Author:
mijoilmo
Message:
 
Location:
2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor
Files:
1 deleted
13 edited

Legend:

Unmodified
Added
Removed
  • 2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Player.cs

    r5261 r5264  
    4545        Add(thrusterEffect); 
    4646    } 
     47    public override void Update(Time time) 
     48    { 
     49        if (this.Position.X>Level.Left){} 
     50        base.Update(time); 
     51    } 
    4752} 
  • 2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor.cs

    r5261 r5264  
    1212{ 
    1313    Player player; 
     14    ColorTileMap map; 
    1415    static public Dictionary<string, Image> images = new Dictionary<string, Image>(); 
    1516    void AssignKeys() 
     
    1718        Keyboard.Listen(Key.Escape, ButtonState.Down, Exit, "Lopeta Peli"); 
    1819        Keyboard.Listen(Key.Up, ButtonState.Down, player.thrusterStart, "Lento", 1.0); 
    19         Keyboard.Listen(Key.Up, ButtonState.Up, player.thrusterEnd, "Lento"); 
     20        Keyboard.Listen(Key.Up, ButtonState.Released, player.thrusterEnd, "Lento"); 
    2021        Keyboard.Listen(Key.Down, ButtonState.Down, player.thrusterStart, "Lento", -0.2); 
    21         Keyboard.Listen(Key.Down, ButtonState.Up, player.thrusterEnd, "Lento"); 
     22        Keyboard.Listen(Key.Down, ButtonState.Released, player.thrusterEnd, "Lento"); 
    2223        Keyboard.Listen(Key.Left, ButtonState.Down, player.rotate, "Lento", 4.0); 
    2324        Keyboard.Listen(Key.Right, ButtonState.Down, player.rotate, "Lento", -4.0); 
     
    2526    void LoadAllImages() 
    2627    { 
    27         images["background0"] = LoadImage("graphics/backgrounds/space_background"); 
    28         images["player"] = LoadImage("graphics/ships/player"); 
    29         images["tile0"] = LoadImage("graphics/tiles/tile0.png"); 
    3028        images["background0"] =                 LoadImage("graphics/backgrounds/space_background"); 
    3129        images["player"] =                      LoadImage("graphics/ships/player"); 
     
    4644        tileMap.SetTileMethod(Color.FromHexCode("000000"), createTile, ""); 
    4745        tileMap.SetTileMethod(Color.FromHexCode("ff0000"), spawnPlayer); 
    48         tileMap.Execute(20,20); 
    4946        tileMap.Execute(40,40); 
     47        map = tileMap; 
    5048    } 
    5149    void createTile(Vector position, double w, double h, string id) 
     
    6967        LoadAllImages(); 
    7068        this.player = new Player(); 
    71         LoadLevel("test"); 
     69        this.player.IsUpdated = true; 
     70        LoadLevel("0"); 
    7271    } 
    7372} 
  • 2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor.csproj.Debug.cachefile

    r5256 r5264  
    22Content\graphics\levels\0.xnb 
    33Content\graphics\ships\player.xnb 
    4 Content\graphics\levels\test.xnb 
    54Content\graphics\effects\thrusters\thruster0.1.xnb 
    65Content\graphics\effects\thrusters\thruster0.2.xnb 
  • 2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/obj/x86/Debug/ContentPipeline-{5156C658-EF8C-4216-BA6D-9928D133FE72}.xml

    r5263 r5264  
    2222======= 
    2323      <Output>C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\levels\0.xnb</Output> 
    24       <Time>2014-07-01T14:56:17.7711213+03:00</Time> 
     24      <Time>2014-07-02T09:56:28.5035703+03:00</Time> 
    2525>>>>>>> .r5260 
    2626    </Item> 
     
    3636<<<<<<< .mine 
    3737    <Item> 
     38<<<<<<< .mine 
     39======= 
    3840      <Source>graphics\levels\test.png</Source> 
    3941      <Name>graphics\levels\test</Name> 
     
    7375    </Item> 
    7476    <Item> 
     77>>>>>>> .r5263 
    7578      <Source>graphics\effects\thrusters\thruster0.1.png</Source> 
    7679      <Name>graphics\effects\thrusters\thruster0.1</Name> 
  • 2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/obj/x86/Debug/Protokolla236TrueSurvivor.csproj.FileListAbsolute.txt

    r5263 r5264  
    2525D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\effects\thrusters\thruster0.2.xnb 
    2626<<<<<<< .mine 
     27======= 
    2728C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\backgrounds\space_background.xnb 
    2829C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\levels\0.xnb 
     
    3940C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\obj\x86\Debug\Protokolla236TrueSurvivor.exe 
    4041C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\obj\x86\Debug\Protokolla236TrueSurvivor.pdb 
    41 ======= 
    4242C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\levels\test.xnb 
     43>>>>>>> .r5263 
    4344C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\effects\thrusters\thruster0.1.xnb 
    4445C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\effects\thrusters\thruster0.2.xnb 
  • 2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/obj/x86/Debug/cachefile-{5156C658-EF8C-4216-BA6D-9928D133FE72}-targetpath.txt

    r5256 r5264  
    22Content\graphics\levels\0.xnb 
    33Content\graphics\ships\player.xnb 
    4 Content\graphics\levels\test.xnb 
    54Content\graphics\effects\thrusters\thruster0.1.xnb 
    65Content\graphics\effects\thrusters\thruster0.2.xnb 
  • 2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivorContent/Protokolla236TrueSurvivorContent.contentproj

    r5256 r5264  
    7070  </ItemGroup> 
    7171  <ItemGroup> 
    72     <Compile Include="graphics\levels\test.png"> 
    73       <Name>test</Name> 
    74       <Importer>TextureImporter</Importer> 
    75       <Processor>TextureProcessor</Processor> 
    76     </Compile> 
    77   </ItemGroup> 
    78   <ItemGroup> 
    7972    <Compile Include="graphics\effects\thrusters\thruster0.1.png"> 
    8073      <Name>thruster0.1</Name> 
Note: See TracChangeset for help on using the changeset viewer.