Changeset 6991 for 2015


Ignore:
Timestamp:
2015-07-23 15:00:55 (4 years ago)
Author:
picakrty
Message:

Puuttuu ulti ja jotain muuta pientä.

Location:
2015/30/CamillaT
Files:
8 added
10 edited

Legend:

Unmodified
Added
Removed
  • 2015/30/CamillaT/YouCombat/YouCombat/YouCombat/YouCombat.cs

    r6982 r6991  
    2929    Animation rauskiinaHyokkays; 
    3030    Animation rauskinKavely; 
     31 
     32    Animation miisasHyokkays; 
    3133 
    3234    public override void Begin() 
     
    111113        miisas.AnimWalk.FPS    = 5; 
    112114        miisas.AnimIdle        = new Animation(miisasinKuva); 
    113         //miisas.AnimIdle 
     115        miisasHyokkays = LoadAnimation("MiisasHyokkays");  
    114116         
    115117         
     
    131133        Keyboard.Listen(Key.Up, ButtonState.Pressed, Hyppaa,   "Hyppy Ylos",   pelaaja2, hyppynopeus); 
    132134        Keyboard.Listen(Key.Right, ButtonState.Down, Liikuta,  "Liiku Oikealle",    pelaaja2, nopeus); 
     135        Keyboard.Listen(Key.Enter, ButtonState.Pressed, Liikuta, "Hyokkaa Eteen",  pelaaja2, nopeus); 
     136 
     137        //Korjaa Miisasin eka hyökkays ja ultit molemmille!!!!!! 
    133138 
    134139        Keyboard.Listen(Key.Escape, ButtonState.Pressed, ConfirmExit, "Lopeta peli"); 
  • 2015/30/CamillaT/YouCombat/YouCombat/YouCombat/YouCombat.csproj.Debug.cachefile

    r6982 r6991  
    2525Content\RauskiHyokkays\RauskiHyppy1_0.xnb 
    2626Content\TaustaMusa.xnb 
     27Content\MiisasHyokkays\MiisasHyokkays1.xnb 
     28Content\MiisasHyokkays\MiisasHyokkays2.xnb 
     29Content\MiisasHyokkays\MiisasHyokkays3.xnb 
     30Content\MiisasHyokkays.xnb 
    2731Content\TaustaMusa.wma 
    2832Content\Rauski.anim 
  • 2015/30/CamillaT/YouCombat/YouCombat/YouCombat/obj/x86/Debug/YouCombat.csproj.FileListAbsolute.txt

    r6982 r6991  
    3939C:\MyTemp\CamillaT\YouCombat\YouCombat\YouCombat\bin\x86\Debug\Content\RauskiinaHyokkays.anim 
    4040C:\MyTemp\CamillaT\YouCombat\YouCombat\YouCombat\bin\x86\Debug\Content\RauskiHyppy.anim 
     41C:\MyTemp\CamillaT\YouCombat\YouCombat\YouCombat\bin\x86\Debug\Content\MiisasHyokkays\MiisasHyokkays1.xnb 
     42C:\MyTemp\CamillaT\YouCombat\YouCombat\YouCombat\bin\x86\Debug\Content\MiisasHyokkays\MiisasHyokkays2.xnb 
     43C:\MyTemp\CamillaT\YouCombat\YouCombat\YouCombat\bin\x86\Debug\Content\MiisasHyokkays\MiisasHyokkays3.xnb 
     44C:\MyTemp\CamillaT\YouCombat\YouCombat\YouCombat\bin\x86\Debug\Content\MiisasHyokkays.xnb 
  • 2015/30/CamillaT/YouCombat/YouCombat/YouCombat/obj/x86/Debug/cachefile-{66C8E644-CC23-4609-AD73-46EEDD2FF150}-targetpath.txt

    r6982 r6991  
    2626Content\TaustaMusa.xnb 
    2727Content\TaustaMusa.wma 
     28Content\MiisasHyokkays\MiisasHyokkays1.xnb 
     29Content\MiisasHyokkays\MiisasHyokkays2.xnb 
     30Content\MiisasHyokkays\MiisasHyokkays3.xnb 
     31Content\MiisasHyokkays.xnb 
    2832Content\Rauski.anim 
    2933Content\Miisas.anim 
  • 2015/30/CamillaT/YouCombat/YouCombat/YouCombatContent/YouCombatContent.contentproj

    r6982 r6991  
    205205    </Compile> 
    206206  </ItemGroup> 
     207  <ItemGroup> 
     208    <Compile Include="MiisasHyokkays\MiisasHyokkays1.png"> 
     209      <Name>MiisasHyokkays1</Name> 
     210      <Importer>TextureImporter</Importer> 
     211      <Processor>TextureProcessor</Processor> 
     212    </Compile> 
     213    <Compile Include="MiisasHyokkays\MiisasHyokkays2.png"> 
     214      <Name>MiisasHyokkays2</Name> 
     215      <Importer>TextureImporter</Importer> 
     216      <Processor>TextureProcessor</Processor> 
     217    </Compile> 
     218    <Compile Include="MiisasHyokkays\MiisasHyokkays3.png"> 
     219      <Name>MiisasHyokkays3</Name> 
     220      <Importer>TextureImporter</Importer> 
     221      <Processor>TextureProcessor</Processor> 
     222    </Compile> 
     223  </ItemGroup> 
     224  <ItemGroup> 
     225    <Compile Include="MiisasHyokkays.anim"> 
     226      <Name>MiisasHyokkays</Name> 
     227      <Importer>AnimationImporter</Importer> 
     228      <Processor>AnimationContentProcessor</Processor> 
     229    </Compile> 
     230  </ItemGroup> 
    207231  <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\$(XnaFrameworkVersion)\Microsoft.Xna.GameStudio.ContentPipeline.targets" /> 
    208232  <!--  To modify your build process, add your task inside one of the targets below and uncomment it.  
  • 2015/30/CamillaT/YouCombat/YouCombat/YouCombatContent/obj/x86/Debug/ContentPipeline.xml

    r6982 r6991  
    251251      <Extra>C:\MyTemp\CamillaT\YouCombat\YouCombat\YouCombat\bin\x86\Debug\Content\TaustaMusa.wma</Extra> 
    252252      <Time>2015-07-23T13:55:43.3530128+03:00</Time> 
     253    </Item> 
     254    <Item> 
     255      <Source>MiisasHyokkays\MiisasHyokkays1.png</Source> 
     256      <Name>MiisasHyokkays\MiisasHyokkays1</Name> 
     257      <Importer>TextureImporter</Importer> 
     258      <Processor>TextureProcessor</Processor> 
     259      <Options>None</Options> 
     260      <Output>C:\MyTemp\CamillaT\YouCombat\YouCombat\YouCombat\bin\x86\Debug\Content\MiisasHyokkays\MiisasHyokkays1.xnb</Output> 
     261      <Time>2015-07-23T14:46:47.6475527+03:00</Time> 
     262    </Item> 
     263    <Item> 
     264      <Source>MiisasHyokkays\MiisasHyokkays2.png</Source> 
     265      <Name>MiisasHyokkays\MiisasHyokkays2</Name> 
     266      <Importer>TextureImporter</Importer> 
     267      <Processor>TextureProcessor</Processor> 
     268      <Options>None</Options> 
     269      <Output>C:\MyTemp\CamillaT\YouCombat\YouCombat\YouCombat\bin\x86\Debug\Content\MiisasHyokkays\MiisasHyokkays2.xnb</Output> 
     270      <Time>2015-07-23T14:46:47.6475527+03:00</Time> 
     271    </Item> 
     272    <Item> 
     273      <Source>MiisasHyokkays\MiisasHyokkays3.png</Source> 
     274      <Name>MiisasHyokkays\MiisasHyokkays3</Name> 
     275      <Importer>TextureImporter</Importer> 
     276      <Processor>TextureProcessor</Processor> 
     277      <Options>None</Options> 
     278      <Output>C:\MyTemp\CamillaT\YouCombat\YouCombat\YouCombat\bin\x86\Debug\Content\MiisasHyokkays\MiisasHyokkays3.xnb</Output> 
     279      <Time>2015-07-23T14:46:47.6575528+03:00</Time> 
     280    </Item> 
     281    <Item> 
     282      <Source>MiisasHyokkays.anim</Source> 
     283      <Name>MiisasHyokkays</Name> 
     284      <Importer>AnimationImporter</Importer> 
     285      <Processor>AnimationContentProcessor</Processor> 
     286      <Options>None</Options> 
     287      <Output>C:\MyTemp\CamillaT\YouCombat\YouCombat\YouCombat\bin\x86\Debug\Content\MiisasHyokkays.xnb</Output> 
     288      <Time>2015-07-23T14:46:54.1276418+03:00</Time> 
     289      <Request>C:\MyTemp\CamillaT\YouCombat\YouCombat\YouCombat\bin\x86\Debug\Content\MiisasHyokkays\MiisasHyokkays1.xnb</Request> 
     290      <Request>C:\MyTemp\CamillaT\YouCombat\YouCombat\YouCombat\bin\x86\Debug\Content\MiisasHyokkays\MiisasHyokkays2.xnb</Request> 
     291      <Request>C:\MyTemp\CamillaT\YouCombat\YouCombat\YouCombat\bin\x86\Debug\Content\MiisasHyokkays\MiisasHyokkays3.xnb</Request> 
    253292    </Item> 
    254293    <BuildSuccessful>true</BuildSuccessful> 
Note: See TracChangeset for help on using the changeset viewer.