Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7899


Ignore:
Timestamp:
Feb 15, 2011, 11:41:02 AM (14 years ago)
Author:
jo
Message:

Level polishing.

Location:
code/branches/lastmanstanding2
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • code/branches/lastmanstanding2/data/levels/lastManStanding.oxw

    r7679 r7899  
    3838
    3939<!-- ------------ 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>
     40    <StaticEntity position="0,0,0" collisionType=static>   
     41        <attached>
     42            <MovableEntity position="0,20,0" rotationrate="-4.5" rotationaxis="0,1,0" >
     43                <attached>
     44                    <Model position="0,0,0" scale=140 mesh="asteroid_UV.mesh" shadow=true />
     45                    <Model position="-160,40,28.4" scale=1 mesh="sphere.mesh" /><!--EasterEgg indicator-->
     46                    <PickupSpawner position="-160,40,17" triggerDistance="20" respawnTime="5" maxSpawnedItems="15"><!--EasterEgg-->
     47                        <pickup>
     48                            <InvisiblePickup template=hugeinvisiblepickup />
     49                        </pickup>
     50                    </PickupSpawner>
     51                </attached>
     52            </MovableEntity>
     53        </attached>
     54        <collisionShapes>
     55            <SphereCollisionShape radius="145" />
     56        </collisionShapes>
    4857    </StaticEntity>
    4958
    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>
    6559
    6660<!-- ---------------asteroid dome----------------- -->
    … …  
    138132
    139133
    140 <?lua end ?>
     134<?lua end ?><!-- ---------------asteroid dome END------------------->
    141135
    142136  </Scene>

  • code/branches/lastmanstanding2/data/overlays/lastManStandingHUD.oxo

    r7679 r7899  
    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/branches/lastmanstanding2/data/overlays/lastTeamStandingHUD.oxo

    r7699 r7899  
    1 <Template name="LastteamstandingHUD">
    2   <OverlayGroup name="LastteamstandingHUD" scale = "1, 1">
     1<Template name="lastTeamStandingHUD">
     2  <OverlayGroup name="lastTeamStandingHUD" scale = "1, 1">
    33
    4 <GametypeFadingMessage
     4<GametypeFadingMessag
    55     name     = "fadingmessage"
    66     position = "0.5, 0.01"
    … …  
    5555    />
    5656
    57     <OverlayText
    58      position  = "0.02, 0.07"
    59      pickpoint = "0.0, 0.0"
    60      font      = "ShareTechMono"
    61      textsize  = 0.04
    62      colour    = "1.0, 1.0, 1.0, 1.0"
    63      align     = "left"
    64      caption   = "__________|"
    65     />
    66 
    67     <OverlayText
    68      position  = "0.022, 0.07"
    69      pickpoint = "0.0, 0.0"
    70      font      = "ShareTechMono"
    71      textsize  = 0.04
    72      colour    = "1.0, 1.0, 1.0, 1.0"
    73      align     = "left"
    74      caption   = "__________"
    75     />
    76 
    77     <OverlayText
    78      position  = "0.1733, 0.038"
    79      pickpoint = "0.0, 0.0"
    80      font      = "ShareTechMono"
    81      textsize  = 0.04
    82      colour    = "1.0, 1.0, 1.0, 1.0"
    83      align     = "left"
    84      caption   = "|"
    85     />
    86 
    8757  </OverlayGroup>
    8858</Template>

  • code/branches/lastmanstanding2/src/orxonox/gametypes/LastTeamStanding.cc

    r7897 r7899  
    3535#include "core/ConfigValueIncludes.h"
    3636#include "util/Convert.h"
    37 //TODO: teamsAlive instead of playersAlive
    3837
    3938namespace orxonox
    … …  
    5453        this->timeRemaining = 15.0f;
    5554        this->respawnDelay = 4.0f;
     55        this->setHUDTemplate("lastTeamStandingHUD");
    5656    }
    5757   
Note: See TracChangeset for help on using the changeset viewer.