Changeset 5462 for 2014/27


Ignore:
Timestamp:
2014-07-20 12:12:50 (5 years ago)
Author:
mijoilmo
Message:
 
Location:
2014/27/AleksanteriV/Protokolla236TrueSurvivor
Files:
1 added
8 deleted
17 edited

Legend:

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

    r5461 r5462  
    135135            foreach (KeyValuePair<string, Planet> kvpair in parent.Galaxy.planets) 
    136136            { 
    137                 if (Vector.Distance(this.Position, kvpair.Value.Position) < kvpair.Value.Radius) 
     137                if (Vector.Distance(this.Position, kvpair.Value.Position) < kvpair.Value.Radius - 300) 
    138138                { 
    139139                    //mennään planeettaan 
  • 2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor.cs

    r5461 r5462  
    4141    void LoadAllImages() 
    4242    { 
    43         images["space_background-0"] = LoadImage("graphics/backgrounds/Space0"); 
    44         images["space_background-1"] = LoadImage("graphics/backgrounds/Space-1"); 
    45         images["space_background-2"] = LoadImage("graphics/backgrounds/Space-2"); 
    46         images["space_background-3"] = LoadImage("graphics/backgrounds/Space-3"); 
     43        images["space_background"] = LoadImage("graphics/backgrounds/Space"); 
    4744        images["mars_background"] = LoadImage("graphics/backgrounds/Mars"); 
    4845        images["planet1_background"] = LoadImage("graphics/backgrounds/planet1"); 
    4946        images["planet2_background"] = LoadImage("graphics/backgrounds/planet2"); 
    5047        images["planet2_valetta"] = LoadImage("graphics/backgrounds/planet2_valetta"); 
    51         images["planet2"] = LoadImage("graphics/Planets/MapPlanet1"); 
     48        images["planet2"] = LoadImage("graphics/Planets/MapPlanet4"); 
    5249        images["planet3"] = LoadImage("graphics/Planets/MapPlanet3"); 
    5350        images["planet3_background"] = LoadImage("graphics/backgrounds/planet1"); 
     
    109106            Gravity = new Vector(0, 0); 
    110107            player.LinearDamping = 1;//avaruudessa ei ilmanvastusta 
    111             Camera.Zoom(0.2); 
     108            Camera.Zoom(0.4); 
    112109            if (galaxy.CurrentPlanet != null)//current planet voi olla null jos pelaaja ei vielä ole käynyt millään planeetalla. 
    113110            { 
     
    118115                player.AbsoluteAngle = planetAngle; 
    119116            } 
    120             Layers[-3].RelativeTransition = new Vector(0.06, 0.06); 
    121             Layers[-2].RelativeTransition = new Vector(0.08, 0.08); 
    122117            Layers[-1].RelativeTransition = new Vector(0.1, 0.1); 
    123118        } 
     
    219214        else 
    220215        { 
    221             CreateBg("space_background-3", "", 0, 0.06); 
    222             CreateBg("space_background-2", "", 0, 0.07, -2); 
    223             CreateBg("space_background-1", "", 0, 0.08, -1); 
     216            CreateBg("space_background","",0,1,-1); 
    224217        } 
    225218    } 
  • 2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor.csproj.Debug.cachefile

    r5461 r5462  
    3535Content\graphics\HUD\RadarPlaneetta1.2.xnb 
    3636Content\graphics\ships\player1.0.xnb 
    37 Content\graphics\backgrounds\Space-1.xnb 
    38 Content\graphics\backgrounds\Space-2.xnb 
    39 Content\graphics\backgrounds\Space-3.xnb 
    40 Content\graphics\backgrounds\Space0.xnb 
    4137Content\graphics\levels\planet3.xnb 
    4238Content\graphics\backgrounds\planet3_valetta.xnb 
     
    5450Content\soundFx\raketti.xnb 
    5551Content\music\Explosion3.xnb 
     52Content\graphics\backgrounds\Space.xnb 
    5653Content\music\cold_heart_of_the_klondike-j7JwprGVSjA_fmt43.wma 
    5754Content\music\nitrome - Canopy.wma 
  • 2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/obj/x86/Debug/Protokolla236TrueSurvivor.csproj.FileListAbsolute.txt

    r5461 r5462  
    130130D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\HUD\RadarPlaneetta1.2.xnb 
    131131D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\ships\player1.0.xnb 
    132 D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\backgrounds\Space-1.xnb 
    133 D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\backgrounds\Space-2.xnb 
    134 D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\backgrounds\Space-3.xnb 
    135 D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\backgrounds\Space0.xnb 
    136132D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\levels\planet3.xnb 
    137133D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\backgrounds\planet3_valetta.xnb 
     
    159155D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\music\nitrome - worm food.wma 
    160156D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\music\SmoothSpaceJazz.wma 
     157D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\backgrounds\Space.xnb 
  • 2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/obj/x86/Debug/cachefile-{5156C658-EF8C-4216-BA6D-9928D133FE72}-targetpath.txt

    r5461 r5462  
    3535Content\graphics\HUD\RadarPlaneetta1.2.xnb 
    3636Content\graphics\ships\player1.0.xnb 
    37 Content\graphics\backgrounds\Space-1.xnb 
    38 Content\graphics\backgrounds\Space-2.xnb 
    39 Content\graphics\backgrounds\Space-3.xnb 
    40 Content\graphics\backgrounds\Space0.xnb 
    4137Content\graphics\levels\planet3.xnb 
    4238Content\graphics\backgrounds\planet3_valetta.xnb 
     
    6460Content\soundFx\raketti.xnb 
    6561Content\music\Explosion3.xnb 
     62Content\graphics\backgrounds\Space.xnb 
  • 2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivorContent/Protokolla236TrueSurvivorContent.contentproj

    r5459 r5462  
    338338  </ItemGroup> 
    339339  <ItemGroup> 
    340     <Compile Include="graphics\backgrounds\Space-1.png"> 
    341       <Name>Space-1</Name> 
    342       <Importer>TextureImporter</Importer> 
    343       <Processor>TextureProcessor</Processor> 
    344     </Compile> 
    345     <Compile Include="graphics\backgrounds\Space-2.png"> 
    346       <Name>Space-2</Name> 
    347       <Importer>TextureImporter</Importer> 
    348       <Processor>TextureProcessor</Processor> 
    349     </Compile> 
    350     <Compile Include="graphics\backgrounds\Space-3.png"> 
    351       <Name>Space-3</Name> 
    352       <Importer>TextureImporter</Importer> 
    353       <Processor>TextureProcessor</Processor> 
    354     </Compile> 
    355     <Compile Include="graphics\backgrounds\Space0.jpg"> 
    356       <Name>Space0</Name> 
    357       <Importer>TextureImporter</Importer> 
    358       <Processor>TextureProcessor</Processor> 
    359     </Compile> 
    360   </ItemGroup> 
    361   <ItemGroup> 
    362340    <Compile Include="graphics\levels\planet3.png"> 
    363341      <Name>planet3</Name> 
     
    369347    <Compile Include="graphics\backgrounds\planet3_valetta.png"> 
    370348      <Name>planet3_valetta</Name> 
     349      <Importer>TextureImporter</Importer> 
     350      <Processor>TextureProcessor</Processor> 
     351    </Compile> 
     352  </ItemGroup> 
     353  <ItemGroup> 
     354    <Compile Include="graphics\backgrounds\Space.jpg"> 
     355      <Name>Space</Name> 
    371356      <Importer>TextureImporter</Importer> 
    372357      <Processor>TextureProcessor</Processor> 
  • 2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivorContent/obj/x86/Debug/ContentPipeline.xml

    r5461 r5462  
    270270      <Options>None</Options> 
    271271      <Output>D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\Planets\MapPlanet4.xnb</Output> 
    272       <Time>2014-07-06T09:59:22.5943325+03:00</Time> 
     272      <Time>2014-07-20T12:06:36.6408395+03:00</Time> 
    273273    </Item> 
    274274    <Item> 
     
    325325      <Output>D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\ships\player1.0.xnb</Output> 
    326326      <Time>2014-07-06T17:31:01.7068276+03:00</Time> 
    327     </Item> 
    328     <Item> 
    329       <Source>graphics\backgrounds\Space-1.png</Source> 
    330       <Name>graphics\backgrounds\Space-1</Name> 
    331       <Importer>TextureImporter</Importer> 
    332       <Processor>TextureProcessor</Processor> 
    333       <Options>None</Options> 
    334       <Output>D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\backgrounds\Space-1.xnb</Output> 
    335       <Time>2014-07-06T09:59:18.1951248+03:00</Time> 
    336     </Item> 
    337     <Item> 
    338       <Source>graphics\backgrounds\Space-2.png</Source> 
    339       <Name>graphics\backgrounds\Space-2</Name> 
    340       <Importer>TextureImporter</Importer> 
    341       <Processor>TextureProcessor</Processor> 
    342       <Options>None</Options> 
    343       <Output>D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\backgrounds\Space-2.xnb</Output> 
    344       <Time>2014-07-06T17:52:56.7776076+03:00</Time> 
    345     </Item> 
    346     <Item> 
    347       <Source>graphics\backgrounds\Space-3.png</Source> 
    348       <Name>graphics\backgrounds\Space-3</Name> 
    349       <Importer>TextureImporter</Importer> 
    350       <Processor>TextureProcessor</Processor> 
    351       <Options>None</Options> 
    352       <Output>D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\backgrounds\Space-3.xnb</Output> 
    353       <Time>2014-07-06T09:59:18.2107248+03:00</Time> 
    354     </Item> 
    355     <Item> 
    356       <Source>graphics\backgrounds\Space0.jpg</Source> 
    357       <Name>graphics\backgrounds\Space0</Name> 
    358       <Importer>TextureImporter</Importer> 
    359       <Processor>TextureProcessor</Processor> 
    360       <Options>None</Options> 
    361       <Output>D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\backgrounds\Space0.xnb</Output> 
    362       <Time>2014-07-06T09:59:18.1795248+03:00</Time> 
    363327    </Item> 
    364328    <Item> 
     
    506470      <Output>D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\music\Explosion3.xnb</Output> 
    507471      <Time>2014-07-06T09:59:56.1031914+03:00</Time> 
     472    </Item> 
     473    <Item> 
     474      <Source>graphics\backgrounds\Space.jpg</Source> 
     475      <Name>graphics\backgrounds\Space</Name> 
     476      <Importer>TextureImporter</Importer> 
     477      <Processor>TextureProcessor</Processor> 
     478      <Options>None</Options> 
     479      <Output>D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\backgrounds\Space.xnb</Output> 
     480      <Time>2014-07-20T11:52:50.3641157+03:00</Time> 
    508481    </Item> 
    509482    <BuildSuccessful>true</BuildSuccessful> 
Note: See TracChangeset for help on using the changeset viewer.