Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Jun 14, 2011, 8:53:28 PM (13 years ago)
Author:
dafrick
Message:

Merging presentation branch back into trunk.
There are many new features and also a lot of other changes and bugfixes, if you want to know, digg through the svn log.
Not everything is yet working as it should, but it should be fairly stable. If you habe any bug reports, just send me an email.

Location:
code/trunk
Files:
12 edited
2 copied

Legend:

Unmodified
Added
Removed

  • code/trunk

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

    r8528 r8706  
    1414      <MeshLodInformation mesh=SolarPanel.mesh enabled=false/>
    1515      <MeshLodInformation mesh=CuboidLandingZone.mesh enabled=false/>
     16      <MeshLodInformation mesh=HydroHarvester.mesh enabled=false />
    1617
    1718      <!-- disable LOD for some debris meshes which caused a crash (fixed in Ogre 1.7.3) -->

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

    r7679 r8706  
    391391  <InvisiblePickup
    392392    duration = 20.0
     393    activaionType = "immediate"
     394    durationType = "continuous"
     395  />
     396</Template>
     397
     398<Template name=smallshrinkpickupRepresentation>
     399    <PickupRepresentation>
     400        <spawner-representation>
     401            <StaticEntity>
     402                <attached>
     403                    <Billboard position="0,0,0" colour="1.0,0.55,1.0" material="Sphere2" scale=0.1>
     404                        <attached>
     405                            <Billboard position="0,0,0" colour="1.0,0.55,1.0" material="Shrink" scale=0.4 />
     406                        </attached>
     407                    </Billboard>
     408                </attached>
     409            </StaticEntity>
     410        </spawner-representation>
     411    </PickupRepresentation>
     412</Template>
     413
     414<Template name=smallshrinkpickup>
     415  <InvisiblePickup
     416    duration = 10.0
     417    shrinkFactor = 2.5
     418    activaionType = "immediate"
     419    durationType = "continuous"
     420  />
     421</Template>
     422
     423<Template name=mediumshrinkpickupRepresentation>
     424    <PickupRepresentation>
     425        <spawner-representation>
     426            <StaticEntity>
     427                <attached>
     428                    <Billboard position="0,0,0" colour="1.0,0.55,1.0" material="Sphere2" scale=0.1>
     429                        <attached>
     430                            <Billboard position="0,0,0" colour="1.0,0.55,1.0" material="Shrink" scale=0.7 />
     431                        </attached>
     432                    </Billboard>
     433                </attached>
     434            </StaticEntity>
     435        </spawner-representation>
     436    </PickupRepresentation>
     437</Template>
     438
     439<Template name=mediumshrinkpickup>
     440  <InvisiblePickup
     441    duration = 30.0
     442    shrinkFactor = 5.0
     443    activaionType = "immediate"
     444    durationType = "continuous"
     445  />
     446</Template>
     447
     448<Template name=hugeshrinkpickupRepresentation>
     449    <PickupRepresentation>
     450        <spawner-representation>
     451            <StaticEntity>
     452                <attached>
     453                    <Billboard position="0,0,0" colour="1.0,0.55,1.0" material="Sphere2" scale=0.1>
     454                        <attached>
     455                            <Billboard position="0,0,0" colour="1.0,0.55,1.0" material="Shrink" scale=1.0 />
     456                        </attached>
     457                    </Billboard>
     458                </attached>
     459            </StaticEntity>
     460        </spawner-representation>
     461    </PickupRepresentation>
     462</Template>
     463
     464<Template name=hugeshrinkpickup>
     465  <InvisiblePickup
     466    duration = 60.0
     467    shrinkFactor = 10.0
    393468    activaionType = "immediate"
    394469    durationType = "continuous"

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

    r7845 r8706  
    33   hudtemplate            = spaceshiphud
    44   camerapositiontemplate = spaceshipassffcameras
    5    engine                 = spaceshipassffengine
    65   spawnparticlesource    = "Orxonox/fairytwirl"
    76   spawnparticleduration  = 3
    … …  
    1211   initialhealth     = 100
    1312
    14    primaryThrust     = 100;
    15    auxilaryThrust    = 30;
    16    rotationThrust    = 25;
     13   shieldhealth        = 30
     14   initialshieldhealth = 30
     15   maxshieldhealth     = 50
     16   shieldabsorption    = 0.8
     17   reloadrate          = 1
     18   reloadwaittime      = 1
     19
     20   primaryThrust     = 100
     21   auxilaryThrust    = 30
     22   rotationThrust    = 50
     23
     24   lift = 1;
     25   stallSpeed = 220;
     26
     27   boostPower            = 15
     28   boostPowerRate        = 1
     29   boostRate             = 5
     30   boostCooldownDuration = 10
     31
     32   shakeFrequency = 15
     33   shakeAmplitude = 9
    1734
    1835   collisionType     = "dynamic"
    … …  
    2138   angularDamping    = 0.9999999
    2239  >
     40    <engines>
     41      <MultiStateEngine position=" 7.6, 0, 6" template=spaceshipassffengine />
     42      <MultiStateEngine position="-7.6, 0, 0" template=spaceshipassffengine />
     43    </engines>
    2344    <attached>
    2445      <Model position="0,0,0" yaw=90 pitch=-90 roll=0 scale=4 mesh="assff.mesh" />
    … …  
    7798    </EffectContainer>
    7899    <EffectContainer condition="not idle">
    79       <FadingBillboard mainstate=activity active=false scale=0.1 position="0, 0, 9" colour="0.2, 0.65, 1.0, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
    80 <!--
    81       <Light mainstate=visibility position=" 8, 0, 8" diffuse="0.3, 0.6, 1.0" specular="0.3, 0.6, 1.0" attenuation="600, 1.0, 0.007, 0.0002" type=point />
    82       <Light mainstate=visibility position="-8, 0, 8" diffuse="0.3, 0.6, 1.0" specular="0.3, 0.6, 1.0" attenuation="600, 1.0, 0.007, 0.0002" type=point />
    83 -->
     100      <FadingBillboard mainstate=activity active=false scale=0.1 position="7.6, 0, 9" colour="0.2, 0.65, 1.0, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
     101      <FadingBillboard mainstate=activity active=false scale=0.1 position="-7.6, 0, 9" colour="0.2, 0.65, 1.0, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
    84102    </EffectContainer>
    85103    <EffectContainer condition="normal or brake">
    … …  
    87105    </EffectContainer>
    88106    <EffectContainer condition="normal or boost">
    89       <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 7.6, 0, 6" colour="0.2, 0.65, 1.0, 1.0" width=15 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
    90       <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-7.6, 0, 6" colour="0.2, 0.65, 1.0, 1.0" width=15 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
     107      <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 7.6, 0, 0" colour="0.2, 0.65, 1.0, 1.0" width=15 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
     108      <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-7.6, 0, 0" colour="0.2, 0.65, 1.0, 1.0" width=15 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
    91109    </EffectContainer>
    92110    <EffectContainer condition="boost">
    … …  
    94112      <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-7.6, 0, 6" colour="0.6, 0.75, 0.8, 0.7" width=40 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
    95113    </EffectContainer>
    96     <EffectContainer condition="brake">
     114<!--    <EffectContainer condition="brake">
    97115      <FadingBillboard mainstate=activity active=false scale=0.3 position=" 8, 0, 6" colour="0.5, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
    98116      <FadingBillboard mainstate=activity active=false scale=0.3 position="-8, 0, 6" colour="0.5, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
    … …  
    100118      <FadingBillboard mainstate=activity active=false scale=0.15 position="-8, 0, 6" colour="1.0, 0.0, 0.0, 1.0" material="Flares/backlightflare" turnontime=0.5 turnofftime=0.5 />
    101119    </EffectContainer>
     120-->
    102121  </MultiStateEngine>
    103122</Template>

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

    r7679 r8706  
    33   hudtemplate            = spaceshiphud
    44   camerapositiontemplate = spaceshipghostcameras
    5    engine                 = spaceshipghostengine
     5
    66   spawnparticlesource    = "Orxonox/fairytwirl"
    77   spawnparticleduration  = 3
    … …  
    2121   angularDamping    = 0.9999999
    2222  >
    23 
     23    <engines>
     24      <MultiStateEngine position="0,0,0" template=spaceshipghostengine/>
     25    </engines>
    2426    <attached>
    2527      <Model position="0,0,0" scale=2 yaw=90 pitch=-90 roll=0 mesh="ghost.mesh" />

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

    r7679 r8706  
    33   hudtemplate            = spaceshiphud
    44   camerapositiontemplate = spaceshipHtwocameras
    5    engine                 = spaceshipHtwoengine
    65   spawnparticlesource    = "Orxonox/fairytwirl"
    76   spawnparticleduration  = 3
    … …  
    2524  include("includes/weaponSettingsH2.oxi")
    2625?>
     26    <engines>
     27      <MultiStateEngine position="0,0,0" template=spaceshipHtwoengine />
    2728
     29    </engines>
    2830    <attached>
    2931      <Model position="0,0,0" yaw=90 pitch=-90 roll=0 scale3D="3,0.833,0.833" mesh="h2_green.mesh" />

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

    r7679 r8706  
    2121   angularDamping    = 0.9999999
    2222  >
     23    <engines>
     24      <MultiStateEngine position=" 0, 0, 0" template=spaceshipHXYengine />
     25    </engines>
    2326    <attached>
    2427      <Model position="0,0,0" yaw=180 pitch=-90 roll=0 scale=4 mesh="HXY.mesh" />

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

    r8398 r8706  
    33   hudtemplate            = spaceshiphud
    44   camerapositiontemplate = spaceshipHXYcameras
    5    engine                 = spaceshipHXYengine
    65   spawnparticlesource    = "Orxonox/fairytwirl"
    76   spawnparticleduration  = 3
    … …  
    2120   angularDamping    = 0.9999999
    2221  >
     22    <engines>
     23      <MultiStateEngine position=" 0, 0, 0" template=spaceshipHXYengine />
     24    </engines>
    2325    <attached>
    2426      <Model position="0,0,0" yaw=180 pitch=-90 roll=0 scale=4 mesh="HXY.mesh" />
    … …  
    3840  </SpaceShip>
    3941</Template>
    40 
    41 <Template name=spaceshipHXYcameras defaults=0>
    42   <SpaceShip>
    43     <camerapositions>
    44       <CameraPosition position="0,8, 60" drag=true mouselook=true />
    45       <CameraPosition position="0,16, 120" drag=true mouselook=true />
    46       <CameraPosition position="0,24,180" drag=true mouselook=true />
    47       <CameraPosition position="0,60,10" pitch="-80" drag=true mouselook=true />
    48     </camerapositions>
    49   </SpaceShip>
    50 </Template>
    51 
    52 <Template name=spaceshipHXYengine baseclass=MultiStateEngine>
    53   <MultiStateEngine
    54    boostfactor    = 6
    55 
    56    speedfront     = 150
    57    speedback      =  50
    58    speedleftright =  50
    59    speedupdown    =  50
    60 
    61    accelerationfront     = 500
    62    accelerationbrake     = 500
    63    accelerationback      =  125
    64    accelerationleftright =  125
    65    accelerationupdown    =  125
    66   >
    67     <EffectContainer condition="idle">
    68     </EffectContainer>
    69     <EffectContainer condition="not idle">
    70 
    71     </EffectContainer>
    72     <EffectContainer condition="normal or brake">
    73 
    74     </EffectContainer>
    75     <EffectContainer condition="normal or boost">
    76       <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 2, 0, 20" colour="1, 0.7, 0.1, 1.0" width=10 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
    77       <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-2, 0, 20" colour="1, 0.7, 0.1, 1.0" width=10 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
    78     </EffectContainer>
    79     <EffectContainer condition="boost">
    80       <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 2, 0, 20" colour="1, 0.7, 0.1, 0.7" width=25 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
    81       <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-2, 0, 20" colour="1, 0.7, 0.1, 0.7" width=25 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
    82     </EffectContainer>
    83     <EffectContainer condition="brake">
    84       <FadingBillboard mainstate=activity active=false scale=0.3 position=" 2, 0, 20" colour="0.5, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
    85       <FadingBillboard mainstate=activity active=false scale=0.3 position="-2, 0, 20" colour="0.5, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
    86       <FadingBillboard mainstate=activity active=false scale=0.15 position=" 2, 0, 20" colour="1.0, 0.0, 0.0, 1.0" material="Flares/backlightflare" turnontime=0.5 turnofftime=0.5 />
    87       <FadingBillboard mainstate=activity active=false scale=0.15 position="-2, 0, 20" colour="1.0, 0.0, 0.0, 1.0" material="Flares/backlightflare" turnontime=0.5 turnofftime=0.5 />
    88     </EffectContainer>
    89   </MultiStateEngine>
    90 </Template>

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

    r7679 r8706  
    33   hudtemplate            = spaceshiphud
    44   camerapositiontemplate = spaceshippiratecameras
    5    engine                 = spaceshippirateengine
    65   spawnparticlesource    = "Orxonox/fairytwirl"
    76   spawnparticleduration  = 3
    … …  
    2120   angularDamping    = 0.9999999
    2221  >
     22    <engines>
     23      <MultiStateEngine position=" 0, 0, 0" template=spaceshippirateengine />
     24    </engines>
    2325    <attached>
    2426      <Model position="0,0,0" yaw=90 pitch=-90 roll=0 scale=4 mesh="pirate.mesh" />

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

    r7679 r8706  
    33   hudtemplate            = spaceshiphud
    44   camerapositiontemplate = spaceshipswallowcameras
    5    engine                 = spaceshipswallowengine
    65   spawnparticlesource    = "Orxonox/fairytwirl"
    76   spawnparticleduration  = 3
    … …  
    2120   angularDamping    = 0.9999999
    2221  >
    23 
     22    <engines>
     23      <MultiStateEngine position=" 0, 0, 0" template=spaceshipswallowengine />
     24    </engines>
    2425    <attached>
    2526      <Model position="0,0,0" scale=2 yaw=90 pitch=-90 roll=0 mesh="swallow_mat.mesh" />

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

    r7679 r8706  
    33   hudtemplate            = spaceshiphud
    44   camerapositiontemplate = spaceshipTransportercameras
    5    engine                 = spaceshipTransporterengine
    65   spawnparticlesource    = "Orxonox/fairytwirl"
    76   spawnparticleduration  = 3
    … …  
    2120   angularDamping    = 0.9999999
    2221  >
     22    <engines>
     23      <MultiStateEngine position=" 0, 0, 0" template=spaceshipTransporterengine />
     24    </engines>
    2325    <attached>
    2426      <Model position="0,0,0" yaw=0 pitch=0 roll=0 scale=10 mesh="Transporter.mesh" />

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

    r7679 r8706  
    33   hudtemplate            = spaceshiphud
    44   camerapositiontemplate = spaceshipTransportercameras
    5    engine                 = spaceshipTransporterengine
    65   spawnparticlesource    = "Orxonox/fairytwirl"
    76   spawnparticleduration  = 3
    … …  
    2120   angularDamping    = 0.9999999
    2221  >
     22    <engines>
     23      <MultiStateEngine position=" 0, 0, 0" template=spaceshipTransporterengine />
     24    </engines>
    2325    <attached>
    2426      <Model position="0,0,0" yaw=0 pitch=0 roll=0 scale=10 mesh="Transporter.mesh" />
    … …  
    3840  </SpaceShip>
    3941</Template>
    40 
    41 <Template name=spaceshipTransportercameras defaults=0>
    42   <SpaceShip>
    43     <camerapositions>
    44       <CameraPosition position="0,90,350" drag=true mouselook=true />
    45       <CameraPosition position="0,150, 400" drag=true mouselook=true />
    46       <CameraPosition position="0,200,550" drag=true mouselook=true />
    47       <CameraPosition position="0,120,200" pitch="-80" drag=true mouselook=true />
    48     </camerapositions>
    49   </SpaceShip>
    50 </Template>
    51 
    52 <Template name=spaceshipTransporterengine baseclass=MultiStateEngine>
    53   <MultiStateEngine
    54    boostfactor    = 2
    55 
    56    speedfront     = 50
    57    speedback      =  10
    58    speedleftright =  10
    59    speedupdown    =  10
    60 
    61 
    62    accelerationfront     = 20
    63    accelerationbrake     = 20
    64    accelerationback      = 10
    65    accelerationleftright =  10
    66    accelerationupdown    =  10
    67   >
    68     <EffectContainer condition="idle">
    69     </EffectContainer>
    70     <EffectContainer condition="not idle">
    71 
    72     </EffectContainer>
    73     <EffectContainer condition="normal or brake">
    74 
    75     </EffectContainer>
    76     <EffectContainer condition="normal or boost">
    77       <Backlight mainstate=activity active=false scale=2 name=bltest position=" 22, -10, 87" colour="1, 0.7, 0.1, 1.0" width=10 length=3000 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
    78       <Backlight mainstate=activity active=false scale=2 name=bltest position="-22, -10, 87" colour="1, 0.7, 0.1, 1.0" width=10 length=3000 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
    79     </EffectContainer>
    80     <EffectContainer condition="boost">
    81       <Backlight mainstate=activity active=false scale=3 name=bltest position=" 22, -10, 87" colour="1, 0.7, 0.1, 0.7" width=25 length=2000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
    82       <Backlight mainstate=activity active=false scale=3 name=bltest position="-22, -10, 87" colour="1, 0.7, 0.1, 0.7" width=25 length=2000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
    83     </EffectContainer>
    84     <EffectContainer condition="brake">
    85       <FadingBillboard mainstate=activity active=false scale=2 position=" 22, -10, 87" colour="0.5, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
    86       <FadingBillboard mainstate=activity active=false scale=2 position="-22, -10, 87" colour="0.5, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
    87       <FadingBillboard mainstate=activity active=false scale=1 position="22, -10, 87" colour="1.0, 0.0, 0.0, 1.0" material="Flares/backlightflare" turnontime=0.5 turnofftime=0.5 />
    88       <FadingBillboard mainstate=activity active=false scale=1 position="-22, -10, 87" colour="1.0, 0.0, 0.0, 1.0" material="Flares/backlightflare" turnontime=0.5 turnofftime=0.5 />
    89     </EffectContainer>
    90   </MultiStateEngine>
    91 </Template>
Note: See TracChangeset for help on using the changeset viewer.