Ignore:
Timestamp:
2015-06-26 03:34:53 (5 years ago)
Author:
mijoliim
Message:
 
Location:
2015/26/MikkoL/JRPG/JRPG/JRPGContent
Files:
6 added
5 edited

Legend:

Unmodified
Added
Removed
  • 2015/26/MikkoL/JRPG/JRPG/JRPGContent/JRPGContent.contentproj

    r6401 r6415  
    110110  </ItemGroup> 
    111111  <ItemGroup> 
    112     <Compile Include="Ripple.fx"> 
    113       <Name>Ripple</Name> 
    114       <Importer>EffectImporter</Importer> 
    115       <Processor>EffectProcessor</Processor> 
    116     </Compile> 
    117   </ItemGroup> 
    118   <ItemGroup> 
    119112    <BootstrapperPackage Include=".NETFramework,Version=v4.0"> 
    120113      <Visible>False</Visible> 
     
    344337      <Processor>TextureProcessor</Processor> 
    345338    </Compile> 
     339    <Compile Include="HUD\BattleMenu.png"> 
     340      <Name>BattleMenu</Name> 
     341      <Importer>TextureImporter</Importer> 
     342      <Processor>TextureProcessor</Processor> 
     343    </Compile> 
     344    <Compile Include="aj2.png"> 
     345      <Name>aj2</Name> 
     346      <Importer>TextureImporter</Importer> 
     347      <Processor>TextureProcessor</Processor> 
     348    </Compile> 
     349    <Compile Include="Wave2.fx"> 
     350      <Name>Wave2</Name> 
     351      <Importer>EffectImporter</Importer> 
     352      <Processor>EffectProcessor</Processor> 
     353    </Compile> 
    346354    <Content Include="MainFont.xnb"> 
    347355      <Name>MainFont</Name> 
     
    350358      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> 
    351359    </Content> 
     360    <Compile Include="Space.png"> 
     361      <Name>Space</Name> 
     362      <Importer>TextureImporter</Importer> 
     363      <Processor>TextureProcessor</Processor> 
     364    </Compile> 
     365    <Compile Include="Music\Sensual.mp3"> 
     366      <Name>Sensual</Name> 
     367      <Importer>Mp3Importer</Importer> 
     368      <Processor>SongProcessor</Processor> 
     369    </Compile> 
     370    <Compile Include="Title.png"> 
     371      <Name>Title</Name> 
     372      <Importer>TextureImporter</Importer> 
     373      <Processor>TextureProcessor</Processor> 
     374    </Compile> 
    352375  </ItemGroup> 
    353376  <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\$(XnaFrameworkVersion)\Microsoft.Xna.GameStudio.ContentPipeline.targets" /> 
  • 2015/26/MikkoL/JRPG/JRPG/JRPGContent/Wave.fx

    r6281 r6415  
    1111        float cy = coords.y; 
    1212 
    13         coords.x = cx + cos(cy*5 + parameter1 / 700) / 30; 
     13        coords.x = cx + cos(cy*3 + parameter1 / 700) / 35; 
    1414 
    1515    float4 color = tex2D(ScreenS, coords); 
  • 2015/26/MikkoL/JRPG/JRPG/JRPGContent/obj/x86/Debug/ContentPipeline.xml

    r6401 r6415  
    171171      <Options>None</Options> 
    172172      <Output>C:\Users\Mikko\Desktop\Peli2015\MikkoL\JRPG\JRPG\JRPG\bin\x86\Debug\Content\Maps\00\00_CMap.xnb</Output> 
    173       <Time>2015-06-25T16:52:44.2083201+03:00</Time> 
     173      <Time>2015-06-26T00:52:30.2537877+03:00</Time> 
    174174    </Item> 
    175175    <Item> 
     
    198198      <Options>None</Options> 
    199199      <Output>C:\Users\Mikko\Desktop\Peli2015\MikkoL\JRPG\JRPG\JRPG\bin\x86\Debug\Content\Maps\01\01_CMap.xnb</Output> 
    200       <Time>2015-06-25T20:23:41.8962984+03:00</Time> 
     200      <Time>2015-06-26T01:26:38.7939575+03:00</Time> 
    201201    </Item> 
    202202    <Item> 
     
    219219    </Item> 
    220220    <Item> 
    221       <Source>Ripple.fx</Source> 
    222       <Name>Ripple</Name> 
    223       <Importer>EffectImporter</Importer> 
    224       <Processor>EffectProcessor</Processor> 
    225       <Options>None</Options> 
    226       <Output>C:\Users\Mikko\Desktop\Peli2015\MikkoL\JRPG\JRPG\JRPG\bin\x86\Debug\Content\Ripple.xnb</Output> 
    227       <Time>2015-06-24T18:22:09.4309263+03:00</Time> 
    228     </Item> 
    229     <Item> 
    230221      <Source>Twirl.fx</Source> 
    231222      <Name>Twirl</Name> 
     
    243234      <Options>None</Options> 
    244235      <Output>C:\Users\Mikko\Desktop\Peli2015\MikkoL\JRPG\JRPG\JRPG\bin\x86\Debug\Content\Wave.xnb</Output> 
    245       <Time>2015-06-24T18:22:10.9420127+03:00</Time> 
     236      <Time>2015-06-25T23:58:44.393279+03:00</Time> 
    246237    </Item> 
    247238    <Item> 
     
    418409      <Output>C:\Users\Mikko\Desktop\Peli2015\MikkoL\JRPG\JRPG\JRPG\bin\x86\Debug\Content\Enemies\ChiliSnake\Enemy_ChiliSnake.xnb</Output> 
    419410      <Time>2015-06-25T21:06:10.2990587+03:00</Time> 
     411    </Item> 
     412    <Item> 
     413      <Source>HUD\BattleMenu.png</Source> 
     414      <Name>HUD\BattleMenu</Name> 
     415      <Importer>TextureImporter</Importer> 
     416      <Processor>TextureProcessor</Processor> 
     417      <Options>None</Options> 
     418      <Output>C:\Users\Mikko\Desktop\Peli2015\MikkoL\JRPG\JRPG\JRPG\bin\x86\Debug\Content\HUD\BattleMenu.xnb</Output> 
     419      <Time>2015-06-24T18:22:07.7098278+03:00</Time> 
     420    </Item> 
     421    <Item> 
     422      <Source>Space.png</Source> 
     423      <Name>Space</Name> 
     424      <Importer>TextureImporter</Importer> 
     425      <Processor>TextureProcessor</Processor> 
     426      <Options>None</Options> 
     427      <Output>C:\Users\Mikko\Desktop\Peli2015\MikkoL\JRPG\JRPG\JRPG\bin\x86\Debug\Content\Space.xnb</Output> 
     428      <Time>2015-06-26T01:48:56.9144936+03:00</Time> 
     429    </Item> 
     430    <Item> 
     431      <Source>aj2.png</Source> 
     432      <Name>aj2</Name> 
     433      <Importer>TextureImporter</Importer> 
     434      <Processor>TextureProcessor</Processor> 
     435      <Options>None</Options> 
     436      <Output>C:\Users\Mikko\Desktop\Peli2015\MikkoL\JRPG\JRPG\JRPG\bin\x86\Debug\Content\aj2.xnb</Output> 
     437      <Time>2015-06-26T00:12:25.6562526+03:00</Time> 
     438    </Item> 
     439    <Item> 
     440      <Source>Music\Sensual.mp3</Source> 
     441      <Name>Music\Sensual</Name> 
     442      <Importer>Mp3Importer</Importer> 
     443      <Processor>SongProcessor</Processor> 
     444      <Options>None</Options> 
     445      <Output>C:\Users\Mikko\Desktop\Peli2015\MikkoL\JRPG\JRPG\JRPG\bin\x86\Debug\Content\Music\Sensual.xnb</Output> 
     446      <Extra>C:\Users\Mikko\Desktop\Peli2015\MikkoL\JRPG\JRPG\JRPG\bin\x86\Debug\Content\Music\Sensual.wma</Extra> 
     447      <Time>2015-06-26T00:30:20.4727286+03:00</Time> 
     448    </Item> 
     449    <Item> 
     450      <Source>Wave2.fx</Source> 
     451      <Name>Wave2</Name> 
     452      <Importer>EffectImporter</Importer> 
     453      <Processor>EffectProcessor</Processor> 
     454      <Options>None</Options> 
     455      <Output>C:\Users\Mikko\Desktop\Peli2015\MikkoL\JRPG\JRPG\JRPG\bin\x86\Debug\Content\Wave2.xnb</Output> 
     456      <Time>2015-06-26T01:52:11.3946172+03:00</Time> 
     457    </Item> 
     458    <Item> 
     459      <Source>Title.png</Source> 
     460      <Name>Title</Name> 
     461      <Importer>TextureImporter</Importer> 
     462      <Processor>TextureProcessor</Processor> 
     463      <Options>None</Options> 
     464      <Output>C:\Users\Mikko\Desktop\Peli2015\MikkoL\JRPG\JRPG\JRPG\bin\x86\Debug\Content\Title.xnb</Output> 
     465      <Time>2015-06-26T01:57:21.25034+03:00</Time> 
    420466    </Item> 
    421467    <BuildSuccessful>true</BuildSuccessful> 
Note: See TracChangeset for help on using the changeset viewer.