Changeset 9526 for code/trunk/data
- Timestamp:
- Feb 19, 2013, 10:25:42 AM (12 years ago)
- Location:
- code/trunk
- Files:
-
- 9 edited
- 10 copied
-
. (modified) (1 prop)
-
data/defaultConfig/keybindings.ini (modified) (2 diffs)
-
data/levels/bigshipPresentation.oxw (copied) (copied from code/branches/presentationHS12/data/levels/bigshipPresentation.oxw)
-
data/levels/collateralDamageDemo.oxw (copied) (copied from code/branches/presentationHS12/data/levels/collateralDamageDemo.oxw)
-
data/levels/gallery.oxw (modified) (1 diff)
-
data/levels/includes/weaponSettingsCollateral.oxi (copied) (copied from code/branches/presentationHS12/data/levels/includes/weaponSettingsCollateral.oxi)
-
data/levels/includes/weaponSettingsEscort.oxi (modified) (1 diff)
-
data/levels/includes/weaponSettingsTurret.oxi (copied) (copied from code/branches/presentationHS12/data/levels/includes/weaponSettingsTurret.oxi)
-
data/levels/includes/weaponSettingsbigship.oxi (copied) (copied from code/branches/presentationHS12/data/levels/includes/weaponSettingsbigship.oxi)
-
data/levels/pong.oxw (modified) (1 diff)
-
data/levels/presentationHS12.oxw (copied) (copied from code/branches/presentationHS12/data/levels/presentationHS12.oxw)
-
data/levels/templates/bigship.oxt (copied) (copied from code/branches/presentationHS12/data/levels/templates/bigship.oxt)
-
data/levels/templates/lodInformation.oxt (modified) (1 diff)
-
data/levels/templates/spaceshipCollateralDamage.oxt (copied) (copied from code/branches/presentationHS12/data/levels/templates/spaceshipCollateralDamage.oxt)
-
data/levels/templates/spaceshipEscort.oxt (modified) (4 diffs)
-
data/levels/templates/spaceshipTurret.oxt (copied) (copied from code/branches/presentationHS12/data/levels/templates/spaceshipTurret.oxt)
-
data/levels/turretTest.oxw (copied) (copied from code/branches/presentationHS12/data/levels/turretTest.oxw)
-
data/overlays/HUD.oxo (modified) (2 diffs)
-
data/overlays/HUDTemplates3.oxo (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
-
code/trunk/data/defaultConfig/keybindings.ini
r9016 r9526 55 55 KeyLeftBracket= 56 56 KeyLeftControl=mouseLook 57 KeyLeftShif t=57 KeyLeftShif 58 58 KeyLeftWindows= 59 59 KeyLessThan= … … 141 141 KeyWebSearch= 142 142 KeyWebStop= 143 KeyX= 143 KeyX="selectClosest" 144 144 KeyY= 145 145 KeyYen= 146 KeyZ= 146 KeyZ="selectNext" 147 147 148 148 [MouseButtons] -
code/trunk/data/levels/gallery.oxw
r9350 r9526 68 68 <Model position="0,20,-40" yaw="90" pitch="-90" roll="0" scale="2" mesh="LightningGun.mesh" /> 69 69 <Model position="0,40,-40" yaw="90" pitch="-90" roll="0" scale="2" mesh="LightningGun-s.mesh" /> 70 <Model position="0,60,-40" yaw="90" pitch="-90" roll="0" scale="1.5" mesh=" laserbeam.mesh" />70 <Model position="0,60,-40" yaw="90" pitch="-90" roll="0" scale="1.5" mesh="LaserBeam.mesh" /> 71 71 <Model position="0,80,-40" yaw="90" pitch="-90" roll="0" scale="2" mesh="rocket.mesh" /> 72 72 <Model position="0,-20,-40" yaw="90" pitch="-90" roll="0" scale="5" mesh="hs-w01.mesh" /> -
code/trunk/data/levels/includes/weaponSettingsEscort.oxi
r9416 r9526 14 14 </links> 15 15 <Weapon> 16 <attached> 17 <!--Model mesh="LightningGun.mesh" pitch="100" roll="90" yaw="90" position="0,0,0" /> 18 <Model mesh="LightningGun-s.mesh" pitch="78" roll="90" yaw="90" position="0.2,-1.3,0" /> 19 <Model mesh="hs-w01_reduced.mesh" roll="90" pitch="-76" yaw="-90" position="-1.5,1,0.3" scale=0.6 /--> 20 </attached> 21 <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" /> 22 <HsW01 mode=0 munitionpershot=0 delay=0 damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" /> 23 <LightningGun mode=1 muzzleoffset="0,0,0" damage=3.14159 shielddamage=20 /> 16 <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" projectileMesh="LaserBeam.mesh" /> 17 <!--HsW01 mode=0 munitionpershot=0 delay=0 damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" projectileMesh="LaserBeam.mesh" /--> 24 18 </Weapon> 25 19 <Weapon> 26 <attached> 27 <!--Model mesh="LightningGun.mesh" pitch="103" roll="90" yaw="90" position="0,0,0" /> 28 <Model mesh="LightningGun-s.mesh" pitch="103" roll="90" yaw="90" position="0.2,-1.35,0" /> 29 <Model mesh="hs-w01_reduced.mesh" roll="90" pitch="-104" yaw="-90" position="0,1.3,0.3" scale=0.6 /--> 30 </attached> 31 <HsW01 mode=0 munitionpershot=0 delay=0 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" /> 32 <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-0.1, 1.6, -2.0" /> 33 <LightningGun mode=1 muzzleoffset="0,0,0" damage=23 /> 20 <HsW01 mode=0 munitionpershot=0 delay=0 damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" projectileMesh="LaserBeam.mesh" /> 21 <!--HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-0.1, 1.6, -2.0" projectileMesh="LaserBeam.mesh" /--> 34 22 </Weapon> 35 23 </WeaponPack> -
code/trunk/data/levels/pong.oxw
r9348 r9526 93 93 <!-- TODO: Create a Pong Score Sound and include it here. 94 94 This WorldSound works, but doesn't make sense, since it is played together with ambient/moodDependedDirectory/Ganymede.ogg --> 95 <!--WorldSound name="scoreSound" position="0,0,0" source=" ambient/default/Earth.ogg" >95 <!--WorldSound name="scoreSound" position="0,0,0" source="sounds/PongScore_cut.ogg" > 96 96 <events> 97 97 <play> -
code/trunk/data/levels/templates/lodInformation.oxt
r8706 r9526 15 15 <MeshLodInformation mesh=CuboidLandingZone.mesh enabled=false/> 16 16 <MeshLodInformation mesh=HydroHarvester.mesh enabled=false /> 17 <MeshLodInformation mesh=turretHead.mesh enabled=false /> 18 <MeshLodInformation mesh=LaserBeam.mesh enabled=false/> 17 19 18 20 <!-- disable LOD for some debris meshes which caused a crash (fixed in Ogre 1.7.3) --> -
code/trunk/data/levels/templates/spaceshipEscort.oxt
r9416 r9526 2 2 <SpaceShip 3 3 hudtemplate = spaceshiphud 4 camerapositiontemplate = spaceship assffcameras4 camerapositiontemplate = spaceshipescortcameras 5 5 spawnparticlesource = "Orxonox/fairytwirl" 6 6 spawnparticleduration = 3 … … 39 39 > 40 40 <engines> 41 <MultiStateEngine position=" 7.6, 0, 6" template=spaceship assffengine />42 <MultiStateEngine position="-7.6, 0, 0" template=spaceship assffengine />41 <MultiStateEngine position=" 7.6, 0, 6" template=spaceshipescortengine /> 42 <MultiStateEngine position="-7.6, 0, 0" template=spaceshipescortengine /> 43 43 </engines> 44 44 <attached> … … 62 62 </Template> 63 63 64 <Template name=spaceship assffcameras defaults=0>64 <Template name=spaceshipescortcameras defaults=0> 65 65 <SpaceShip> 66 66 <camerapositions> 67 <CameraPosition position="0,1 3, 40" drag=true mouselook=true />68 <CameraPosition position="0,20, 80" drag=true mouselook=true />67 <CameraPosition position="0,15, 60" drag=true mouselook=true /> 68 <CameraPosition position="0,20, 90" drag=true mouselook=true /> 69 69 <CameraPosition position="0,30,120" drag=true mouselook=true /> 70 70 </camerapositions> … … 72 72 </Template> 73 73 74 <Template name=spaceship assffengine baseclass=MultiStateEngine>74 <Template name=spaceshipescortengine baseclass=MultiStateEngine> 75 75 <MultiStateEngine 76 76 boostfactor = 2.2 -
code/trunk/data/overlays/HUD.oxo
r7679 r9526 52 52 value = 0 53 53 > 54 <BarColou r position = 0.7 colour = "0.2,0.7,0.2" />54 <BarColounar position = 0.7 colour = "0.2,0.7,0.2" /> 55 55 <BarColour position = 0.4 colour = "0.7,0.5,0.2" /> 56 56 <BarColour position = 0.1 colour = "0.7,0.2,0.2" /> … … 63 63 textSize = 0.05 64 64 navMarkerSize = 0.03 65 aimMarkerSize = 0.0 465 aimMarkerSize = 0.02 66 66 /> 67 67 -
code/trunk/data/overlays/HUDTemplates3.oxo
r9016 r9526 105 105 textsize = 0.05 106 106 navMarkerSize = 0.03 107 aimMarkerSize = 0.0 4107 aimMarkerSize = 0.02 108 108 /> 109 109
Note: See TracChangeset
for help on using the changeset viewer.
