Changeset 11328 for code/branches/SpaceRace_HS16
- Timestamp:
- Dec 12, 2016, 2:17:47 PM (8 years ago)
- Location:
- code/branches/SpaceRace_HS16
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw
r11327 r11328 104 104 105 105 <!-- ------------------Planet----------------- --> 106 <Planet position="25000,5000,5000" scale= 1500 pitch=-90 mesh="iceplanet.mesh" atmosphere="atmosphere1" rotationaxis="8,1,0" rotationrate="1" atmospheresize=224.0f imagesize=1024.0f />106 <Planet position="25000,5000,5000" scale=3000 pitch=-90 mesh="iceplanet.mesh" atmosphere="atmosphere1" rotationaxis="8,1,0" rotationrate="1" atmospheresize=224.0f imagesize=1024.0f /> 107 107 <StaticEntity position="0,0,0" collisionType=static> 108 108 <collisionShapes> … … 189 189 <?lua end ?> 190 190 191 191 192 <!-- ------------------Boards----------------- --> 192 193 <StaticEntity position="1000,160,0" direction="-1,0,0" yaw=90 pitch=0 roll=-30 collisionType="static"> … … 199 200 </StaticEntity> 200 201 201 <StaticEntity position=" 3000,330,100" direction="-1,0,0" yaw=90 pitch=0 roll=-30 collisionType="static">202 <StaticEntity position="5000,230,500" direction="-1,0,0" yaw=90 pitch=0 roll=-30 collisionType="static"> 202 203 <attached> 203 204 <Model scale="20" mesh="Board2.mesh" /> … … 208 209 </StaticEntity> 209 210 210 <StaticEntity position=" 5000,230,500" direction="-1,0,0" yaw=90 pitch=0 roll=-30 collisionType="static">211 <StaticEntity position="10000,-70,200" direction="-1,0,0" yaw=90 pitch=0 roll=-30 collisionType="static"> 211 212 <attached> 212 213 <Model scale="20" mesh="Board2.mesh" /> … … 216 217 </collisionShapes> 217 218 </StaticEntity> 218 219 219 220 220 <!-- ---------------------Checkpoints---------------------- --> … … 226 226 <RaceCheckPoint name="checkpoint1" yaw=90 pitch=90 position="1000,30,0" roll="0" direction="0,1,0" collisionType="static" scale="1" distance="60" checkpointindex="0" islast="false" nextcheckpoints="1,-1,-1"> 227 227 <attached> 228 <Model position="0,0,0" scale="70" mesh="Checkpoint_ InnerRing.mesh"/>228 <Model position="0,0,0" scale="70" mesh="Checkpoint_Green.mesh"/> 229 229 </attached> 230 230 <collisionShapes> … … 470 470 <RaceCheckPoint name="checkpoint20" yaw=90 pitch=90 position="53000,0,0" direction="0,1,0" roll="0" collisionType="static" scale="1" distance="60" checkpointindex="19" islast="true"> 471 471 <attached> 472 <Model position="0,0,0" scale="70" mesh="Checkpoint_ InnerRing.mesh"/>473 </attached> 474 <collisionShapes> 475 <BoxCollisionShape position="0,0, 70" halfExtents="70, 10, 10" />476 <BoxCollisionShape position="0,0,- 70" halfExtents="70, 10, 10" />477 <BoxCollisionShape position=" 70,0,0" halfExtents="10, 10, 70" />478 <BoxCollisionShape position="- 70,0,0" halfExtents="10, 10, 70" />472 <Model position="0,0,0" scale="70" mesh="Checkpoint_Finish.mesh"/> 473 </attached> 474 <collisionShapes> 475 <BoxCollisionShape position="0,0,90" halfExtents="90, 13, 13" /> 476 <BoxCollisionShape position="0,0,-90" halfExtents="90, 13, 13" /> 477 <BoxCollisionShape position="90,0,0" halfExtents="13, 13, 90" /> 478 <BoxCollisionShape position="-90,0,0" halfExtents="13, 13, 90" /> 479 479 </collisionShapes> 480 480 </RaceCheckPoint> -
code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRaceController.cc
r11312 r11328 169 169 minNextRaceCheckPoint = nextRaceCheckPoint; 170 170 } 171 171 172 } 172 173 … … 307 308 //orxout()<< "CP "<< currentRaceCheckpoint_->getCheckpointIndex()<<" chanched to: "<< nextRaceCheckpoint_->getCheckpointIndex()<<endl; 308 309 } 310 309 311 else if ((lastPositionSpaceship-this->getControllableEntity()->getPosition()).length()/dt > ADJUSTDISTANCE) 310 312 { -
code/branches/SpaceRace_HS16/src/orxonox/infos/Bot.cc
r11312 r11328 70 70 "Berkay Berabi", 71 71 "Louis Meile" 72 "Dr. Julius No ",72 "Dr. Julius No 3", 73 73 "Rosa Klebb", 74 "Auric Goldfinger", 75 "Emilio Largo", 76 "Ernst Stavro Blofeld", 74 "Muten Roshi", 75 "Abradolf Lincler", 77 76 "Dr. Kananga", 78 77 "Francisco Scaramanga", 79 78 "Karl Stromberg", 80 79 "Sir Hugo Drax", 81 "Aris Kristatos",82 80 "Kamal Khan", 83 81 "General Orlov", 84 "Max Zorin",85 "Brad Whitaker",86 82 "General Georgi Koskov", 87 " Franz Sanchez",83 "Karl the Llama", 88 84 "Alec Trevelyan", 89 " Elliot Carver",90 " Elektra King",91 " Viktor Zokas",92 " Gustav Graves",85 "Thomas the Tankengine", 86 "Rick", 87 "Morty", 88 "Charlie the Unicorn", 93 89 "Kung Fury", 94 "Mr. White",95 "Dominic Greene"96 90 }; 97 91 static std::vector<std::string> defaultnames(names, names + sizeof(names) / sizeof(std::string));
Note: See TracChangeset
for help on using the changeset viewer.