Changeset 1012 for 2010/23


Ignore:
Timestamp:
2010-06-19 15:41:56 (13 years ago)
Author:
hniemi
Message:

Versionhallinnan käytön opettelua....

Location:
2010/23/hniemi/oksa/ShootEmUp
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • 2010/23/hniemi/oksa/ShootEmUp/ShootEmUp/Alus.cs

    r1010 r1012  
    9191        public void Shoot(Timer sender) 
    9292        { 
    93             this.Position = new Vector(0, 0); 
    94             Game.Add(this.Shoot()); 
    95             //this.Shoot(); 
     93            //this.Position = new Vector(0, 0); 
     94            //Game.Add(this.Shoot()); 
     95            this.Shoot(); 
    9696        } 
    9797 

  • 2010/23/hniemi/oksa/ShootEmUp/ShootEmUp/Content/obj/x86/Debug/Content.contentproj.FileListAbsolute.txt

    r823 r1012  
    11D:\Opiskelu\kurssit\NPO2010\ShootEmUp\ShootEmUp\Content\obj\x86\Debug\ResolveAssemblyReference.cache 
    22C:\MyTemp\hniemi\ShootEmUp\ShootEmUp\Content\obj\x86\Debug\ResolveAssemblyReference.cache 
     3D:\Opiskelu\kurssit\NPO2010\Shootemup\ShootEmUp\ShootEmUp\Content\obj\x86\Debug\ResolveAssemblyReference.cache 

  • 2010/23/hniemi/oksa/ShootEmUp/ShootEmUp/Content/obj/x86/Debug/ContentPipeline.xml

    r1010 r1012  
    88      <Processor>TextureProcessor</Processor> 
    99      <Options>None</Options> 
    10       <Output>D:\Opiskelu\kurssit\NPO2010\ShootEmUp\ShootEmUp\bin\x86\Debug\Content\vihollinen2.xnb</Output> 
    11       <Time>2010-06-16T17:53:54+03:00</Time> 
     10      <Output>D:\Opiskelu\kurssit\NPO2010\Shootemup\ShootEmUp\ShootEmUp\bin\x86\Debug\Content\vihollinen2.xnb</Output> 
     11      <Time>2010-06-19T15:39:24+03:00</Time> 
    1212    </Item> 
    1313    <Item> 
    … …  
    1717      <Processor>TextureProcessor</Processor> 
    1818      <Options>None</Options> 
    19       <Output>D:\Opiskelu\kurssit\NPO2010\ShootEmUp\ShootEmUp\bin\x86\Debug\Content\vihollinen1.xnb</Output> 
    20       <Time>2010-06-18T20:59:40+03:00</Time> 
     19      <Output>D:\Opiskelu\kurssit\NPO2010\Shootemup\ShootEmUp\ShootEmUp\bin\x86\Debug\Content\vihollinen1.xnb</Output> 
     20      <Time>2010-06-19T15:39:24+03:00</Time> 
    2121    </Item> 
    2222    <Item> 
    … …  
    2626      <Processor>TextureProcessor</Processor> 
    2727      <Options>None</Options> 
    28       <Output>D:\Opiskelu\kurssit\NPO2010\ShootEmUp\ShootEmUp\bin\x86\Debug\Content\ohjus.xnb</Output> 
    29       <Time>2010-06-14T15:38:56+03:00</Time> 
     28      <Output>D:\Opiskelu\kurssit\NPO2010\Shootemup\ShootEmUp\ShootEmUp\bin\x86\Debug\Content\ohjus.xnb</Output> 
     29      <Time>2010-06-19T15:39:24+03:00</Time> 
    3030    </Item> 
    3131    <Item> 
    … …  
    3535      <Processor>TextureProcessor</Processor> 
    3636      <Options>None</Options> 
    37       <Output>D:\Opiskelu\kurssit\NPO2010\ShootEmUp\ShootEmUp\bin\x86\Debug\Content\sankarialus\sankarialusThrust1.xnb</Output> 
    38       <Time>2010-06-16T17:53:54+03:00</Time> 
     37      <Output>D:\Opiskelu\kurssit\NPO2010\Shootemup\ShootEmUp\ShootEmUp\bin\x86\Debug\Content\sankarialus\sankarialusThrust1.xnb</Output> 
     38      <Time>2010-06-19T15:39:24+03:00</Time> 
    3939    </Item> 
    4040    <Item> 
    … …  
    4444      <Processor>TextureProcessor</Processor> 
    4545      <Options>None</Options> 
    46       <Output>D:\Opiskelu\kurssit\NPO2010\ShootEmUp\ShootEmUp\bin\x86\Debug\Content\sankarialus\sankarialusThrust2.xnb</Output> 
    47       <Time>2010-06-16T17:53:54+03:00</Time> 
     46      <Output>D:\Opiskelu\kurssit\NPO2010\Shootemup\ShootEmUp\ShootEmUp\bin\x86\Debug\Content\sankarialus\sankarialusThrust2.xnb</Output> 
     47      <Time>2010-06-19T15:39:24+03:00</Time> 
    4848    </Item> 
    4949    <Item> 
    … …  
    5353      <Processor>TextureProcessor</Processor> 
    5454      <Options>None</Options> 
    55       <Output>D:\Opiskelu\kurssit\NPO2010\ShootEmUp\ShootEmUp\bin\x86\Debug\Content\sankarialus\sankarialusStop.xnb</Output> 
    56       <Time>2010-06-16T17:53:54+03:00</Time> 
     55      <Output>D:\Opiskelu\kurssit\NPO2010\Shootemup\ShootEmUp\ShootEmUp\bin\x86\Debug\Content\sankarialus\sankarialusStop.xnb</Output> 
     56      <Time>2010-06-19T15:39:24+03:00</Time> 
    5757    </Item> 
    5858    <Item> 
    … …  
    6262      <Processor>TextureProcessor</Processor> 
    6363      <Options>None</Options> 
    64       <Output>D:\Opiskelu\kurssit\NPO2010\ShootEmUp\ShootEmUp\bin\x86\Debug\Content\sankarialus\sankarialusStopShield.xnb</Output> 
    65       <Time>2010-06-16T17:53:54+03:00</Time> 
     64      <Output>D:\Opiskelu\kurssit\NPO2010\Shootemup\ShootEmUp\ShootEmUp\bin\x86\Debug\Content\sankarialus\sankarialusStopShield.xnb</Output> 
     65      <Time>2010-06-19T15:39:24+03:00</Time> 
    6666    </Item> 
    6767    <Item> 
    … …  
    7171      <Processor>TextureProcessor</Processor> 
    7272      <Options>None</Options> 
    73       <Output>D:\Opiskelu\kurssit\NPO2010\ShootEmUp\ShootEmUp\bin\x86\Debug\Content\vihollinen3.xnb</Output> 
    74       <Time>2010-06-16T17:53:54+03:00</Time> 
     73      <Output>D:\Opiskelu\kurssit\NPO2010\Shootemup\ShootEmUp\ShootEmUp\bin\x86\Debug\Content\vihollinen3.xnb</Output> 
     74      <Time>2010-06-19T15:39:24+03:00</Time> 
    7575    </Item> 
    7676    <Item> 
    … …  
    8080      <Processor>TextureProcessor</Processor> 
    8181      <Options>None</Options> 
    82       <Output>D:\Opiskelu\kurssit\NPO2010\ShootEmUp\ShootEmUp\bin\x86\Debug\Content\sade.xnb</Output> 
    83       <Time>2010-06-16T17:53:54+03:00</Time> 
     82      <Output>D:\Opiskelu\kurssit\NPO2010\Shootemup\ShootEmUp\ShootEmUp\bin\x86\Debug\Content\sade.xnb</Output> 
     83      <Time>2010-06-19T15:39:24+03:00</Time> 
    8484    </Item> 
    8585    <Item> 
    … …  
    8989      <Processor>TextureProcessor</Processor> 
    9090      <Options>None</Options> 
    91       <Output>D:\Opiskelu\kurssit\NPO2010\ShootEmUp\ShootEmUp\bin\x86\Debug\Content\loppuvastus1.xnb</Output> 
    92       <Time>2010-06-16T17:53:54+03:00</Time> 
     91      <Output>D:\Opiskelu\kurssit\NPO2010\Shootemup\ShootEmUp\ShootEmUp\bin\x86\Debug\Content\loppuvastus1.xnb</Output> 
     92      <Time>2010-06-19T15:39:24+03:00</Time> 
    9393    </Item> 
    9494    <Item> 
    … …  
    9898      <Processor>TextureProcessor</Processor> 
    9999      <Options>None</Options> 
    100       <Output>D:\Opiskelu\kurssit\NPO2010\ShootEmUp\ShootEmUp\bin\x86\Debug\Content\photon.xnb</Output> 
    101       <Time>2010-06-16T17:53:54+03:00</Time> 
     100      <Output>D:\Opiskelu\kurssit\NPO2010\Shootemup\ShootEmUp\ShootEmUp\bin\x86\Debug\Content\photon.xnb</Output> 
     101      <Time>2010-06-19T15:39:24+03:00</Time> 
    102102    </Item> 
    103103    <Item> 
    … …  
    107107      <Processor>TextureProcessor</Processor> 
    108108      <Options>None</Options> 
    109       <Output>D:\Opiskelu\kurssit\NPO2010\ShootEmUp\ShootEmUp\bin\x86\Debug\Content\seina\seinaOikea.xnb</Output> 
    110       <Time>2010-06-18T20:59:40+03:00</Time> 
     109      <Output>D:\Opiskelu\kurssit\NPO2010\Shootemup\ShootEmUp\ShootEmUp\bin\x86\Debug\Content\seina\seinaOikea.xnb</Output> 
     110      <Time>2010-06-19T15:39:22+03:00</Time> 
    111111    </Item> 
    112112    <Item> 
    … …  
    116116      <Processor>TextureProcessor</Processor> 
    117117      <Options>None</Options> 
    118       <Output>D:\Opiskelu\kurssit\NPO2010\ShootEmUp\ShootEmUp\bin\x86\Debug\Content\seina\seinaKulma.xnb</Output> 
    119       <Time>2010-06-18T20:59:40+03:00</Time> 
     118      <Output>D:\Opiskelu\kurssit\NPO2010\Shootemup\ShootEmUp\ShootEmUp\bin\x86\Debug\Content\seina\seinaKulma.xnb</Output> 
     119      <Time>2010-06-19T15:39:22+03:00</Time> 
    120120    </Item> 
    121121    <Item> 
    … …  
    125125      <Processor>TextureProcessor</Processor> 
    126126      <Options>None</Options> 
    127       <Output>D:\Opiskelu\kurssit\NPO2010\ShootEmUp\ShootEmUp\bin\x86\Debug\Content\vihollinen4.xnb</Output> 
    128       <Time>2010-06-18T20:59:40+03:00</Time> 
     127      <Output>D:\Opiskelu\kurssit\NPO2010\Shootemup\ShootEmUp\ShootEmUp\bin\x86\Debug\Content\vihollinen4.xnb</Output> 
     128      <Time>2010-06-19T15:39:24+03:00</Time> 
    129129    </Item> 
    130130    <Item> 
    … …  
    134134      <Processor>SoundEffectProcessor</Processor> 
    135135      <Options>None</Options> 
    136       <Output>D:\Opiskelu\kurssit\NPO2010\ShootEmUp\ShootEmUp\bin\x86\Debug\Content\ringout.xnb</Output> 
    137       <Time>2010-06-14T15:38:56+03:00</Time> 
     136      <Output>D:\Opiskelu\kurssit\NPO2010\Shootemup\ShootEmUp\ShootEmUp\bin\x86\Debug\Content\ringout.xnb</Output> 
     137      <Time>2010-06-19T15:39:24+03:00</Time> 
    138138    </Item> 
    139139    <Item> 
    … …  
    143143      <Processor>SoundEffectProcessor</Processor> 
    144144      <Options>None</Options> 
    145       <Output>D:\Opiskelu\kurssit\NPO2010\ShootEmUp\ShootEmUp\bin\x86\Debug\Content\pum.xnb</Output> 
    146       <Time>2010-06-14T15:38:56+03:00</Time> 
     145      <Output>D:\Opiskelu\kurssit\NPO2010\Shootemup\ShootEmUp\ShootEmUp\bin\x86\Debug\Content\pum.xnb</Output> 
     146      <Time>2010-06-19T15:39:24+03:00</Time> 
    147147    </Item> 
    148148    <BuildSuccessful>true</BuildSuccessful> 
    … …  
    151151      <BuildConfiguration>Debug</BuildConfiguration> 
    152152      <CompressContent>false</CompressContent> 
    153       <RootDirectory>D:\Opiskelu\kurssit\NPO2010\ShootEmUp\ShootEmUp\Content\</RootDirectory> 
    154       <LoggerRootDirectory>D:\Opiskelu\kurssit\NPO2010\ShootEmUp\ShootEmUp\</LoggerRootDirectory> 
    155       <IntermediateDirectory>D:\Opiskelu\kurssit\NPO2010\ShootEmUp\ShootEmUp\Content\obj\x86\Debug\</IntermediateDirectory> 
    156       <OutputDirectory>D:\Opiskelu\kurssit\NPO2010\ShootEmUp\ShootEmUp\bin\x86\Debug\Content\</OutputDirectory> 
     153      <RootDirectory>D:\Opiskelu\kurssit\NPO2010\Shootemup\ShootEmUp\ShootEmUp\Content\</RootDirectory> 
     154      <LoggerRootDirectory>D:\Opiskelu\kurssit\NPO2010\Shootemup\ShootEmUp\ShootEmUp\</LoggerRootDirectory> 
     155      <IntermediateDirectory>D:\Opiskelu\kurssit\NPO2010\Shootemup\ShootEmUp\ShootEmUp\Content\obj\x86\Debug\</IntermediateDirectory> 
     156      <OutputDirectory>D:\Opiskelu\kurssit\NPO2010\Shootemup\ShootEmUp\ShootEmUp\bin\x86\Debug\Content\</OutputDirectory> 
    157157    </Settings> 
    158158    <Assemblies> 

  • 2010/23/hniemi/oksa/ShootEmUp/ShootEmUp/Peli.cs

    r1010 r1012  
    3939        private Weapon[] weapons; 
    4040 
    41         private bool bossmode = false; 
     41        private bool bossmode = true; 
    4242 
    4343        #endregion 
    … …  
    388388            Purkkakorjaus.Trigger += Purkkakorjaus2; 
    389389            Add(Purkkakorjaus); 
    390             Purkkakorjaus.Start(); 
     390            Purkkakorjaus.Start(1); 
    391391 
    392392            //Lisää ampuma-ajastimen 

  • 2010/23/hniemi/oksa/ShootEmUp/ShootEmUp/ShootEmUp.csproj

    r1010 r1012  
    5959    <Reference Include="Jypeli2, Version=2.2.0.0, Culture=neutral, processorArchitecture=x86"> 
    6060      <SpecificVersion>False</SpecificVersion> 
    61       <HintPath>..\..\lib\Jypeli2.dll</HintPath> 
     61      <HintPath>..\..\..\lib\Jypeli2.dll</HintPath> 
    6262    </Reference> 
    6363    <Reference Include="Microsoft.Xna.Framework, Version=3.1.0.0, Culture=neutral, PublicKeyToken=6d5c3888ef60e27d" /> 
Note: See TracChangeset for help on using the changeset viewer.