Changeset 6417 for code/trunk/data/levels/includes

Timestamp:

Dec 25, 2009, 10:23:58 PM (15 years ago)

Author:

rgrieder

Message:

Merged presentation2 branch back to trunk.
Major new features:

• Actual GUI with settings, etc.
• Improved space ship steering (human interaction)
• Rocket fire and more particle effects
• Advanced sound framework

Location:

code/trunk

Files:

• . (modified) (1 prop)
• data/levels/includes/weaponsettings3.oxi (modified) (4 diffs)
• data/levels/includes/weaponsettings_HXY.oxi (copied) (copied from code/branches/presentation2/data/levels/includes/weaponsettings_HXY.oxi)
• data/levels/includes/weaponsettings_Transporter.oxi (copied) (copied from code/branches/presentation2/data/levels/includes/weaponsettings_Transporter.oxi)
• data/levels/includes/weaponsettings_ghost.oxi (modified) (1 diff, 1 prop)

code/trunk/data/levels/includes/weaponsettings3.oxi

@@ -2 +2 @@
       <WeaponSlot position="-15.0,-1.5,0" />
       <WeaponSlot position=" 15.0,-1.5,0" />
-      <WeaponSlot position="  0.0, 0.0,0" />
+      <WeaponSlot position="    0,   0,0" />
     </weaponslots>
     <weaponsets>
       <WeaponSet firemode=0 />
       <WeaponSet firemode=1 />
+      <WeaponSet firemode=2 />
     </weaponsets>
     <weapons>
@@ -13 +14 @@
           <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
           <DefaultWeaponmodeLink firemode=1 weaponmode=1 />
+          <DefaultWeaponmodeLink firemode=2 weaponmode=2 />
         </links>
         <Weapon>
@@ -36 +38 @@
           <LightningGun mode=1 muzzleoffset="0,0,0" />
         </Weapon>
+        <Weapon>
+          <RocketFire mode=2 muzzleoffset="0,0,0" />
+        </Weapon>
       </WeaponPack>
       <WeaponPack>
@@ -41 +46 @@
           <DefaultWeaponmodeLink firemode=1 weaponmode=0 />
         </links>
-        <Weapon>
-          <!-- EnergyDrink mode=0 munitionpershot=0 delay=0  material="Flares/point_lensflare"muzzleoffset="2,-0.2,-1" / -->
-        </Weapon>
+        <!--Weapon>
+          <EnergyDrink mode=0 munitionpershot=0 delay=0  material="Flares/point_lensflare"muzzleoffset="2,-0.2,-1" />
+        </Weapon-->
       </WeaponPack>
     </weapons>

code/trunk/data/levels/includes/weaponsettings_ghost.oxi

@@ -16 +16 @@
           <HsW01 mode=0 munitionpershot=0 delay=0 material="Flares/point_lensflare" />
           <HsW01 mode=0 munitionpershot=0 delay=0.125 material="Flares/point_lensflare" muzzleoffset=" 0.5,0.6,1.7" />
+          <LightningGun mode=1 muzzleoffset="0,0,0" />
         </Weapon>
         <Weapon>
           <HsW01 mode=0 munitionpershot=0 delay=0  material="Flares/point_lensflare" />
           <HsW01 mode=0 munitionpershot=0 delay=0.125 material="Flares/point_lensflare" muzzleoffset="-0.5,0.6,1.7" />
+          <LightningGun mode=1 muzzleoffset="0,0,0" />
         </Weapon>
       </WeaponPack>