Changeset 6980


Ignore:
Timestamp:
2015-07-23 14:49:26 (4 years ago)
Author:
aahalme
Message:

uusin versio

Location:
2015/30/EliasHy/SpaceAdventure
Files:
13 edited

Legend:

Unmodified
Added
Removed
  • 2015/30/EliasHy/SpaceAdventure/SpaceAdventure/SpaceAdventure/SpaceAdventure.cs

    r6979 r6980  
    5050        ClearAll(); 
    5151        LuoKentta(); 
    52  
     52   
    5353        Camera.Zoom(2.5); 
    5454        Camera.FollowedObject = pelaaja; 
     
    180180        AddCollisionHandler(pelaaja, "bossinammus", delegate(PhysicsObject A, PhysicsObject B) 
    181181        { 
    182             PelaajaVahingoittuu(A, B, 4); 
    183         }); 
    184  
    185         elamaLaskuri = new DoubleMeter(10); 
    186         elamaLaskuri.MaxValue = 15; 
     182            PelaajaVahingoittuu(A, B, 3); 
     183        }); 
     184 
     185        elamaLaskuri = new DoubleMeter(25); 
     186        elamaLaskuri.MaxValue = 25; 
    187187        elamaLaskuri.LowerLimit += ElamaLoppui; 
    188188 
     
    205205        Add(Vihollinen); 
    206206        Vihollinen.Tag = "pahis"; 
     207        Vihollinen.AngularDamping = 0.2; 
    207208 
    208209        //AddCollisionHandler(Laser, CollisionHandler.ExplodeTarget(150, false)); 
     
    228229 
    229230        FollowerBrain seuraajanAivot = new FollowerBrain("pelaaja"); 
    230         seuraajanAivot.Speed = 200; 
     231        seuraajanAivot.Speed = 50; 
    231232        Bossi.Brain = seuraajanAivot; 
    232233 
     
    286287        Vihollinen2.Tag = "pahis2"; 
    287288        Vihollinen2.Mass = 70; 
     289        Vihollinen2.AngularDamping = 0.2; 
    288290 
    289291        //Tehdään uudet satunnaisaivot, jotka liikkuvat nopeudella 200 
  • 2015/30/EliasHy/SpaceAdventure/SpaceAdventure/SpaceAdventure/obj/x86/Debug/SpaceAdventure.csproj.FileListAbsolute.txt

    r6979 r6980  
    3636C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\Stuff.xnb 
    3737C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\cool tausta new.xnb 
     38C:\MyTemp\peli 23.7\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\cool tausta.xnb 
     39C:\MyTemp\peli 23.7\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\cool alus.xnb 
     40C:\MyTemp\peli 23.7\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\cool asteroid bu.xnb 
     41C:\MyTemp\peli 23.7\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\coolhyvisalus.xnb 
     42C:\MyTemp\peli 23.7\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\coolasteroidya.xnb 
     43C:\MyTemp\peli 23.7\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\cool space.xnb 
     44C:\MyTemp\peli 23.7\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\Boss Ship_zpspn6osve5.xnb 
     45C:\MyTemp\peli 23.7\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\enemy ship 2.xnb 
     46C:\MyTemp\peli 23.7\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\laser.xnb 
     47C:\MyTemp\peli 23.7\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\Stuff.xnb 
     48C:\MyTemp\peli 23.7\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\cool tausta new.xnb 
     49C:\MyTemp\peli 23.7\SpaceAdventure\SpaceAdventure\bin\x86\Debug\SpaceAdventure.exe 
     50C:\MyTemp\peli 23.7\SpaceAdventure\SpaceAdventure\bin\x86\Debug\SpaceAdventure.pdb 
     51C:\MyTemp\peli 23.7\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Jypeli.dll 
     52C:\MyTemp\peli 23.7\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Jypeli.xml 
     53C:\MyTemp\peli 23.7\SpaceAdventure\SpaceAdventure\obj\x86\Debug\SpaceAdventure.csprojResolveAssemblyReference.cache 
     54C:\MyTemp\peli 23.7\SpaceAdventure\SpaceAdventure\obj\x86\Debug\Microsoft.Xna.Framework.RuntimeProfile.txt 
     55C:\MyTemp\peli 23.7\SpaceAdventure\SpaceAdventure\obj\x86\Debug\SpaceAdventure.exe 
     56C:\MyTemp\peli 23.7\SpaceAdventure\SpaceAdventure\obj\x86\Debug\SpaceAdventure.pdb 
  • 2015/30/EliasHy/SpaceAdventure/SpaceAdventure/SpaceAdventureContent/obj/x86/Debug/ContentPipeline.xml

    r6979 r6980  
    88      <Processor>TextureProcessor</Processor> 
    99      <Options>None</Options> 
    10       <Output>C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\cool tausta.xnb</Output> 
    11       <Time>2015-07-23T12:53:23.8300809+03:00</Time> 
     10      <Output>C:\MyTemp\peli 23.7\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\cool tausta.xnb</Output> 
     11      <Time>2015-07-23T14:31:23.4720825+03:00</Time> 
    1212    </Item> 
    1313    <Item> 
     
    1717      <Processor>TextureProcessor</Processor> 
    1818      <Options>None</Options> 
    19       <Output>C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\cool alus.xnb</Output> 
    20       <Time>2015-07-21T14:12:05.8146469+03:00</Time> 
     19      <Output>C:\MyTemp\peli 23.7\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\cool alus.xnb</Output> 
     20      <Time>2015-07-23T14:31:23.4750825+03:00</Time> 
    2121    </Item> 
    2222    <Item> 
     
    2626      <Processor>TextureProcessor</Processor> 
    2727      <Options>None</Options> 
    28       <Output>C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\cool asteroid bu.xnb</Output> 
    29       <Time>2015-07-21T14:55:03.3357265+03:00</Time> 
     28      <Output>C:\MyTemp\peli 23.7\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\cool asteroid bu.xnb</Output> 
     29      <Time>2015-07-23T14:31:23.4680825+03:00</Time> 
    3030    </Item> 
    3131    <Item> 
     
    3535      <Processor>TextureProcessor</Processor> 
    3636      <Options>None</Options> 
    37       <Output>C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\coolhyvisalus.xnb</Output> 
    38       <Time>2015-07-22T11:35:17.1851187+03:00</Time> 
     37      <Output>C:\MyTemp\peli 23.7\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\coolhyvisalus.xnb</Output> 
     38      <Time>2015-07-23T14:31:23.4500825+03:00</Time> 
    3939    </Item> 
    4040    <Item> 
     
    4444      <Processor>TextureProcessor</Processor> 
    4545      <Options>None</Options> 
    46       <Output>C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\coolasteroidya.xnb</Output> 
    47       <Time>2015-07-21T14:55:35.1129265+03:00</Time> 
     46      <Output>C:\MyTemp\peli 23.7\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\coolasteroidya.xnb</Output> 
     47      <Time>2015-07-23T14:31:23.4780825+03:00</Time> 
    4848    </Item> 
    4949    <Item> 
     
    5353      <Processor>TextureProcessor</Processor> 
    5454      <Options>None</Options> 
    55       <Output>C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\cool space.xnb</Output> 
    56       <Time>2015-07-22T11:05:32.8286354+03:00</Time> 
     55      <Output>C:\MyTemp\peli 23.7\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\cool space.xnb</Output> 
     56      <Time>2015-07-23T14:31:23.4620825+03:00</Time> 
    5757    </Item> 
    5858    <Item> 
     
    6262      <Processor>TextureProcessor</Processor> 
    6363      <Options>None</Options> 
    64       <Output>C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\Boss Ship_zpspn6osve5.xnb</Output> 
    65       <Time>2015-07-22T12:56:39.8323187+03:00</Time> 
     64      <Output>C:\MyTemp\peli 23.7\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\Boss Ship_zpspn6osve5.xnb</Output> 
     65      <Time>2015-07-23T14:31:23.4450825+03:00</Time> 
    6666    </Item> 
    6767    <Item> 
     
    7171      <Processor>TextureProcessor</Processor> 
    7272      <Options>None</Options> 
    73       <Output>C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\enemy ship 2.xnb</Output> 
    74       <Time>2015-07-22T13:01:57.3205187+03:00</Time> 
     73      <Output>C:\MyTemp\peli 23.7\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\enemy ship 2.xnb</Output> 
     74      <Time>2015-07-23T14:31:23.4940825+03:00</Time> 
    7575    </Item> 
    7676    <Item> 
     
    8080      <Processor>TextureProcessor</Processor> 
    8181      <Options>None</Options> 
    82       <Output>C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\laser.xnb</Output> 
    83       <Time>2015-07-23T09:57:07.8638619+03:00</Time> 
     82      <Output>C:\MyTemp\peli 23.7\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\laser.xnb</Output> 
     83      <Time>2015-07-23T14:31:23.4590825+03:00</Time> 
    8484    </Item> 
    8585    <Item> 
     
    8989      <Processor>TextureProcessor</Processor> 
    9090      <Options>None</Options> 
    91       <Output>C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\Stuff.xnb</Output> 
    92       <Time>2015-07-23T12:42:37.5810809+03:00</Time> 
     91      <Output>C:\MyTemp\peli 23.7\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\Stuff.xnb</Output> 
     92      <Time>2015-07-23T14:31:23.6860825+03:00</Time> 
    9393    </Item> 
    9494    <Item> 
     
    9898      <Processor>TextureProcessor</Processor> 
    9999      <Options>None</Options> 
    100       <Output>C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\cool tausta new.xnb</Output> 
    101       <Time>2015-07-23T13:25:00.6790809+03:00</Time> 
     100      <Output>C:\MyTemp\peli 23.7\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\cool tausta new.xnb</Output> 
     101      <Time>2015-07-23T14:38:03.2060825+03:00</Time> 
    102102    </Item> 
    103103    <BuildSuccessful>true</BuildSuccessful> 
     
    107107      <BuildConfiguration>Debug</BuildConfiguration> 
    108108      <CompressContent>false</CompressContent> 
    109       <RootDirectory>C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventureContent\</RootDirectory> 
    110       <LoggerRootDirectory>C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventure\</LoggerRootDirectory> 
    111       <IntermediateDirectory>C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventureContent\obj\x86\Debug\</IntermediateDirectory> 
    112       <OutputDirectory>C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\</OutputDirectory> 
     109      <RootDirectory>C:\MyTemp\peli 23.7\SpaceAdventure\SpaceAdventureContent\</RootDirectory> 
     110      <LoggerRootDirectory>C:\MyTemp\peli 23.7\SpaceAdventure\SpaceAdventure\</LoggerRootDirectory> 
     111      <IntermediateDirectory>C:\MyTemp\peli 23.7\SpaceAdventure\SpaceAdventureContent\obj\x86\Debug\</IntermediateDirectory> 
     112      <OutputDirectory>C:\MyTemp\peli 23.7\SpaceAdventure\SpaceAdventure\bin\x86\Debug\Content\</OutputDirectory> 
    113113    </Settings> 
    114114    <Assemblies> 
     
    147147      <Assembly> 
    148148        <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> 
    149         <Value>2015-07-09T14:51:24.2760228+03:00</Value> 
     149        <Value>2015-07-09T14:19:15.2277481+03:00</Value> 
    150150      </Assembly> 
    151151    </Assemblies> 
  • 2015/30/EliasHy/SpaceAdventure/SpaceAdventure/SpaceAdventureContent/obj/x86/Debug/SpaceAdventureContent.contentproj.FileListAbsolute.txt

    r6951 r6980  
    11C:\MyTemp\EliasHy\SpaceAdventure\SpaceAdventure\SpaceAdventureContent\obj\x86\Debug\SpaceAdventureContent.contentprojResolveAssemblyReference.cache 
    22C:\MyTemp\hyva\SpaceAdventure\SpaceAdventureContent\obj\x86\Debug\SpaceAdventureContent.contentprojResolveAssemblyReference.cache 
     3C:\MyTemp\peli 23.7\SpaceAdventure\SpaceAdventureContent\obj\x86\Debug\SpaceAdventureContent.contentprojResolveAssemblyReference.cache 
Note: See TracChangeset for help on using the changeset viewer.