Changeset 6660
- Timestamp:
- 2015-07-01 12:41:01 (8 years ago)
- Location:
- 2015/27/TapaniS
- Files:
-
- 4 added
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
2015/27/TapaniS/ProjectStar/ProjectStar/ProjectStar/ProjectStar.cs
r6595 r6660 11 11 IntMeter pisteLaskuri; 12 12 13 Image ganjaKuva = LoadImage("GanjaOljo"); 13 14 Image moabKuva = LoadImage("moab"); 14 15 Image doritosKuva = LoadImage("doritos"); … … 29 30 SmoothTextures = false; 30 31 Reset(); 32 31 33 32 34 } … … 98 100 ukko = new PlatformCharacter(40.0, 40.0); 99 101 102 PhysicsObject randomOlio = new PhysicsObject(80, 80); 103 Add(randomOlio); 104 RandomMoverBrain satunnaisAivot = new RandomMoverBrain(200); 105 randomOlio.Brain = satunnaisAivot; 106 randomOlio.Image = ganjaKuva; 107 randomOlio.Position = new Vector(0, 200); 108 100 109 PhysicsObject aloitus = new PhysicsObject(80.0, 80.0); 101 110 aloitus.Shape = Shape.FromImage(moabKuva); … … 110 119 AddCollisionHandler(ukko, "piste", PelaajaSaaPisteen); 111 120 ukko.Image = ukkoKuva; 121 122 AddCollisionHandler(ukko, randomOlio, CollisionHandler.DestroyObject); 123 124 PhysicsObject palkki = PhysicsObject.CreateStaticObject(2000, 10); 125 Add(palkki); 126 palkki.IgnoresGravity = true; 127 palkki.Position -= new Vector(0, 500); 128 palkki.Color = Color.Transparent; 129 AddCollisionHandler(ukko, palkki, CollisionHandler.DestroyObject); 130 112 131 for (int i = 0; i < 20; i++) 113 132 { … … 149 168 Keyboard.Listen(Key.Escape, ButtonState.Pressed, ConfirmExit, "Lopeta peli"); 150 169 } 170 151 171 } -
2015/27/TapaniS/ProjectStar/ProjectStar/ProjectStar/ProjectStar.csproj.Debug.cachefile
r6595 r6660 7 7 Content\moab.xnb 8 8 Content\goku.xnb 9 Content\GanjaOljo.xnb -
2015/27/TapaniS/ProjectStar/ProjectStar/ProjectStar/obj/x86/Debug/ContentPipeline-{F977AF6D-8086-4A71-9FEE-75BE75429D56}.xml
r6658 r6660 11 11 <Time>0001-01-01T00:00:00</Time> 12 12 </Item> 13 <<<<<<< .mine 14 <Item> 15 <Source>monttu.jpg</Source> 16 <Name>monttu</Name> 17 <Importer>TextureImporter</Importer> 18 <Processor>TextureProcessor</Processor> 19 <Options>None</Options> 20 <Output>C:\MyTemp\TapaniS\ProjectStar\ProjectStar\ProjectStar\bin\x86\Debug\Content\monttu.xnb</Output> 21 <Time>2015-06-30T09:57:38.8415095+03:00</Time> 22 </Item> 23 <Item> 24 <Source>Pemppe2.png</Source> 25 <Name>Pemppe2</Name> 26 <Importer>TextureImporter</Importer> 27 <Processor>TextureProcessor</Processor> 28 <Options>None</Options> 29 <Output>C:\MyTemp\TapaniS\ProjectStar\ProjectStar\ProjectStar\bin\x86\Debug\Content\Pemppe2.xnb</Output> 30 <Time>2015-06-30T10:58:20.8826095+03:00</Time> 31 </Item> 32 <Item> 33 <Source>pemppe3.jpg</Source> 34 <Name>pemppe3</Name> 35 <Importer>TextureImporter</Importer> 36 <Processor>TextureProcessor</Processor> 37 <Options>None</Options> 38 <Output>C:\MyTemp\TapaniS\ProjectStar\ProjectStar\ProjectStar\bin\x86\Debug\Content\pemppe3.xnb</Output> 39 <Time>2015-06-30T11:02:18.0424095+03:00</Time> 40 </Item> 41 <Item> 42 <Source>Ganja.png</Source> 43 <Name>Ganja</Name> 44 <Importer>TextureImporter</Importer> 45 <Processor>TextureProcessor</Processor> 46 <Options>None</Options> 47 <Output>C:\MyTemp\TapaniS\ProjectStar\ProjectStar\ProjectStar\bin\x86\Debug\Content\Ganja.xnb</Output> 48 <Time>2015-06-30T11:34:33.6875095+03:00</Time> 49 </Item> 50 <Item> 51 <Source>doritos.png</Source> 52 <Name>doritos</Name> 53 <Importer>TextureImporter</Importer> 54 <Processor>TextureProcessor</Processor> 55 <Options>None</Options> 56 <Output>C:\MyTemp\TapaniS\ProjectStar\ProjectStar\ProjectStar\bin\x86\Debug\Content\doritos.xnb</Output> 57 <Time>2015-06-30T11:36:32.9595095+03:00</Time> 58 </Item> 59 <Item> 60 <Source>moab.png</Source> 61 <Name>moab</Name> 62 <Importer>TextureImporter</Importer> 63 <Processor>TextureProcessor</Processor> 64 <Options>None</Options> 65 <Output>C:\MyTemp\TapaniS\ProjectStar\ProjectStar\ProjectStar\bin\x86\Debug\Content\moab.xnb</Output> 66 <Time>2015-06-30T11:52:32.1705095+03:00</Time> 67 </Item> 68 <Item> 69 <Source>goku.png</Source> 70 <Name>goku</Name> 71 <Importer>TextureImporter</Importer> 72 <Processor>TextureProcessor</Processor> 73 <Options>None</Options> 74 <Output>C:\MyTemp\TapaniS\ProjectStar\ProjectStar\ProjectStar\bin\x86\Debug\Content\goku.xnb</Output> 75 <Time>2015-06-30T11:57:26.1425095+03:00</Time> 76 </Item> 77 <Item> 78 <Source>GanjaOljo.png</Source> 79 <Name>GanjaOljo</Name> 80 <Importer>TextureImporter</Importer> 81 <Processor>TextureProcessor</Processor> 82 <Options>None</Options> 83 <Output>C:\MyTemp\TapaniS\ProjectStar\ProjectStar\ProjectStar\bin\x86\Debug\Content\GanjaOljo.xnb</Output> 84 <Time>2015-07-01T09:58:43.0207281+03:00</Time> 85 </Item> 86 <BuildSuccessful>true</BuildSuccessful> 87 ======= 13 88 <BuildSuccessful>false</BuildSuccessful> 89 >>>>>>> .r6658 14 90 <Settings> 15 91 <ContentProjectGUID>{F977AF6D-8086-4A71-9FEE-75BE75429D56}</ContentProjectGUID> -
2015/27/TapaniS/ProjectStar/ProjectStar/ProjectStar/obj/x86/Debug/ProjectStar.csproj.FileListAbsolute.txt
r6595 r6660 23 23 C:\MyTemp\TapaniS\ProjectStar\ProjectStar\ProjectStar\bin\x86\Debug\Content\moab.xnb 24 24 C:\MyTemp\TapaniS\ProjectStar\ProjectStar\ProjectStar\bin\x86\Debug\Content\goku.xnb 25 C:\MyTemp\TapaniS\ProjectStar\ProjectStar\ProjectStar\bin\x86\Debug\Content\GanjaOljo.xnb -
2015/27/TapaniS/ProjectStar/ProjectStar/ProjectStar/obj/x86/Debug/cachefile-{F977AF6D-8086-4A71-9FEE-75BE75429D56}-targetpath.txt
r6595 r6660 7 7 Content\moab.xnb 8 8 Content\goku.xnb 9 Content\GanjaOljo.xnb -
2015/27/TapaniS/ProjectStar/ProjectStar/ProjectStarContent/ProjectStarContent.contentproj
r6658 r6660 94 94 </Compile> 95 95 </ItemGroup> 96 <ItemGroup> 97 <Compile Include="GanjaOljo.png"> 98 <Name>GanjaOljo</Name> 99 <Importer>TextureImporter</Importer> 100 <Processor>TextureProcessor</Processor> 101 </Compile> 102 </ItemGroup> 96 103 <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\$(XnaFrameworkVersion)\Microsoft.Xna.GameStudio.ContentPipeline.targets" /> 97 104 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Note: See TracChangeset
for help on using the changeset viewer.