Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Feb 16, 2011, 11:17:30 AM (13 years ago)
Author:
scheusso
Message:

Merge branch 'jo-test' into lms3

Location:
code/branches/lastmanstanding3/data
Files:
1 added
2 edited
1 copied

Legend:

Unmodified
Added
Removed

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

    r7785 r7903  
     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/branches/lastmanstanding3/data/levels/lastTeamStanding.oxw

    r7902 r7903  
     1<LevelInfo
     2 name = "Last Team Standing"
     3 description = "Survive as a team."
     4 tags = "singleplayer"
     5/>
    16<?lua
    27  include("stats.oxo")
    38  include("HUDTemplates3.oxo")
    49  include("templates/lodInformation.oxt")
    5   include("lastManStandingHUD.oxo")
     10  include("lastTeamStandingHUD.oxo")
    611  include("templates/spaceshipAssff.oxt")
    712  include("templates/spaceshipPirate.oxt")
    … …  
    1015
    1116<Level
    12  name         = "Last Man Standing"
    13  description  = "testmap for gametype last man standing"
    14  gametype     =  "LastManStanding"
     17 name         = "Last Team Standing"
     18 description  = "testmap for gametype last team standing"
     19 gametype     =  "LastTeamStanding"
    1520>
    1621  <templates>
    … …  
    2025  <Scene
    2126    ambientlight = "0.8, 0.8, 0.8"
    22     skybox       = "Orxonox/skyBoxMoreNebula"
     27    skybox       = "Orxonox/skypanoramagen1"
    2328  >
    2429
    … …  
    2732    ?>
    2833
    29 <!----- Spawnpoints
    30     <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"/>
    31     <SpawnPoint team=0 position="-1150,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
    32     <SpawnPoint team=0 position="1150,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
    33     <SpawnPoint team=0 position="-700,0,700" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
    34     <SpawnPoint team=0 position="700,0,-700" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
    35     <SpawnPoint team=0 position="0,0,-1150" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
    36     <SpawnPoint team=0 position="0,0,1150" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff /> ----->
    3734<Bot />
    3835
    … …  
    7471    ?>
    7572
    76     <SpawnPoint team=0 position="<?lua print(y*1.4+z*0.2) ?>,0,<?lua print(z*1.4-y*0.2) ?>" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
     73    <TeamSpawnPoint team=<?lua print( math.mod(i,4)) ?> position="<?lua print(y*1.4+z*0.2) ?>,0,<?lua print(z*1.4-y*0.2) ?>" direction="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
    7774
    7875    <StaticEntity position="<?lua print(y) ?>,0,<?lua print(z) ?>" scale=<?lua print(j * 2) ?> collisionType=static >

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

    r7679 r7903  
    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>
Note: See TracChangeset for help on using the changeset viewer.