Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7585 for code


Ignore:
Timestamp:
Oct 26, 2010, 9:01:48 PM (14 years ago)
Author:
jo
Message:

With collisionshapes. Still problems with collisionshapes and movable entities. Warning Message added. Suddenly a new HUD bug appeared.

Location:
code/branches/lastmanstanding
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • code/branches/lastmanstanding/data/levels/gametype_lastmanstanding.oxw

    r7579 r7585  
    44  include("templates/lodinformation.oxt")
    55  include("lastmanstandinghud.oxo")
    6 ?>
    7 
    8 <?lua
    96  include("templates/spaceship_assff.oxt")
    107  include("templates/spaceship_pirate.oxt")
    … …  
    3532
    3633<!-- ------------ middle asteroid -------------- -->
    37     <StaticEntity position="0,20,0">
     34    <StaticEntity position="0,20,0" collisionType=static>
    3835       <attached>
    3936           <Model position="0,0,0" scale=140 mesh="asteroid_UV.mesh" shadow=true />
    4037           <!-- ParticleEmitter position="0,0,0" source="Orxonox/Steam" / -->
    4138       </attached>
    42     </StaticEntity>
    43 <StaticEntity position="0,0,0" collisionType=static>
    4439      <collisionShapes>
    4540        <SphereCollisionShape radius="145" />
    4641      </collisionShapes>
    4742    </StaticEntity>
     43<!--StaticEntity position="0,0,0" collisionType=static>
     44      <collisionShapes>
     45        <SphereCollisionShape radius="145" />
     46      </collisionShapes>
     47    </StaticEntity-->
    4848
    4949<!-- ---------------asteroid dome----------------- -->
    … …  
    5757    ?>
    5858<?lua
    59 for k = 1, 25, 1
     59for k = 1, 17, 1
    6060do
    6161j = math.random()
    6262?>
    6363
    64     <StaticEntity position="<?lua print(y) ?>,0,<?lua print(z) ?>" scale=<?lua print(j * 2) ?> >
     64    <StaticEntity position="<?lua print(y) ?>,0,<?lua print(z) ?>" scale=<?lua print(j * 2) ?> collisionType=static >
    6565      <attached>
    6666        <Model position="0,0,0" scale=15 mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh">
    6767        </Model>
    6868      </attached>
     69      <collisionShapes>
     70        <BoxCollisionShape    halfExtents="<?lua print(j * 2) ?>,100,<?lua print(j * 2) ?>" position = "0,0,0" />
     71      </collisionShapes>
    6972    </StaticEntity>
    7073
    71     <StaticEntity position="<?lua print(y) ?>,100,<?lua print(z) ?>" scale=<?lua print(j * 2) ?> >
     74    <StaticEntity position="<?lua print(y) ?>,100,<?lua print(z) ?>" scale=<?lua print(j * 2) ?> collisionType=static >
    7275      <attached>
    7376        <Model position="0,0,0" scale=15 mesh="ast<?lua print( math.mod(i+3,6) + 1) ?>.mesh">
    7477        </Model>
    7578      </attached>
     79      <collisionShapes>
     80        <BoxCollisionShape    halfExtents="45,100,45" position = "0,0,0" />
     81      </collisionShapes>
    7682    </StaticEntity>#
    7783
    78     <StaticEntity position="<?lua print(y) ?>,200,<?lua print(z) ?>" scale=<?lua print(j * 2) ?> >
     84    <StaticEntity position="<?lua print(y) ?>,200,<?lua print(z) ?>" scale=<?lua print(j * 2) ?> collisionType=static >
    7985      <attached>
    8086        <Model position="0,0,0" scale=15 mesh="ast<?lua print( math.mod(i*5,6) + 1) ?>.mesh">
    8187        </Model>
    8288      </attached>
     89      <collisionShapes>
     90        <BoxCollisionShape    halfExtents="45,100,45" position = "0,0,0" />
     91      </collisionShapes>
    8392    </StaticEntity>
    8493
    85     <StaticEntity position="<?lua print(y) ?>,-100,<?lua print(z) ?>" scale=<?lua print(j * 2) ?> >
     94    <StaticEntity position="<?lua print(y) ?>,-100,<?lua print(z) ?>" scale=<?lua print(j * 2) ?> collisionType=static >
    8695      <attached>
    8796        <Model position="0,0,0" scale=15 mesh="ast<?lua print( math.mod(i*13+1,6) + 1) ?>.mesh">
    8897        </Model>
    8998      </attached>
     99      <collisionShapes>
     100        <BoxCollisionShape    halfExtents="45,100,45" position = "0,0,0" />
     101      </collisionShapes>
    90102    </StaticEntity>
    91103
    92     <StaticEntity position="<?lua print(y) ?>,-200,<?lua print(z) ?>" scale=<?lua print(j * 2) ?> >
     104    <StaticEntity position="<?lua print(y) ?>,-200,<?lua print(z) ?>" scale=<?lua print(j * 2) ?> collisionType=static >
    93105      <attached>
    94106        <Model position="0,0,0" scale=15 mesh="ast<?lua print( math.mod(i*17,6) + 1) ?>.mesh">
    95107        </Model>
    96108      </attached>
     109      <collisionShapes>
     110        <BoxCollisionShape    halfExtents="45,100,45" position = "0,0,0" />
     111      </collisionShapes>
    97112    </StaticEntity>
    98113
    … …  
    102117       <attached>
    103118           <Model position="0,0,0" scale=25 mesh="ast6.mesh" shadow=true />
    104            <!--ParticleEmitter position="0,0,0" source="Orxonox/Steam" /-->
    105119       </attached>
     120      <!--collisionShapes>
     121        <BoxCollisionShape position="<?lua print(y) ?>,0,<?lua print(z) ?>"      halfExtents="5, 5, 5" />
     122      </collisionShapes-->
     123  </MovableEntity>
    106124
    107       <!--collisionShapes>
    108         <BoxCollisionShape position="<?lua print(y) ?>,0,<?lua print(z) ?>"      halfExtents="50, 200, 50" />
    109       </collisionShapes-->
    110 
    111   </MovableEntity>
    112125
    113126<?lua

  • code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.cc

    r7583 r7585  
    151151        if (!player)
    152152            return;
     153        this->timeToAct_[player]=timeRemaining+3.0f;//reset timer
    153154        //Update: Individual Players "lifes"-HUD
    154155        std::map<PlayerInfo*, Player>::iterator it2 = this->players_.find(player);
    … …  
    209210            {       
    210211                it->second-=dt;
     212                if (it->second<timeRemaining/6)//Warning message
     213                {
     214                    const std::string& message = "Camper Warning! Don't forget to shoot.";
     215                    this->gtinfo_->sendFadingMessage(message,it->first->getClientID());
     216                }
    211217                if (it->second<0.0f)
    212218                {
Note: See TracChangeset for help on using the changeset viewer.