Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Jan 4, 2016, 10:13:21 AM (9 years ago)
Author:
fvultier
Message:

Merge latest changes from fabienHS15 to presentationHS15.

Location:
code/branches/presentationHS15
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • code/branches/presentationHS15

  • code/branches/presentationHS15/data/levels/notifications.oxw

    r9348 r11034  
    1919    <?lua include("includes/notifications.oxi") ?>
    2020
     21    <NotificationQueueCEGUI
     22      name="narrative"
     23      targets="simpleNotification,commandNotification"
     24      size=3
     25      displayTime=3.9
     26      position="0.2, 0, 0.1, 0"
     27      fontSize="23"
     28      fontColor="0.3, 1, 0.2, 0.8"
     29      alignment="HorzCentred"
     30      displaySize="0.6, 0, 0, 0"
     31      />
     32
    2133    <Scene
    2234        ambientlight = "0.5, 0.5, 0.5"
     
    2537
    2638    <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" />
     39    <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
    2740
    28     <CommandNotification preMessage="Open the PickupInventory by pressing '" postMessage="'." command="OrxonoxOverlay toggleVisibility PickupInventory">
     41    <CommandNotification preMessage="Open the PickupInventory by pressing '" postMessage="'." command="OrxonoxOverlay show PickupInventory">
    2942        <events>
    3043            <trigger>
     
    4457    <Billboard position="0,0,100" colour="1.0,0,1.0" material="Examples/Flare" />
    4558
    46     <?lua
    47       for i = 1, 10, 1 do
    48     ?>
    49         <SpawnPoint position="<?lua print(math.random() * 1000 - 500) ?>,<?lua print(math.random() * 1000 - 500) ?>,<?lua print(math.random() * 1000 - 500) ?>" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
    50     <?lua end ?>
    51 
    5259  </Scene>
    5360</Level>
  • code/branches/presentationHS15/data/levels/templates/pickupRepresentationTemplates.oxt

    r10961 r11034  
    326326        <MunitionContainer munitiontype="SplitMunition" munitionamount=8 magazinesamount=0 />
    327327        <MunitionContainer munitiontype="RocketMunition" munitionamount=0 magazinesamount=2 />
     328        <MunitionContainer munitiontype="MineMunition" munitionamount=0 magazinesamount=2 />
    328329    </munitioncontainers>
    329   </MunitionPickup></Template>
     330  </MunitionPickup>
     331</Template>
    330332
    331333<Template name=hugemunitionpickupRepresentation>
     
    359361        <MunitionContainer munitiontype="IceMunition" munitionamount=0 magazinesamount=10 />
    360362        <MunitionContainer munitiontype="GravityBombMunition" munitionamount=0 magazinesamount=10 />
     363        <MunitionContainer munitiontype="MineMunition" munitionamount=0 magazinesamount=10 />
    361364    </munitioncontainers>
    362365  </MunitionPickup>
Note: See TracChangeset for help on using the changeset viewer.