Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7655


Ignore:
Timestamp:
Nov 18, 2010, 9:54:39 PM (14 years ago)
Author:
rgrieder
Message:

Merged lastmanstanding back to trunk.

Location:
code/trunk
Files:
13 edited
6 copied

Legend:

Unmodified
Added
Removed

  • code/trunk

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

    r7163 r7655  
    143143
    144144
    145     <CheckPoint name=trigger1 position="-300,300,0" scale=1 isdestination=false isfirst=true stayactive=true distance=10 addtime=26 />
    146 
    147 
    148     <CheckPoint name=trigger2 position="2200,600,0" scale=3 isdestination=false stayactive=true distance=100 addtime=20>
     145    <CheckPoint name=trigger1 position="-300,300,0" scale=1 isdestination=false isfirst=true stayactive=true distance=10 addtime=14 />
     146
     147
     148    <CheckPoint name=trigger2 position="2200,600,0" scale=3 isdestination=false stayactive=true distance=100 addtime=11>
    149149      <events>
    150150        <activity>
    … …  
    197197
    198198
    199     <CheckPoint name=trigger3 position="4100,0,400" scale=3 isdestination=false stayactive=true distance=100 addtime=18>
     199    <CheckPoint name=trigger3 position="4100,0,400" scale=3 isdestination=false stayactive=true distance=100 addtime=9>
    200200      <events>
    201201        <activity>
    … …  
    248248
    249249
    250     <CheckPoint name=trigger4 position="5600,400,0" scale=3 isdestination=false stayactive=true distance=100 addtime=18>
     250    <CheckPoint name=trigger4 position="5600,400,0" scale=3 isdestination=false stayactive=true distance=100 addtime=9>
    251251      <events>
    252252        <activity>
    … …  
    299299
    300300
    301     <CheckPoint name=trigger5 position="7200,600,-200" scale=3 isdestination=false stayactive=true distance=100 addtime=18>
     301    <CheckPoint name=trigger5 position="7200,600,-200" scale=3 isdestination=false stayactive=true distance=100 addtime=8>
    302302      <events>
    303303        <activity>
    … …  
    350350
    351351
    352     <CheckPoint name=trigger6 position="9200, 800,-800" scale=3 isdestination=false stayactive=true distance=100 addtime=20>
     352    <CheckPoint name=trigger6 position="9200, 800,-800" scale=3 isdestination=false stayactive=true distance=100 addtime=10>
    353353      <events>
    354354        <activity>

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

    r7163 r7655  
    6868<?lua
    6969max = 20
    70 for i = 1, max, 1
     70for i = 0, max, 1
    7171do
    7272    y = math.sin(i/max*6)*4000
    7373    z = math.cos(i/max*6)*5000
    74     x = i*100
     74    x = 0
    7575    ?>
    7676<?lua

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

    • Property svn:eol-style set to native

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

    r7648 r7655  
    1010  include("templates/spaceship_swallow.oxt")
    1111  include("templates/spaceship_pirate.oxt")
     12  include("templates/lodinformation.oxt")
    1213?>
    1314
    … …  
    1718
    1819>
     20
     21  <templates>
     22    <Template link=lodtemplate_default />
     23  </templates>
     24
    1925  <Scene
    2026   ambientlight = "0.5, 0.5, 0.5"
    … …  
    2228  >
    2329    <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
    24 
    2530
    2631<SpawnPoint position="<?lua print(math.sin(1.5) *40000) ?>,<?lua print(math.cos(1.5) *40000) ?>,<?lua print(500) ?>" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipswallow />

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

    r7163 r7655  
    2020     align    = "center"
    2121    />
     22
    2223  </OverlayGroup>
    2324</Template>

  • code/trunk/src/modules/notifications/Notification.h

    r7552 r7655  
    8080
    8181            void initialize(void); //!< Registers the object and sets some default values.
     82            void registerVariables(void) {}
    8283
    8384    };

  • code/trunk/src/modules/overlays/OverlaysPrereqs.h

    r7163 r7655  
    8888    class HUDTimer;
    8989    class KillMessage;
     90    class LastManStandingInfos;
    9091    class TeamBaseMatchScore;
    9192    class UnderAttackHealthBar;

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

    r7654 r7655  
    1515  GametypeStaticMessage.cc
    1616  GametypeFadingMessage.cc
     17  LastManStandingInfos.cc
    1718)

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

    r7648 r7655  
    9595    class Dynamicmatch;
    9696    class Gametype;
     97    class LastManStanding;
    9798    class TeamBaseMatch;
    9899    class TeamDeathmatch;

  • code/trunk/src/orxonox/gametypes/Asteroids.cc

    r6417 r7655  
    4141        RegisterObject(Asteroids);
    4242        this->firstCheckpointReached_ = false;
     43        this->numberOfBots_=0; //sets number of default bots temporarly to 0
    4344    }
    4445
    … …  
    7576        COUT(0) << message << std::endl;
    7677        Host::Broadcast(message);
     78
    7779    }
    7880

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

    r7654 r7655  
    77  Asteroids.cc
    88  Dynamicmatch.cc
     9  LastManStanding.cc
    910)

  • code/trunk/src/orxonox/worldentities/pawns/Pawn.h

    r7547 r7655  
    155155            float shieldAbsorption_; // Has to be between 0 and 1
    156156
    157             Pawn* lastHitOriginator_;
     157            WeakPtr<Pawn> lastHitOriginator_;
    158158
    159159            WeaponSystem* weaponSystem_;
Note: See TracChangeset for help on using the changeset viewer.