Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Aug 30, 2012, 11:08:17 PM (12 years ago)
Author:
landauf
Message:

merged branch presentation2012merge back to trunk

Location:
code/trunk
Files:
4 edited
2 copied

Legend:

Unmodified
Added
Removed

  • code/trunk

  • code/trunk/data/levels/templates/FPS.oxt

    r8858 r9348  
    1717   linearDamping     = 0.7
    1818   angularDamping    = 0.9999999
    19    friction          = 0.01
    20    
     19   friction          = 0.01
     20
    2121   weapon            = "hs-w01.mesh"
    2222  >
    … …  
    2424      <BoxCollisionShape position="0,-20,0" halfExtents="15,25,15" />
    2525    </collisionShapes>
    26    
     26
    2727    <camerapositions>
    2828      <CameraPosition position="-1,1,2.2" drag=false mouselook=true />
    2929    </camerapositions>
    30    
     30
    3131    <?lua
    32         include("../includes/weaponSettingsFPS.oxi")
     32        include("../includes/weaponSettingsFPS.oxi")
    3333    ?>
    3434
    … …  
    4040    <camerapositions>
    4141      <CameraPosition position="0,0,20" drag=false mouselook=true />
    42      
     42
    4343      <!--
    4444      CameraPosition position="0,150,-25" pitch=-90 drag=true />
    … …  
    4747      <CameraPosition position="-50,5,-8" yaw=-90 drag=true />
    4848      <CameraPosition position="50,5,-8" yaw=90 drag=true /
    49      
     49
    5050    </camerapositions>
    5151  </FpsPlayer>

  • code/trunk/data/levels/templates/pickupRepresentationTemplates.oxt

    r8706 r9348  
    1717</Template>
    1818
    19 <Template name=smallshieldpickup>
     19<Template name=smallshieldpickup baseclass=ShieldPickup>
    2020  <ShieldPickup
     21    representation = "smallshieldpickup"
    2122    duration = 10
    2223    shieldabsorption = 0.7
    … …  
    4344</Template>
    4445
    45 <Template name=mediumshieldpickup>
     46<Template name=mediumshieldpickup baseclass=ShieldPickup>
    4647  <ShieldPickup
     48    representation = "mediumshieldpickup"
    4749    duration = 30
    4850    shieldabsorption = 0.8
    … …  
    7072</Template>
    7173
    72 <Template name=hugeshieldpickup>
     74<Template name=hugeshieldpickup baseclass=ShieldPickup>
    7375  <ShieldPickup
     76    representation = "hugeshieldpickup"
    7477    duration = 60
    7578    shieldabsorption = 0.95
    … …  
    98101</Template>
    99102
    100 <Template name=smallhealthpickup>
     103<Template name=smallhealthpickup baseclass=HealthPickup>
    101104  <HealthPickup
     105    representation = "smallhealthpickup"
    102106    health = 10
    103107    healthType = "limited"
    … …  
    123127</Template>
    124128
    125 <Template name=mediumhealthpickup>
     129<Template name=mediumhealthpickup baseclass=HealthPickup>
    126130  <HealthPickup
     131    representation = "mediumhealthpickup"
    127132    health = 50
    128133    healthType = "limited"
    … …  
    148153</Template>
    149154
    150 <Template name=hugehealthpickup>
     155<Template name=hugehealthpickup baseclass=HealthPickup>
    151156  <HealthPickup
     157    representation = "hugehealthpickup"
    152158    health = 100
    153159    healthType = "limited"
    … …  
    173179</Template>
    174180
    175 <Template name=crazyhealthpickup>
     181<Template name=crazyhealthpickup baseclass=HealthPickup>
    176182  <HealthPickup
     183    representation = "crazyhealthpickup"
    177184    health = 1000
    178185    healthType = "permanent"
    … …  
    216223</Template>
    217224
     225<!-- DamageBoost pickups -->
     226
     227<Template name=smalldamageboostpickupRepresentation>
     228    <PickupRepresentation>
     229        <spawner-representation>
     230            <StaticEntity>
     231                <attached>
     232                    <Billboard position="0,0,0" colour="0.95,0.10,0.05" material="Sphere2" scale=0.1 >
     233                        <attached>
     234                            <Billboard position="0,0,0" colour="0.30,0.30,0.30" material="damageSmall" scale=0.7 />
     235                        </attached>
     236                    </Billboard>
     237                </attached>
     238            </StaticEntity>
     239        </spawner-representation>
     240    </PickupRepresentation>
     241</Template>
     242
     243<Template name=smalldamageboostpickup baseclass=DamageBoostPickup>
     244  <DamageBoostPickup
     245    representation = "smalldamageboostpickup"
     246    duration = 10.0
     247    damageMultiplier = 2.0
     248    activationType = "immediate"
     249    durationType = "continuous"
     250  />
     251</Template>
     252
     253<Template name=mediumdamageboostpickupRepresentation>
     254    <PickupRepresentation>
     255        <spawner-representation>
     256            <StaticEntity>
     257                <attached>
     258                    <Billboard position="0,0,0" colour="0.95,0.10,0.05" material="Sphere2" scale=0.1 >
     259                        <attached>
     260                            <Billboard position="0,0,0" colour="0.30,0.30,0.30" material="damageMedium" scale=0.7 />
     261                        </attached>
     262                    </Billboard>
     263                </attached>
     264            </StaticEntity>
     265        </spawner-representation>
     266    </PickupRepresentation>
     267</Template>
     268
     269<Template name=mediumdamageboostpickup baseclass=DamageBoostPickup>
     270  <DamageBoostPickup
     271    representation = "mediumdamageboostpickup"
     272    duration = 10.0
     273    damageMultiplier = 5.0
     274    activationType = "immediate"
     275    durationType = "continuous"
     276  />
     277</Template>
     278
     279<Template name=largedamageboostpickupRepresentation>
     280    <PickupRepresentation>
     281        <spawner-representation>
     282            <StaticEntity>
     283                <attached>
     284                    <Billboard position="0,0,0" colour="0.95,0.10,0.05" material="Sphere2" scale=0.1 >
     285                        <attached>
     286                            <Billboard position="0,0,0" colour="0.30,0.30,0.30" material="damageLarge" scale=0.7 />
     287                        </attached>
     288                    </Billboard>
     289                </attached>
     290            </StaticEntity>
     291        </spawner-representation>
     292    </PickupRepresentation>
     293</Template>
     294
     295<Template name=largedamageboostpickup baseclass=DamageBoostPickup>
     296  <DamageBoostPickup
     297    representation = "largedamageboostpickup"
     298    duration = 10.0
     299    damageMultiplier = 7.0
     300    activationType = "immediate"
     301    durationType = "continuous"
     302  />
     303</Template>
     304
     305
    218306<!-- Speed pickups -->
    219307
    … …  
    234322</Template>
    235323
    236 <Template name=smallspeedpickup>
     324<Template name=smallspeedpickup baseclass=SpeedPickup>
    237325  <SpeedPickup
     326    representation = "smallspeedpickup"
    238327    duration = 10.0
    239328    speedAdd = 0.0
    … …  
    260349</Template>
    261350
    262 <Template name=mediumspeedpickup>
     351<Template name=mediumspeedpickup baseclass=SpeedPickup>
    263352  <SpeedPickup
     353    representation = "mediumspeedpickup"
    264354    duration = 10.0
    265355    speedAdd = 0.0
    … …  
    286376</Template>
    287377
    288 <Template name=hugespeedpickup>
     378<Template name=hugespeedpickup baseclass=SpeedPickup>
    289379  <SpeedPickup
     380    representation = "hugespeedpickup"
    290381    duration = 10.0
    291382    speedAdd = 0.0
    … …  
    312403</Template>
    313404
    314 <Template name=smalljumppickup>
     405<Template name=smalljumppickup baseclass=SpeedPickup>
    315406  <SpeedPickup
     407    representation = "smalljumppickup"
    316408    duration = 0.7
    317409    speedAdd = 5000.0
    … …  
    340432</Template>
    341433
    342 <Template name=smallinvisiblepickup>
     434<Template name=smallinvisiblepickup baseclass=InvisiblePickup>
    343435  <InvisiblePickup
     436    representation = "smallinvisiblepickup"
    344437    duration = 5.0
    345438    activaionType = "immediate"
    … …  
    364457</Template>
    365458
    366 <Template name=mediuminvisiblepickup>
     459<Template name=mediuminvisiblepickup baseclass=InvisiblePickup>
    367460  <InvisiblePickup
     461    representation = "mediuminvisiblepickup"
    368462    duration = 10.0
    369463    activaionType = "immediate"
    … …  
    388482</Template>
    389483
    390 <Template name=hugeinvisiblepickup>
     484<Template name=hugeinvisiblepickup baseclass=InvisiblePickup>
    391485  <InvisiblePickup
     486    representation = "hugeinvisiblepickup"
    392487    duration = 20.0
    393488    activaionType = "immediate"
    … …  
    412507</Template>
    413508
    414 <Template name=smallshrinkpickup>
    415   <InvisiblePickup
     509<Template name=smallshrinkpickup baseclass=ShrinkPickup>
     510  <ShrinkPickup
     511    representation = "smallshrinkpickup"
    416512    duration = 10.0
    417513    shrinkFactor = 2.5
    … …  
    437533</Template>
    438534
    439 <Template name=mediumshrinkpickup>
    440   <InvisiblePickup
     535<Template name=mediumshrinkpickup baseclass=ShrinkPickup>
     536  <ShrinkPickup
     537    representation = "mediumshrinkpickup"
    441538    duration = 30.0
    442539    shrinkFactor = 5.0
    … …  
    462559</Template>
    463560
    464 <Template name=hugeshrinkpickup>
    465   <InvisiblePickup
     561<Template name=hugeshrinkpickup baseclass=ShrinkPickup>
     562  <ShrinkPickup
     563    representation = "hugeshrinkpickup"
    466564    duration = 60.0
    467565    shrinkFactor = 10.0
    … …  
    491589</Template>
    492590
    493 <Template name=triplehealthspeedinvisibilitypickup>
    494     <PickupCollection>
     591<Template name=triplehealthspeedinvisibilitypickup baseclass=PickupCollection>
     592    <PickupCollection
     593        representation = "triplehealthspeedinvisibilitypickup"
     594    >
    495595        <pickupables>
    496596            <HealthPickup template=mediumhealthpickup />
    … …  
    551651</Template>
    552652
    553 <Template name=dronepickup>
    554     <DronePickup droneTemplate=droneTemplate />
    555 </Template>
    556 
     653<Template name=dronepickup baseclass=DronePickup>
     654    <DronePickup representation=dronepickup droneTemplate=droneTemplate />
     655</Template>
     656

  • code/trunk/data/levels/templates/spaceshipSpacecruiser.oxt

    • Property svn:eol-style set to native
Note: See TracChangeset for help on using the changeset viewer.