Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8178


Ignore:
Timestamp:
Apr 3, 2011, 7:56:47 PM (14 years ago)
Author:
jo
Message:

Merged lastmastanding3 into trunk. There's an xml parsing error that only appeared after merging. The level seems to load properly though.

Location:
code/trunk
Files:
9 edited
7 copied

Legend:

Unmodified
Added
Removed

  • code/trunk

  • code/trunk/data/levels/lastManStanding.oxw

    r8079 r8178  
     1<LevelInfo
     2 name = "Last Man Standing"
     3 description = "Be the sole survivor."
     4 tags = ""
     5/>
     6
    17<?lua
    28  include("stats.oxo")
    … …  
    3844
    3945<!-- ------------ middle asteroid -------------- -->
    40     <StaticEntity position="0,20,0" collisionType=static>
    41        <attached>
    42            <Model position="0,0,0" scale=140 mesh="asteroid_UV.mesh" shadow=true />
    43            <!-- ParticleEmitter position="0,0,0" source="Orxonox/Steam" / -->
    44        </attached>
    45       <collisionShapes>
    46         <SphereCollisionShape radius="145" />
    47       </collisionShapes>
     46    <StaticEntity position="0,0,0" collisionType=static>   
     47        <attached>
     48            <MovableEntity position="0,20,0" rotationrate="-4.5" rotationaxis="0,1,0" >
     49                <attached>
     50                    <Model position="0,0,0" scale=140 mesh="asteroid_UV.mesh" shadow=true />
     51                    <Model position="-160,40,28.4" scale=1 mesh="sphere.mesh" /><!--EasterEgg indicator-->
     52                    <PickupSpawner position="-160,40,17" triggerDistance="20" respawnTime="5" maxSpawnedItems="15"><!--EasterEgg-->
     53                        <pickup>
     54                            <InvisiblePickup template=hugeinvisiblepickup />
     55                        </pickup>
     56                    </PickupSpawner>
     57                </attached>
     58            </MovableEntity>
     59        </attached>
     60        <collisionShapes>
     61            <SphereCollisionShape radius="145" />
     62        </collisionShapes>
    4863    </StaticEntity>
    4964
    50     <PickupSpawner position="-160,65,10" triggerDistance="10" respawnTime="5" maxSpawnedItems="10"><!--EasterEgg-->
    51       <pickup>
    52         <InvisiblePickup template=mediuminvisiblepickup />
    53       </pickup>
    54     </PickupSpawner>
    55     <PickupSpawner position="-160,60,17" triggerDistance="10" respawnTime="5" maxSpawnedItems="10"><!--EasterEgg-->
    56       <pickup>
    57         <InvisiblePickup template=hugeinvisiblepickup />
    58       </pickup>
    59     </PickupSpawner>
    60     <StaticEntity position="-160,60,28.4"><!--EasterEgg-Indicator-->
    61       <attached>
    62         <Model position="0,0,0" scale=1 mesh="sphere.mesh" />
    63       </attached>
    64     </StaticEntity>
    6565
    6666<!-- ---------------asteroid dome----------------- -->
    … …  
    138138
    139139
    140 <?lua end ?>
     140<?lua end ?><!-- ---------------asteroid dome END------------------->
    141141
    142142  </Scene>

  • code/trunk/data/overlays/lastManStandingHUD.oxo

    r7679 r8178  
    6565    />
    6666
    67     <OverlayText
     67    <!--OverlayText
    6868     position  = "0.02, 0.07"
    6969     pickpoint = "0.0, 0.0"
    … …  
    9393     align     = "left"
    9494     caption   = "|"
    95     />
     95    /-->
    9696
    9797  </OverlayGroup>

  • code/trunk/src/modules/overlays/hud/CMakeLists.txt

    r8079 r8178  
    1717  LastManStandingInfos.cc
    1818  PauseNotice.cc
     19  LastTeamStandingInfos.cc
    1920)

  • code/trunk/src/modules/overlays/hud/GametypeStatus.cc

    r7284 r8178  
    3636#include "worldentities/ControllableEntity.h"
    3737#include "worldentities/pawns/Spectator.h"
     38//#include "gametypes/Gametype.h"
    3839
    3940namespace orxonox
    … …  
    5051        RegisterObject(GametypeStatus);
    5152
     53        //this->game_ = 0;
    5254        this->owner_ = 0;
    5355        this->bNoCaption_ = false;
     56        //this->bForcedSpawn_ = false;
    5457
    5558        ModifyConsoleCommand(__CC_GametypeStatus_name, __CC_displayCaption_name).setObject(this);
    … …  
    6770        if (this->owner_ && this->owner_->getGametypeInfo() && this->owner_->getControllableEntity())
    6871        {
     72            //if (this->game_)
     73            //    this->bForcedSpawn_ = this->game_->getForceSpawn();
     74            //else
     75            //    this->bForcedSpawn_ = false;
     76
    6977            const GametypeInfo* gtinfo = this->owner_->getGametypeInfo();
    7078            ControllableEntity* ce = this->owner_->getControllableEntity();
    … …  
    8795                if (gtinfo->isStartCountdownRunning())
    8896                    this->setCaption(multi_cast<std::string>(static_cast<int>(ceil(gtinfo->getStartCountdown()))));
    89                 else if (ce->isA(Class(Spectator)))
     97                else if (ce->isA(Class(Spectator))/*&&(!bForcedSpawn_)*/)
    9098                    this->setCaption("Press [Fire] to respawn");
    9199                else
    … …  
    101109    {
    102110        SUPER(GametypeStatus, changedOwner);
    103 
     111        //this->game_ = orxonox_cast<Gametype*>(this->getOwner());
    104112        this->owner_ = orxonox_cast<PlayerInfo*>(this->getOwner());
    105113    }

  • code/trunk/src/modules/overlays/hud/GametypeStatus.h

    r7284 r8178  
    4949
    5050        private:
     51            //Gametype* game_;
    5152            PlayerInfo* owner_;
    5253            bool bNoCaption_;
     54            //bool bForcedSpawn_;
    5355
    5456    };

  • code/trunk/src/orxonox/OrxonoxPrereqs.h

    r7854 r8178  
    9696    class Gametype;
    9797    class LastManStanding;
     98    class LastTeamStanding;
    9899    class TeamBaseMatch;
    99100    class TeamDeathmatch;

  • code/trunk/src/orxonox/gametypes/CMakeLists.txt

    r7655 r8178  
    88  Dynamicmatch.cc
    99  LastManStanding.cc
     10  LastTeamStanding.cc
    1011)

  • code/trunk/src/orxonox/gametypes/Gametype.h

    r7801 r8178  
    150150              { this->timeLimit_ = t; }
    151151
     152            //inline bool getForceSpawn()
     153            //  { return this->bForceSpawn_; }       
     154
    152155            virtual void resetTimer();
    153156            virtual void resetTimer(float t);
Note: See TracChangeset for help on using the changeset viewer.