Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8924 for code


Ignore:
Timestamp:
Nov 8, 2011, 8:24:06 PM (13 years ago)
Author:
jo
Message:

Fixed the SpaceCruiser - no offset between the model's location and the worldentitie's location anymore.

Location:
code/branches/gamecontent
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • code/branches/gamecontent/data/levels/includes/weaponSettingsSpacecruiser.oxi

    r8904 r8924  
    11    <weaponslots>
    2       <WeaponSlot position="-20,-15,-108" />
    3       <WeaponSlot position=" 20,-15,-108" />
    4       <WeaponSlot position="  0, -7,-110" />
    5       <WeaponSlot position="-14,-31,-184" />
    6       <WeaponSlot position=" 14,-31,-184" />
    7       <WeaponSlot position="-34,-30,-169" />
    8       <WeaponSlot position=" 34,-30,-169" />
     2      <WeaponSlot position="-20,10,2" />
     3      <WeaponSlot position=" 20,10,2" />
     4      <WeaponSlot position="  0,18,0" />
     5      <WeaponSlot position="-14,-6,-74" />
     6      <WeaponSlot position=" 14,-6,-74" />
     7      <WeaponSlot position="-34,-5,-59" />
     8      <WeaponSlot position=" 34,-5,-59" />
    99    </weaponslots>
    1010    <weaponsets>
  • code/branches/gamecontent/data/levels/templates/spaceshipSpacecruiser.oxt

    r8922 r8924  
    4545    </engines>
    4646    <attached>
    47       <Model position="12,-30,-120" yaw=90 pitch=-90 roll=0 scale=6 mesh="spacecruiser.mesh" />
     47      <Model position="12,-5,-10" yaw=90 pitch=-90 roll=0 scale=6 mesh="spacecruiser.mesh" />
    4848      <!--Model mesh="cube.mesh" mass=10 position="0,-30,-108" scale3D="38,6,62" />
    4949      <Model mesh="cube.mesh" mass=10 position="0,-20,-108" scale3D="20,6,40" />
     
    5757    </attached>
    5858    <collisionShapes>
    59       <BoxCollisionShape position="0,-30,-108"     halfExtents="38,6,62" />
    60       <BoxCollisionShape position="0,-20,-108"     halfExtents="20,6,40" />
    61       <BoxCollisionShape position="-16,-35,-112"  halfExtents="15,5,57" roll=-14 pitch=3.5/>
    62       <BoxCollisionShape position="16,-35,-112"    halfExtents="15,5,57" roll=14 pitch=3.5/>
    63       <BoxCollisionShape position="19,-21.5,-108"  halfExtents="18,5,52" roll=-21 />
    64       <BoxCollisionShape position="-19,-21.5,-108" halfExtents="18,5,52" roll=21 />
    65       <BoxCollisionShape position="0,-21,-169"     halfExtents="18,1,16" pitch=-30 />
     59      <BoxCollisionShape position="0,-5,2"     halfExtents="38,6,62" />
     60      <BoxCollisionShape position="0,5,2"      halfExtents="20,6,40" />
     61      <BoxCollisionShape position="-16,-10,-2" halfExtents="15,5,57" roll=-14 pitch=3.5/>
     62      <BoxCollisionShape position="16,-10,-2"  halfExtents="15,5,57" roll=14 pitch=3.5/>
     63      <BoxCollisionShape position="19,3.5,2"   halfExtents="18,5,52" roll=-21 />
     64      <BoxCollisionShape position="-19,4.5,2"  halfExtents="18,5,52" roll=21 />
     65      <BoxCollisionShape position="0,4,-59"    halfExtents="18,1,16" pitch=-30/>
    6666
    6767    </collisionShapes>
     
    7575  <SpaceShip>
    7676    <camerapositions>
    77       <CameraPosition position="0,15,  60" drag=true mouselook=true />
    78       <CameraPosition position="0,30, 120" drag=true mouselook=true />
    79       <CameraPosition position="0,40, 350" drag=true mouselook=true />
     77      <CameraPosition position="0,40, 170" drag=true mouselook=true />
     78      <CameraPosition position="0,55, 230" drag=true mouselook=true />
     79      <CameraPosition position="0,65, 460" drag=true mouselook=true />
    8080    </camerapositions>
    8181  </SpaceShip>
     
    104104    </EffectContainer>
    105105    <EffectContainer condition="not idle">
    106       <FadingBillboard mainstate=activity active=false scale=0.1 position="20, -25, -40" colour="0.2, 0.65, 1.0, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
    107       <FadingBillboard mainstate=activity active=false scale=0.1 position="-20, -25, -40" colour="0.2, 0.65, 1.0, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
     106      <FadingBillboard mainstate=activity active=false scale=0.1 position="20,  0, 70" colour="0.2, 0.65, 1.0, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
     107      <FadingBillboard mainstate=activity active=false scale=0.1 position="-20, 0, 70" colour="0.2, 0.65, 1.0, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
    108108    </EffectContainer>
    109109    <EffectContainer condition="normal or brake">
     
    111111    </EffectContainer>
    112112    <EffectContainer condition="normal or boost">
    113       <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 20, -25, -40" colour="0.2, 0.65, 1.0, 1.0" width=15 length=1300 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
    114       <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-20, -25, -40" colour="0.2, 0.65, 1.0, 1.0" width=15 length=1300 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
     113      <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 20, 0, 70" colour="0.2, 0.65, 1.0, 1.0" width=15 length=1300 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
     114      <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-20, 0, 70" colour="0.2, 0.65, 1.0, 1.0" width=15 length=1300 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
    115115    </EffectContainer>
    116116    <EffectContainer condition="boost">
    117       <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 20, -25, -40" colour="0.6, 0.75, 0.8, 0.7" width=40 length=800 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
    118       <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-20, -25, -40" colour="0.6, 0.75, 0.8, 0.7" width=40 length=800 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
     117      <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 20, 0, 70" colour="0.6, 0.75, 0.8, 0.7" width=40 length=800 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
     118      <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-20, 0, 70" colour="0.6, 0.75, 0.8, 0.7" width=40 length=800 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
    119119    </EffectContainer>
    120120<!--    <EffectContainer condition="brake">
    121       <FadingBillboard mainstate=activity active=false scale=0.3 position=" 20, -25, -40" colour="0.5, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
    122       <FadingBillboard mainstate=activity active=false scale=0.3 position="-20, -25, -40" colour="0.5, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
    123       <FadingBillboard mainstate=activity active=false scale=0.15 position="20, -25, -40" colour="1.0, 0.0, 0.0, 1.0" material="Flares/backlightflare" turnontime=0.5 turnofftime=0.5 />
    124       <FadingBillboard mainstate=activity active=false scale=0.15 position="-20, -25, -40" colour="1.0, 0.0, 0.0, 1.0" material="Flares/backlightflare" turnontime=0.5 turnofftime=0.5 />
     121      <FadingBillboard mainstate=activity active=false scale=0.3 position=" 20,  0, 70" colour="0.5, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
     122      <FadingBillboard mainstate=activity active=false scale=0.3 position="-20,  0, 70" colour="0.5, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
     123      <FadingBillboard mainstate=activity active=false scale=0.15 position="20,  0, 70" colour="1.0, 0.0, 0.0, 1.0" material="Flares/backlightflare" turnontime=0.5 turnofftime=0.5 />
     124      <FadingBillboard mainstate=activity active=false scale=0.15 position="-20, 0, 70" colour="1.0, 0.0, 0.0, 1.0" material="Flares/backlightflare" turnontime=0.5 turnofftime=0.5 />
    125125    </EffectContainer>
    126126-->
  • code/branches/gamecontent/src/libraries/core/GUIManager.cc

    r8862 r8924  
    223223
    224224    GUIManager* GUIManager::singletonPtr_s = 0;
    225     /*static*/ const std::string GUIManager::defaultScheme_ = "TaharezGreen";
     225    /*static*/ const std::string GUIManager::defaultScheme_ = "Orxonox"; //TaharezGreen
    226226
    227227    SetConsoleCommand("showGUI", &GUIManager::showGUI).defaultValue(1, false).defaultValue(2, false);
Note: See TracChangeset for help on using the changeset viewer.