Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 11328 for code


Ignore:
Timestamp:
Dec 12, 2016, 2:17:47 PM (8 years ago)
Author:
meilel
Message:

start and finish line

Location:
code/branches/SpaceRace_HS16
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw

    r11327 r11328  
    104104
    105105    <!-- ------------------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 />
    107107    <StaticEntity position="0,0,0" collisionType=static>
    108108        <collisionShapes>
    … …  
    189189    <?lua end ?>
    190190
     191
    191192    <!-- ------------------Boards----------------- -->
    192193    <StaticEntity position="1000,160,0" direction="-1,0,0" yaw=90 pitch=0 roll=-30 collisionType="static">
    … …  
    199200  </StaticEntity>
    200201
    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">
    202203    <attached>
    203204      <Model scale="20" mesh="Board2.mesh" />
    … …  
    208209  </StaticEntity>
    209210
    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">
    211212    <attached>
    212213      <Model scale="20" mesh="Board2.mesh" />
    … …  
    216217      </collisionShapes>
    217218  </StaticEntity>
    218 
    219219
    220220<!-- ---------------------Checkpoints---------------------- -->
    … …  
    226226    <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">
    227227        <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"/>
    229229    </attached>
    230230    <collisionShapes>
    … …  
    470470    <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">
    471471        <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" />
    479479    </collisionShapes>
    480480    </RaceCheckPoint>

  • code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRaceController.cc

    r11312 r11328  
    169169                minNextRaceCheckPoint = nextRaceCheckPoint;
    170170            }
     171
    171172        }
    172173
    … …  
    307308            //orxout()<< "CP "<< currentRaceCheckpoint_->getCheckpointIndex()<<" chanched to: "<< nextRaceCheckpoint_->getCheckpointIndex()<<endl;
    308309        }
     310
    309311        else if ((lastPositionSpaceship-this->getControllableEntity()->getPosition()).length()/dt > ADJUSTDISTANCE)
    310312        {

  • code/branches/SpaceRace_HS16/src/orxonox/infos/Bot.cc

    r11312 r11328  
    7070            "Berkay Berabi",
    7171            "Louis  Meile"
    72             "Dr. Julius No",
     72            "Dr. Julius No 3",
    7373            "Rosa Klebb",
    74             "Auric Goldfinger",
    75             "Emilio Largo",
    76             "Ernst Stavro Blofeld",
     74            "Muten Roshi",
     75            "Abradolf Lincler",
    7776            "Dr. Kananga",
    7877            "Francisco Scaramanga",
    7978            "Karl Stromberg",
    8079            "Sir Hugo Drax",
    81             "Aris Kristatos",
    8280            "Kamal Khan",
    8381            "General Orlov",
    84             "Max Zorin",
    85             "Brad Whitaker",
    8682            "General Georgi Koskov",
    87             "Franz Sanchez",
     83            "Karl the Llama",
    8884            "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",
    9389            "Kung Fury",
    94             "Mr. White",
    95             "Dominic Greene"
    9690        };
    9791        static std::vector<std::string> defaultnames(names, names + sizeof(names) / sizeof(std::string));
Note: See TracChangeset for help on using the changeset viewer.