[Orxonox-commit 5960] r10619 - in code/branches/presentationFS15merge: data/gui/scripts data/levels data/levels/includes data/levels/templates data/particle src/modules/towerdefense src/modules/weapons/munitions src/modules/weapons/projectiles src/modules/weapons/weaponmodes
landauf at orxonox.net
landauf at orxonox.net
Sun Oct 4 14:30:27 CEST 2015
Author: landauf
Date: 2015-10-04 14:30:26 +0200 (Sun, 04 Oct 2015)
New Revision: 10619
Modified:
code/branches/presentationFS15merge/data/gui/scripts/presentation.lua
code/branches/presentationFS15merge/data/levels/clangenb.oxw
code/branches/presentationFS15merge/data/levels/includes/weaponSettingsFS15.oxi
code/branches/presentationFS15merge/data/levels/includes/weaponSettingsHeartAttack.oxi
code/branches/presentationFS15merge/data/levels/includes/weaponSettingsRing.oxi
code/branches/presentationFS15merge/data/levels/presentationFS15.oxw
code/branches/presentationFS15merge/data/levels/simone.oxw
code/branches/presentationFS15merge/data/levels/templates/orbStation.oxt
code/branches/presentationFS15merge/data/levels/templates/spaceshipFS15.oxt
code/branches/presentationFS15merge/data/levels/templates/spaceshipHeartAttack.oxt
code/branches/presentationFS15merge/data/levels/templates/spaceshipRing.oxt
code/branches/presentationFS15merge/data/levels/templates/towerdefensetower.oxt
code/branches/presentationFS15merge/data/particle/FieldExplosion.particle
code/branches/presentationFS15merge/data/particle/GravityBombField.particle
code/branches/presentationFS15merge/data/particle/orxonox_explosionAfterglow.particle
code/branches/presentationFS15merge/data/particle/orxonox_explosionFlame.particle
code/branches/presentationFS15merge/data/particle/orxonox_explosionFlame2.particle
code/branches/presentationFS15merge/data/particle/orxonox_explosionFlash.particle
code/branches/presentationFS15merge/data/particle/orxonox_explosionFlash2.particle
code/branches/presentationFS15merge/data/particle/orxonox_explosionShockwave.particle
code/branches/presentationFS15merge/data/particle/orxonox_explosionShockwave2.particle
code/branches/presentationFS15merge/data/particle/orxonox_explosionSparks.particle
code/branches/presentationFS15merge/data/particle/orxonox_explosionSparks2.particle
code/branches/presentationFS15merge/data/particle/orxonox_explosionStreak1.particle
code/branches/presentationFS15merge/data/particle/orxonox_explosionStreak2.particle
code/branches/presentationFS15merge/src/modules/towerdefense/TowerDefenseSelecter.cc
code/branches/presentationFS15merge/src/modules/towerdefense/TowerDefenseSelecter.h
code/branches/presentationFS15merge/src/modules/weapons/munitions/GravityBombMunition.cc
code/branches/presentationFS15merge/src/modules/weapons/munitions/GravityBombMunition.h
code/branches/presentationFS15merge/src/modules/weapons/projectiles/GravityBomb.cc
code/branches/presentationFS15merge/src/modules/weapons/projectiles/GravityBomb.h
code/branches/presentationFS15merge/src/modules/weapons/projectiles/GravityBombField.cc
code/branches/presentationFS15merge/src/modules/weapons/projectiles/GravityBombField.h
code/branches/presentationFS15merge/src/modules/weapons/projectiles/RocketOld.cc
code/branches/presentationFS15merge/src/modules/weapons/projectiles/RocketOld.h
code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/GravityBombFire.cc
code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/GravityBombFire.h
code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/RocketFireOld.cc
code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/RocketFireOld.h
Log:
eol-style native
Property changes on: code/branches/presentationFS15merge/data/gui/scripts/presentation.lua
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentationFS15merge/data/levels/clangenb.oxw
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentationFS15merge/data/levels/includes/weaponSettingsFS15.oxi
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentationFS15merge/data/levels/includes/weaponSettingsHeartAttack.oxi
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/presentationFS15merge/data/levels/includes/weaponSettingsRing.oxi
===================================================================
--- code/branches/presentationFS15merge/data/levels/includes/weaponSettingsRing.oxi 2015-10-04 12:23:33 UTC (rev 10618)
+++ code/branches/presentationFS15merge/data/levels/includes/weaponSettingsRing.oxi 2015-10-04 12:30:26 UTC (rev 10619)
@@ -1,22 +1,22 @@
-<weaponslots>
- <WeaponSlot position="11,0,-7" />
- <WeaponSlot position="-11,0,-7" />
-</weaponslots>
-<weaponsets>
- <WeaponSet firemode=0 />
- <WeaponSet firemode=1 />
-</weaponsets>
-<weapons>
- <WeaponPack>
- <links>
- <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
- <DefaultWeaponmodeLink firemode=1 weaponmode=1 />
- </links>
- <Weapon>
- <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.4,-3" projectileMesh="LaserBeam2.mesh" />
- </Weapon>
- <Weapon>
- <HsW01 mode=0 munitionpershot=0 delay=0 damage=9.3 material="Flares/point_lensflare" muzzleoffset="0.1, 1.4, -3" projectileMesh="LaserBeam2.mesh" />
- </Weapon>
- </WeaponPack>
-</weapons>
+<weaponslots>
+ <WeaponSlot position="11,0,-7" />
+ <WeaponSlot position="-11,0,-7" />
+</weaponslots>
+<weaponsets>
+ <WeaponSet firemode=0 />
+ <WeaponSet firemode=1 />
+</weaponsets>
+<weapons>
+ <WeaponPack>
+ <links>
+ <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
+ <DefaultWeaponmodeLink firemode=1 weaponmode=1 />
+ </links>
+ <Weapon>
+ <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.4,-3" projectileMesh="LaserBeam2.mesh" />
+ </Weapon>
+ <Weapon>
+ <HsW01 mode=0 munitionpershot=0 delay=0 damage=9.3 material="Flares/point_lensflare" muzzleoffset="0.1, 1.4, -3" projectileMesh="LaserBeam2.mesh" />
+ </Weapon>
+ </WeaponPack>
+</weapons>
Property changes on: code/branches/presentationFS15merge/data/levels/includes/weaponSettingsRing.oxi
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentationFS15merge/data/levels/presentationFS15.oxw
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/presentationFS15merge/data/levels/simone.oxw
===================================================================
--- code/branches/presentationFS15merge/data/levels/simone.oxw 2015-10-04 12:23:33 UTC (rev 10618)
+++ code/branches/presentationFS15merge/data/levels/simone.oxw 2015-10-04 12:30:26 UTC (rev 10619)
@@ -1,37 +1,37 @@
-<LevelInfo
- name = "Simone"
- description = "A level with absolutely nothing in it."
- tags = "test"
- screenshot = "emptylevel.png"
-/>
-
-<?lua
- include("stats.oxo")
- include("HUDTemplates3.oxo")
- include("templates/lodInformation.oxt")
-?>
-
-<?lua
- include("templates/spaceshipAssff2.oxt")
- include("templates/spaceshipPirate.oxt")
- include("templates/spaceshipRing.oxt")
-?>
-
-<Level>
- <templates>
- <Template link=lodtemplate_default />
- </templates>
- <?lua include("includes/notifications.oxi") ?>
-
- <Scene
- ambientlight = "0.8, 0.8, 0.8"
- skybox = "Orxonox/Starbox"
- >
-
- <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
- <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipring />
- <Model position="0,0,0" mesh="ship.mesh" scale="3"/>
-
- </Scene>
-</Level>
-
+<LevelInfo
+ name = "Simone"
+ description = "A level with absolutely nothing in it."
+ tags = "test"
+ screenshot = "emptylevel.png"
+/>
+
+<?lua
+ include("stats.oxo")
+ include("HUDTemplates3.oxo")
+ include("templates/lodInformation.oxt")
+?>
+
+<?lua
+ include("templates/spaceshipAssff2.oxt")
+ include("templates/spaceshipPirate.oxt")
+ include("templates/spaceshipRing.oxt")
+?>
+
+<Level>
+ <templates>
+ <Template link=lodtemplate_default />
+ </templates>
+ <?lua include("includes/notifications.oxi") ?>
+
+ <Scene
+ ambientlight = "0.8, 0.8, 0.8"
+ skybox = "Orxonox/Starbox"
+ >
+
+ <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
+ <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipring />
+ <Model position="0,0,0" mesh="ship.mesh" scale="3"/>
+
+ </Scene>
+</Level>
+
Property changes on: code/branches/presentationFS15merge/data/levels/simone.oxw
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentationFS15merge/data/levels/templates/orbStation.oxt
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentationFS15merge/data/levels/templates/spaceshipFS15.oxt
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentationFS15merge/data/levels/templates/spaceshipHeartAttack.oxt
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/presentationFS15merge/data/levels/templates/spaceshipRing.oxt
===================================================================
--- code/branches/presentationFS15merge/data/levels/templates/spaceshipRing.oxt 2015-10-04 12:23:33 UTC (rev 10618)
+++ code/branches/presentationFS15merge/data/levels/templates/spaceshipRing.oxt 2015-10-04 12:30:26 UTC (rev 10619)
@@ -1,110 +1,110 @@
-<Template name=spaceshipring>
- <SpaceShip
- hudtemplate = spaceshiphud
- camerapositiontemplate = spaceshipringcameras
- spawnparticlesource = "Orxonox/fairytwirl"
- spawnparticleduration = 3
- explosionchunks = 4
-
- health = 80
- maxhealth = 200
- initialhealth = 80
-
- shieldhealth = 35
- initialshieldhealth = 35
- maxshieldhealth = 60
- shieldabsorption = 0.9
- reloadrate = 1
- reloadwaittime = 1
-
- primaryThrust = 150
- auxilaryThrust = 30
- rotationThrust = 50
-
- lift = 1;
- stallSpeed = 220;
-
- boostPower = 20
- boostPowerRate = 1
- boostRate = 5
- boostCooldownDuration = 10
-
- shakeFrequency = 15
- shakeAmplitude = 6
-
- collisionType = "dynamic"
- mass = 80
- linearDamping = 0.7
- angularDamping = 0.9999999
- >
- <engines>
- <MultiStateEngine position=" 7.6, 0, 0" template=spaceshipringengine />
- <MultiStateEngine position="-7.6, 0, 0" template=spaceshipringengine />
- </engines>
- <attached>
- <Model position="0,0,0" yaw=90 pitch=0 roll=0 scale=4 mesh="ship.mesh" />
- <Model position="11,1,-9" yaw=-90 pitch=0 roll=90 scale=0.15 mesh="ringWeapon.mesh" />
- <Model position="-11,1,-9" yaw=-90 pitch=0 roll=90 scale=0.15 mesh="ringWeapon.mesh" />
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0 ,0 , 3" halfExtents="10, 4,8" />
- <BoxCollisionShape position="12.6 ,-2, 3" halfExtents="2.8,2.8,11"/>
- <BoxCollisionShape position="-12.6,-2, 3" halfExtents="2.8,2.8,11"/>
- <BoxCollisionShape position="0, 0,-12" halfExtents="4 , 4 ,7" />
- </collisionShapes>
-<?lua
- include("../includes/weaponSettingsRing.oxi")
-?>
- </SpaceShip>
-</Template>
-
-<Template name=spaceshipringcameras defaults=0>
- <SpaceShip>
- <camerapositions>
- <CameraPosition position="0,15, 60" drag=true mouselook=true />
- <CameraPosition position="0,20, 90" drag=true mouselook=true />
- <CameraPosition position="0,30,120" drag=true mouselook=true />
- </camerapositions>
- </SpaceShip>
-</Template>
-
-<Template name=spaceshipringengine baseclass=MultiStateEngine>
- <MultiStateEngine
- boostfactor = 2.2
-
- speedfront = 200
- speedback = 70
- speedleftright = 70
- speedupdown = 70
-
- defEngineSndNormal = "sounds/Engine_low.ogg"
- defEngineSndBoost = "sounds/Engine_high.ogg"
-
- accelerationfront = 700
- accelerationbrake = 700
- accelerationback = 125
- accelerationleftright = 125
- accelerationupdown = 125
- >
- <EffectContainer condition="idle">
- <WorldSound mainstate="activity" source="sounds/Engine_idle.ogg" looping=1 active=false/>
- </EffectContainer>
- <EffectContainer condition="not idle">
- <FadingBillboard mainstate=activity active=false scale=0.09 position="13, 0, 16" colour="0.2, 1.0, 0.65, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
- <FadingBillboard mainstate=activity active=false scale=0.09 position="-13, 0, 16" colour="0.2, 1.0, 0.65, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
- </EffectContainer>
- <EffectContainer condition="normal or brake">
-
- </EffectContainer>
- <EffectContainer condition="normal or boost">
- <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 0, 2, 16" colour="0.2, 1.0, 0.65, 1.0" width=25 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
-<Backlight mainstate=activity active=false scale=0.33 name=bltest position=" 13, 0, 16" colour="0.2, 1.0, 0.65, 1.0" width=20 length=1000
- lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
-<Backlight mainstate=activity active=false scale=0.33 name=bltest position=" -13, 0, 16" colour="0.2, 1.0, 0.65, 1.0" width=20 length=1000 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
- </EffectContainer>
- <EffectContainer condition="boost">
- <Backlight mainstate=activity active=false scale=0.33 name=bltest position=" 0, 2, 16" colour="0.6, 0.8, 0.75, 0.7" width=35 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
- </EffectContainer>
-
- </MultiStateEngine>
-</Template>
+<Template name=spaceshipring>
+ <SpaceShip
+ hudtemplate = spaceshiphud
+ camerapositiontemplate = spaceshipringcameras
+ spawnparticlesource = "Orxonox/fairytwirl"
+ spawnparticleduration = 3
+ explosionchunks = 4
+
+ health = 80
+ maxhealth = 200
+ initialhealth = 80
+
+ shieldhealth = 35
+ initialshieldhealth = 35
+ maxshieldhealth = 60
+ shieldabsorption = 0.9
+ reloadrate = 1
+ reloadwaittime = 1
+
+ primaryThrust = 150
+ auxilaryThrust = 30
+ rotationThrust = 50
+
+ lift = 1;
+ stallSpeed = 220;
+
+ boostPower = 20
+ boostPowerRate = 1
+ boostRate = 5
+ boostCooldownDuration = 10
+
+ shakeFrequency = 15
+ shakeAmplitude = 6
+
+ collisionType = "dynamic"
+ mass = 80
+ linearDamping = 0.7
+ angularDamping = 0.9999999
+ >
+ <engines>
+ <MultiStateEngine position=" 7.6, 0, 0" template=spaceshipringengine />
+ <MultiStateEngine position="-7.6, 0, 0" template=spaceshipringengine />
+ </engines>
+ <attached>
+ <Model position="0,0,0" yaw=90 pitch=0 roll=0 scale=4 mesh="ship.mesh" />
+ <Model position="11,1,-9" yaw=-90 pitch=0 roll=90 scale=0.15 mesh="ringWeapon.mesh" />
+ <Model position="-11,1,-9" yaw=-90 pitch=0 roll=90 scale=0.15 mesh="ringWeapon.mesh" />
+ </attached>
+ <collisionShapes>
+ <BoxCollisionShape position="0 ,0 , 3" halfExtents="10, 4,8" />
+ <BoxCollisionShape position="12.6 ,-2, 3" halfExtents="2.8,2.8,11"/>
+ <BoxCollisionShape position="-12.6,-2, 3" halfExtents="2.8,2.8,11"/>
+ <BoxCollisionShape position="0, 0,-12" halfExtents="4 , 4 ,7" />
+ </collisionShapes>
+<?lua
+ include("../includes/weaponSettingsRing.oxi")
+?>
+ </SpaceShip>
+</Template>
+
+<Template name=spaceshipringcameras defaults=0>
+ <SpaceShip>
+ <camerapositions>
+ <CameraPosition position="0,15, 60" drag=true mouselook=true />
+ <CameraPosition position="0,20, 90" drag=true mouselook=true />
+ <CameraPosition position="0,30,120" drag=true mouselook=true />
+ </camerapositions>
+ </SpaceShip>
+</Template>
+
+<Template name=spaceshipringengine baseclass=MultiStateEngine>
+ <MultiStateEngine
+ boostfactor = 2.2
+
+ speedfront = 200
+ speedback = 70
+ speedleftright = 70
+ speedupdown = 70
+
+ defEngineSndNormal = "sounds/Engine_low.ogg"
+ defEngineSndBoost = "sounds/Engine_high.ogg"
+
+ accelerationfront = 700
+ accelerationbrake = 700
+ accelerationback = 125
+ accelerationleftright = 125
+ accelerationupdown = 125
+ >
+ <EffectContainer condition="idle">
+ <WorldSound mainstate="activity" source="sounds/Engine_idle.ogg" looping=1 active=false/>
+ </EffectContainer>
+ <EffectContainer condition="not idle">
+ <FadingBillboard mainstate=activity active=false scale=0.09 position="13, 0, 16" colour="0.2, 1.0, 0.65, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
+ <FadingBillboard mainstate=activity active=false scale=0.09 position="-13, 0, 16" colour="0.2, 1.0, 0.65, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
+ </EffectContainer>
+ <EffectContainer condition="normal or brake">
+
+ </EffectContainer>
+ <EffectContainer condition="normal or boost">
+ <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 0, 2, 16" colour="0.2, 1.0, 0.65, 1.0" width=25 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
+<Backlight mainstate=activity active=false scale=0.33 name=bltest position=" 13, 0, 16" colour="0.2, 1.0, 0.65, 1.0" width=20 length=1000
+ lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
+<Backlight mainstate=activity active=false scale=0.33 name=bltest position=" -13, 0, 16" colour="0.2, 1.0, 0.65, 1.0" width=20 length=1000 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
+ </EffectContainer>
+ <EffectContainer condition="boost">
+ <Backlight mainstate=activity active=false scale=0.33 name=bltest position=" 0, 2, 16" colour="0.6, 0.8, 0.75, 0.7" width=35 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
+ </EffectContainer>
+
+ </MultiStateEngine>
+</Template>
Property changes on: code/branches/presentationFS15merge/data/levels/templates/spaceshipRing.oxt
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentationFS15merge/data/levels/templates/towerdefensetower.oxt
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/presentationFS15merge/data/particle/FieldExplosion.particle
===================================================================
--- code/branches/presentationFS15merge/data/particle/FieldExplosion.particle 2015-10-04 12:23:33 UTC (rev 10618)
+++ code/branches/presentationFS15merge/data/particle/FieldExplosion.particle 2015-10-04 12:30:26 UTC (rev 10619)
@@ -1,84 +1,84 @@
-particle_system Orxonox/FieldExplosion
-
-{
- material PE/lensflare
- particle_width 152.940002441406
- particle_height 154.119995117188
- quota 2000
- cull_each false
- sorted false
- local_space false
- iteration_interval 0.0
- nonvisible_update_timeout 0.0
- billboard_type point
- billboard_origin center
- billboard_rotation_type texcoord
- point_rendering false
- accurate_facing false
-
- emitter Point
- {
- position 0.0 0.0 0.0
- direction 1.0 0.0 0.0
- angle 0.0
- emission_rate 200.0
- velocity_min -1000.0
- velocity_max 1000.0
- time_to_live_min 2.0
- time_to_live_max 4.0
- duration_min 0.0
- duration_max 0.0
- repeat_delay_min 0.0
- repeat_delay_max 0.0
- colour_range_start 1 1 1 1
- colour_range_end 0.666667 0 0 1
- }
-
- emitter Point
- {
- position 0.0 0.0 0.0
- direction 0.0 0.0 1.0
- angle 0.0
- emission_rate 200.0
- velocity_min -1000.0
- velocity_max 1000.0
- time_to_live_min 2.0
- time_to_live_max 4.0
- duration_min 0.0
- duration_max 0.0
- repeat_delay_min 0.0
- repeat_delay_max 0.0
- colour_range_start 1 1 1 1
- colour_range_end 0.333333 0 1 1
- }
-
- emitter Point
- {
- position 0.0 0.0 0.0
- direction 0.0 1.0 0.0
- angle 0.0
- emission_rate 200.0
- velocity_min -1000.0
- velocity_max 1000.0
- time_to_live_min 2.0
- time_to_live_max 4.0
- duration_min 0.0
- duration_max 0.0
- repeat_delay_min 0.0
- repeat_delay_max 0.0
- colour_range_start 1 1 1 1
- colour_range_end 0 1 0.498039 1
- }
-
- affector LinearForce
- {
- force_vector 0.0 -45.62 0.0
- force_application add
- }
-
- affector Scaler
- {
- rate 16.47
- }
-
-}
+particle_system Orxonox/FieldExplosion
+
+{
+ material PE/lensflare
+ particle_width 152.940002441406
+ particle_height 154.119995117188
+ quota 2000
+ cull_each false
+ sorted false
+ local_space false
+ iteration_interval 0.0
+ nonvisible_update_timeout 0.0
+ billboard_type point
+ billboard_origin center
+ billboard_rotation_type texcoord
+ point_rendering false
+ accurate_facing false
+
+ emitter Point
+ {
+ position 0.0 0.0 0.0
+ direction 1.0 0.0 0.0
+ angle 0.0
+ emission_rate 200.0
+ velocity_min -1000.0
+ velocity_max 1000.0
+ time_to_live_min 2.0
+ time_to_live_max 4.0
+ duration_min 0.0
+ duration_max 0.0
+ repeat_delay_min 0.0
+ repeat_delay_max 0.0
+ colour_range_start 1 1 1 1
+ colour_range_end 0.666667 0 0 1
+ }
+
+ emitter Point
+ {
+ position 0.0 0.0 0.0
+ direction 0.0 0.0 1.0
+ angle 0.0
+ emission_rate 200.0
+ velocity_min -1000.0
+ velocity_max 1000.0
+ time_to_live_min 2.0
+ time_to_live_max 4.0
+ duration_min 0.0
+ duration_max 0.0
+ repeat_delay_min 0.0
+ repeat_delay_max 0.0
+ colour_range_start 1 1 1 1
+ colour_range_end 0.333333 0 1 1
+ }
+
+ emitter Point
+ {
+ position 0.0 0.0 0.0
+ direction 0.0 1.0 0.0
+ angle 0.0
+ emission_rate 200.0
+ velocity_min -1000.0
+ velocity_max 1000.0
+ time_to_live_min 2.0
+ time_to_live_max 4.0
+ duration_min 0.0
+ duration_max 0.0
+ repeat_delay_min 0.0
+ repeat_delay_max 0.0
+ colour_range_start 1 1 1 1
+ colour_range_end 0 1 0.498039 1
+ }
+
+ affector LinearForce
+ {
+ force_vector 0.0 -45.62 0.0
+ force_application add
+ }
+
+ affector Scaler
+ {
+ rate 16.47
+ }
+
+}
Property changes on: code/branches/presentationFS15merge/data/particle/FieldExplosion.particle
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentationFS15merge/data/particle/GravityBombField.particle
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/presentationFS15merge/data/particle/orxonox_explosionAfterglow.particle
===================================================================
--- code/branches/presentationFS15merge/data/particle/orxonox_explosionAfterglow.particle 2015-10-04 12:23:33 UTC (rev 10618)
+++ code/branches/presentationFS15merge/data/particle/orxonox_explosionAfterglow.particle 2015-10-04 12:30:26 UTC (rev 10619)
@@ -1,47 +1,47 @@
-
-particle_system orxonox/explosion_afterglow
-{
- quota 200
- material PE/Flare
- particle_width 40
- particle_height 40
- cull_each false
- renderer billboard
- billboard_type oriented_self
-
- emitter Point
- {
- angle 180
- colour 0.664063 0.917969 0.925781 1
- colour_range_start 0.664063 0.917969 0.925781 1
- colour_range_end 0.0820313 0.757813 0.980469 1
- direction 0 1 0
- emission_rate 700
- position 0 0 0
- velocity 20
- velocity_min 20
- velocity_max 75
- time_to_live 0.2
- time_to_live_min 0.2
- time_to_live_max 5
- duration 0.1
- duration_min 0.1
- duration_max 0.1
- repeat_delay 20
- repeat_delay_min 20
- repeat_delay_max 20
- }
-
- affector ColourFader
- {
- red -0.7273
- green -0.7049
- blue -0.6216
- alpha 0
- }
-
- affector Scaler
- {
- rate 20
- }
-}
+
+particle_system orxonox/explosion_afterglow
+{
+ quota 200
+ material PE/Flare
+ particle_width 40
+ particle_height 40
+ cull_each false
+ renderer billboard
+ billboard_type oriented_self
+
+ emitter Point
+ {
+ angle 180
+ colour 0.664063 0.917969 0.925781 1
+ colour_range_start 0.664063 0.917969 0.925781 1
+ colour_range_end 0.0820313 0.757813 0.980469 1
+ direction 0 1 0
+ emission_rate 700
+ position 0 0 0
+ velocity 20
+ velocity_min 20
+ velocity_max 75
+ time_to_live 0.2
+ time_to_live_min 0.2
+ time_to_live_max 5
+ duration 0.1
+ duration_min 0.1
+ duration_max 0.1
+ repeat_delay 20
+ repeat_delay_min 20
+ repeat_delay_max 20
+ }
+
+ affector ColourFader
+ {
+ red -0.7273
+ green -0.7049
+ blue -0.6216
+ alpha 0
+ }
+
+ affector Scaler
+ {
+ rate 20
+ }
+}
Property changes on: code/branches/presentationFS15merge/data/particle/orxonox_explosionAfterglow.particle
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/presentationFS15merge/data/particle/orxonox_explosionFlame.particle
===================================================================
--- code/branches/presentationFS15merge/data/particle/orxonox_explosionFlame.particle 2015-10-04 12:23:33 UTC (rev 10618)
+++ code/branches/presentationFS15merge/data/particle/orxonox_explosionFlame.particle 2015-10-04 12:30:26 UTC (rev 10619)
@@ -1,58 +1,58 @@
-
-particle_system orxonox/explosion_flame
-{
- quota 500
- material PE/bigFlame
- particle_width 20.52
- particle_height 20.25
- cull_each false
- renderer billboard
- billboard_type point
-
- emitter Box
- {
- angle 180
- colour 1 0.533333 0.0631577 1
- colour_range_start 1 0.533333 0.0631577 1
- colour_range_end 0.441667 0 0 1
- direction 1 0 0
- emission_rate 2000
- position 0 0 0
- velocity 30
- velocity_min 30
- velocity_max 80
- time_to_live 0.2
- time_to_live_min 0.2
- time_to_live_max 3
- duration 0.1
- duration_min 0.1
- duration_max 0.1
- repeat_delay 20
- repeat_delay_min 20
- repeat_delay_max 20
- width 2
- height 2
- depth 2
- }
-
- affector Scaler
- {
- rate 20
- }
-
- affector ColourFader
- {
- red -1
- green -1
- blue -1
- alpha -1
- }
-
- affector Rotator
- {
- rotation_speed_range_start -360
- rotation_speed_range_end 360
- rotation_range_start 0
- rotation_range_end 360
- }
+
+particle_system orxonox/explosion_flame
+{
+ quota 500
+ material PE/bigFlame
+ particle_width 20.52
+ particle_height 20.25
+ cull_each false
+ renderer billboard
+ billboard_type point
+
+ emitter Box
+ {
+ angle 180
+ colour 1 0.533333 0.0631577 1
+ colour_range_start 1 0.533333 0.0631577 1
+ colour_range_end 0.441667 0 0 1
+ direction 1 0 0
+ emission_rate 2000
+ position 0 0 0
+ velocity 30
+ velocity_min 30
+ velocity_max 80
+ time_to_live 0.2
+ time_to_live_min 0.2
+ time_to_live_max 3
+ duration 0.1
+ duration_min 0.1
+ duration_max 0.1
+ repeat_delay 20
+ repeat_delay_min 20
+ repeat_delay_max 20
+ width 2
+ height 2
+ depth 2
+ }
+
+ affector Scaler
+ {
+ rate 20
+ }
+
+ affector ColourFader
+ {
+ red -1
+ green -1
+ blue -1
+ alpha -1
+ }
+
+ affector Rotator
+ {
+ rotation_speed_range_start -360
+ rotation_speed_range_end 360
+ rotation_range_start 0
+ rotation_range_end 360
+ }
}
\ No newline at end of file
Property changes on: code/branches/presentationFS15merge/data/particle/orxonox_explosionFlame.particle
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/presentationFS15merge/data/particle/orxonox_explosionFlame2.particle
===================================================================
--- code/branches/presentationFS15merge/data/particle/orxonox_explosionFlame2.particle 2015-10-04 12:23:33 UTC (rev 10618)
+++ code/branches/presentationFS15merge/data/particle/orxonox_explosionFlame2.particle 2015-10-04 12:30:26 UTC (rev 10619)
@@ -1,58 +1,58 @@
-
-particle_system orxonox/explosion_flame2
-{
- quota 500
- material PE/bigFlame
- particle_width 20.52
- particle_height 20.25
- cull_each false
- renderer billboard
- billboard_type point
-
- emitter Box
- {
- angle 180
- colour 1 0.566667 0.5 1
- colour_range_start 1 0.566667 0.5 1
- colour_range_end 1 0.566667 0.5 1
- direction 1 0 0
- emission_rate 2000
- position 0 0 0
- velocity 30
- velocity_min 30
- velocity_max 80
- time_to_live 1
- time_to_live_min 1
- time_to_live_max 3
- duration 0.1
- duration_min 0.1
- duration_max 0.1
- repeat_delay 20
- repeat_delay_min 20
- repeat_delay_max 20
- width 2
- height 2
- depth 2
- }
-
- affector Scaler
- {
- rate 20
- }
-
- affector ColourFader
- {
- red -1
- green -1
- blue -0.7027
- alpha -1
- }
-
- affector Rotator
- {
- rotation_speed_range_start -360
- rotation_speed_range_end 360
- rotation_range_start 0
- rotation_range_end 360
- }
-}
+
+particle_system orxonox/explosion_flame2
+{
+ quota 500
+ material PE/bigFlame
+ particle_width 20.52
+ particle_height 20.25
+ cull_each false
+ renderer billboard
+ billboard_type point
+
+ emitter Box
+ {
+ angle 180
+ colour 1 0.566667 0.5 1
+ colour_range_start 1 0.566667 0.5 1
+ colour_range_end 1 0.566667 0.5 1
+ direction 1 0 0
+ emission_rate 2000
+ position 0 0 0
+ velocity 30
+ velocity_min 30
+ velocity_max 80
+ time_to_live 1
+ time_to_live_min 1
+ time_to_live_max 3
+ duration 0.1
+ duration_min 0.1
+ duration_max 0.1
+ repeat_delay 20
+ repeat_delay_min 20
+ repeat_delay_max 20
+ width 2
+ height 2
+ depth 2
+ }
+
+ affector Scaler
+ {
+ rate 20
+ }
+
+ affector ColourFader
+ {
+ red -1
+ green -1
+ blue -0.7027
+ alpha -1
+ }
+
+ affector Rotator
+ {
+ rotation_speed_range_start -360
+ rotation_speed_range_end 360
+ rotation_range_start 0
+ rotation_range_end 360
+ }
+}
Property changes on: code/branches/presentationFS15merge/data/particle/orxonox_explosionFlame2.particle
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/presentationFS15merge/data/particle/orxonox_explosionFlash.particle
===================================================================
--- code/branches/presentationFS15merge/data/particle/orxonox_explosionFlash.particle 2015-10-04 12:23:33 UTC (rev 10618)
+++ code/branches/presentationFS15merge/data/particle/orxonox_explosionFlash.particle 2015-10-04 12:30:26 UTC (rev 10619)
@@ -1,55 +1,55 @@
-
-particle_system orxonox/explosion_flash
-{
- quota 50
- material orxonox/explosion_flash
- particle_width 50
- particle_height 50
- cull_each false
- renderer billboard
- billboard_type point
-
- emitter Point
- {
- angle 180
- colour 1 1 1 1
- colour_range_start 1 1 1 1
- colour_range_end 1 1 1 1
- direction 0 0 0
- emission_rate 10
- position 0 0 0
- velocity 0
- velocity_min 0
- velocity_max 0
- time_to_live 0.05
- time_to_live_min 0.05
- time_to_live_max 0.05
- duration 0.1
- duration_min 0.1
- duration_max 0.1
- repeat_delay 100000
- repeat_delay_min 100000
- repeat_delay_max 100000
- }
-
- affector Rotator
- {
- rotation_speed_range_start 0
- rotation_speed_range_end 0
- rotation_range_start 0
- rotation_range_end 360
- }
-
- affector Scaler
- {
- rate 1000
- }
-
- affector ColourFader
- {
- red -1
- green -1
- blue -1
- alpha -1
- }
-}
+
+particle_system orxonox/explosion_flash
+{
+ quota 50
+ material orxonox/explosion_flash
+ particle_width 50
+ particle_height 50
+ cull_each false
+ renderer billboard
+ billboard_type point
+
+ emitter Point
+ {
+ angle 180
+ colour 1 1 1 1
+ colour_range_start 1 1 1 1
+ colour_range_end 1 1 1 1
+ direction 0 0 0
+ emission_rate 10
+ position 0 0 0
+ velocity 0
+ velocity_min 0
+ velocity_max 0
+ time_to_live 0.05
+ time_to_live_min 0.05
+ time_to_live_max 0.05
+ duration 0.1
+ duration_min 0.1
+ duration_max 0.1
+ repeat_delay 100000
+ repeat_delay_min 100000
+ repeat_delay_max 100000
+ }
+
+ affector Rotator
+ {
+ rotation_speed_range_start 0
+ rotation_speed_range_end 0
+ rotation_range_start 0
+ rotation_range_end 360
+ }
+
+ affector Scaler
+ {
+ rate 1000
+ }
+
+ affector ColourFader
+ {
+ red -1
+ green -1
+ blue -1
+ alpha -1
+ }
+}
Property changes on: code/branches/presentationFS15merge/data/particle/orxonox_explosionFlash.particle
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/presentationFS15merge/data/particle/orxonox_explosionFlash2.particle
===================================================================
--- code/branches/presentationFS15merge/data/particle/orxonox_explosionFlash2.particle 2015-10-04 12:23:33 UTC (rev 10618)
+++ code/branches/presentationFS15merge/data/particle/orxonox_explosionFlash2.particle 2015-10-04 12:30:26 UTC (rev 10619)
@@ -1,47 +1,47 @@
-
-particle_system orxonox/explosion_flash2
-{
- quota 50
- material orxonox/explosion_flash
- particle_width 50
- particle_height 50
- cull_each false
- renderer billboard
- billboard_type point
-
- emitter Point
- {
- angle 180
- colour 1 1 1 1
- colour_range_start 1 1 1 1
- colour_range_end 1 1 1 1
- direction 0 0 0
- emission_rate 10
- position 0 0 0
- velocity 0
- velocity_min 0
- velocity_max 0
- time_to_live 0.05
- time_to_live_min 0.05
- time_to_live_max 0.05
- duration 0.1
- duration_min 0.1
- duration_max 0.1
- repeat_delay 20
- repeat_delay_min 20
- repeat_delay_max 20
- }
-
- affector Rotator
- {
- rotation_speed_range_start 0
- rotation_speed_range_end 0
- rotation_range_start 0
- rotation_range_end 360
- }
-
- affector Scaler
- {
- rate 100
- }
-}
+
+particle_system orxonox/explosion_flash2
+{
+ quota 50
+ material orxonox/explosion_flash
+ particle_width 50
+ particle_height 50
+ cull_each false
+ renderer billboard
+ billboard_type point
+
+ emitter Point
+ {
+ angle 180
+ colour 1 1 1 1
+ colour_range_start 1 1 1 1
+ colour_range_end 1 1 1 1
+ direction 0 0 0
+ emission_rate 10
+ position 0 0 0
+ velocity 0
+ velocity_min 0
+ velocity_max 0
+ time_to_live 0.05
+ time_to_live_min 0.05
+ time_to_live_max 0.05
+ duration 0.1
+ duration_min 0.1
+ duration_max 0.1
+ repeat_delay 20
+ repeat_delay_min 20
+ repeat_delay_max 20
+ }
+
+ affector Rotator
+ {
+ rotation_speed_range_start 0
+ rotation_speed_range_end 0
+ rotation_range_start 0
+ rotation_range_end 360
+ }
+
+ affector Scaler
+ {
+ rate 100
+ }
+}
Property changes on: code/branches/presentationFS15merge/data/particle/orxonox_explosionFlash2.particle
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/presentationFS15merge/data/particle/orxonox_explosionShockwave.particle
===================================================================
--- code/branches/presentationFS15merge/data/particle/orxonox_explosionShockwave.particle 2015-10-04 12:23:33 UTC (rev 10618)
+++ code/branches/presentationFS15merge/data/particle/orxonox_explosionShockwave.particle 2015-10-04 12:30:26 UTC (rev 10619)
@@ -1,48 +1,48 @@
-
-particle_system orxonox/explosion_shockwave
-{
- quota 4000
- material orxonox/explosion_shockwave
- particle_width 20
- particle_height 20
- cull_each false
- renderer billboard
- billboard_type oriented_common
- common_direction 0 0.25 0.5
-
- emitter Point
- {
- angle 0
- colour 0.441667 0.441667 0.441667 1
- colour_range_start 0.441667 0.441667 0.441667 1
- colour_range_end 0.441667 0.441667 0.441667 1
- direction 0 1 0
- emission_rate 10
- position 0 0 0
- velocity 0
- velocity_min 0
- velocity_max 0
- time_to_live 1
- time_to_live_min 1
- time_to_live_max 1
- duration 0.1
- duration_min 0.1
- duration_max 0.1
- repeat_delay 100000
- repeat_delay_min 100000
- repeat_delay_max 100000
- }
-
- affector Scaler
- {
- rate 500
- }
-
- affector ColourFader
- {
- red -1
- green -1
- blue -1
- alpha 0
- }
-}
+
+particle_system orxonox/explosion_shockwave
+{
+ quota 4000
+ material orxonox/explosion_shockwave
+ particle_width 20
+ particle_height 20
+ cull_each false
+ renderer billboard
+ billboard_type oriented_common
+ common_direction 0 0.25 0.5
+
+ emitter Point
+ {
+ angle 0
+ colour 0.441667 0.441667 0.441667 1
+ colour_range_start 0.441667 0.441667 0.441667 1
+ colour_range_end 0.441667 0.441667 0.441667 1
+ direction 0 1 0
+ emission_rate 10
+ position 0 0 0
+ velocity 0
+ velocity_min 0
+ velocity_max 0
+ time_to_live 1
+ time_to_live_min 1
+ time_to_live_max 1
+ duration 0.1
+ duration_min 0.1
+ duration_max 0.1
+ repeat_delay 100000
+ repeat_delay_min 100000
+ repeat_delay_max 100000
+ }
+
+ affector Scaler
+ {
+ rate 500
+ }
+
+ affector ColourFader
+ {
+ red -1
+ green -1
+ blue -1
+ alpha 0
+ }
+}
Property changes on: code/branches/presentationFS15merge/data/particle/orxonox_explosionShockwave.particle
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/presentationFS15merge/data/particle/orxonox_explosionShockwave2.particle
===================================================================
--- code/branches/presentationFS15merge/data/particle/orxonox_explosionShockwave2.particle 2015-10-04 12:23:33 UTC (rev 10618)
+++ code/branches/presentationFS15merge/data/particle/orxonox_explosionShockwave2.particle 2015-10-04 12:30:26 UTC (rev 10619)
@@ -1,48 +1,48 @@
-
-particle_system orxonox/explosion_shockwave2
-{
- quota 4000
- material orxonox/explosion_shockwave
- particle_width 20
- particle_height 20
- cull_each false
- renderer billboard
- billboard_type oriented_common
- common_direction 0 0.25 0.5
-
- emitter Point
- {
- angle 0
- colour 0.85 0.85 1 1
- colour_range_start 0.85 0.85 1 1
- colour_range_end 0.85 0.85 1 1
- direction 0 1 0
- emission_rate 10
- position 0 0 0
- velocity 0
- velocity_min 0
- velocity_max 0
- time_to_live 1
- time_to_live_min 1
- time_to_live_max 1
- duration 0.1
- duration_min 0.1
- duration_max 0.1
- repeat_delay 20
- repeat_delay_min 20
- repeat_delay_max 20
- }
-
- affector Scaler
- {
- rate 500
- }
-
- affector ColourFader
- {
- red -1
- green -1
- blue -1
- alpha 0
- }
-}
+
+particle_system orxonox/explosion_shockwave2
+{
+ quota 4000
+ material orxonox/explosion_shockwave
+ particle_width 20
+ particle_height 20
+ cull_each false
+ renderer billboard
+ billboard_type oriented_common
+ common_direction 0 0.25 0.5
+
+ emitter Point
+ {
+ angle 0
+ colour 0.85 0.85 1 1
+ colour_range_start 0.85 0.85 1 1
+ colour_range_end 0.85 0.85 1 1
+ direction 0 1 0
+ emission_rate 10
+ position 0 0 0
+ velocity 0
+ velocity_min 0
+ velocity_max 0
+ time_to_live 1
+ time_to_live_min 1
+ time_to_live_max 1
+ duration 0.1
+ duration_min 0.1
+ duration_max 0.1
+ repeat_delay 20
+ repeat_delay_min 20
+ repeat_delay_max 20
+ }
+
+ affector Scaler
+ {
+ rate 500
+ }
+
+ affector ColourFader
+ {
+ red -1
+ green -1
+ blue -1
+ alpha 0
+ }
+}
Property changes on: code/branches/presentationFS15merge/data/particle/orxonox_explosionShockwave2.particle
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/presentationFS15merge/data/particle/orxonox_explosionSparks.particle
===================================================================
--- code/branches/presentationFS15merge/data/particle/orxonox_explosionSparks.particle 2015-10-04 12:23:33 UTC (rev 10618)
+++ code/branches/presentationFS15merge/data/particle/orxonox_explosionSparks.particle 2015-10-04 12:30:26 UTC (rev 10619)
@@ -1,42 +1,42 @@
-
-particle_system orxonox/explosion_sparks
-{
- quota 2000
- material PE/explosion
- particle_width 1.5
- particle_height 12.33
- cull_each false
- renderer billboard
- billboard_type oriented_self
-
- emitter Point
- {
- angle 180
- colour 1 1 1 1
- colour_range_start 1 1 1 1
- colour_range_end 1 1 1 1
- direction -0.684313 -0.325257 0.652628
- emission_rate 1000
- position 0 0 0
- velocity 100
- velocity_min 100
- velocity_max 200
- time_to_live 0.2
- time_to_live_min 0.2
- time_to_live_max 0.5
- duration 0.1
- duration_min 0.1
- duration_max 0.1
- repeat_delay 100000
- repeat_delay_min 100000
- repeat_delay_max 100000
- }
-
- affector ColourFader
- {
- red 0.2432
- green -1
- blue -1
- alpha -1
- }
-}
+
+particle_system orxonox/explosion_sparks
+{
+ quota 2000
+ material PE/explosion
+ particle_width 1.5
+ particle_height 12.33
+ cull_each false
+ renderer billboard
+ billboard_type oriented_self
+
+ emitter Point
+ {
+ angle 180
+ colour 1 1 1 1
+ colour_range_start 1 1 1 1
+ colour_range_end 1 1 1 1
+ direction -0.684313 -0.325257 0.652628
+ emission_rate 1000
+ position 0 0 0
+ velocity 100
+ velocity_min 100
+ velocity_max 200
+ time_to_live 0.2
+ time_to_live_min 0.2
+ time_to_live_max 0.5
+ duration 0.1
+ duration_min 0.1
+ duration_max 0.1
+ repeat_delay 100000
+ repeat_delay_min 100000
+ repeat_delay_max 100000
+ }
+
+ affector ColourFader
+ {
+ red 0.2432
+ green -1
+ blue -1
+ alpha -1
+ }
+}
Property changes on: code/branches/presentationFS15merge/data/particle/orxonox_explosionSparks.particle
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/presentationFS15merge/data/particle/orxonox_explosionSparks2.particle
===================================================================
--- code/branches/presentationFS15merge/data/particle/orxonox_explosionSparks2.particle 2015-10-04 12:23:33 UTC (rev 10618)
+++ code/branches/presentationFS15merge/data/particle/orxonox_explosionSparks2.particle 2015-10-04 12:30:26 UTC (rev 10619)
@@ -1,42 +1,42 @@
-
-particle_system orxonox/explosion_sparks2
-{
- quota 2000
- material PE/explosion
- particle_width 1.5
- particle_height 13.98
- cull_each false
- renderer billboard
- billboard_type oriented_self
-
- emitter Point
- {
- angle 180
- colour 1 1 1 1
- colour_range_start 1 1 1 1
- colour_range_end 1 1 1 1
- direction -0.684313 -0.325257 0.652628
- emission_rate 1000
- position 0 0 0
- velocity 150
- velocity_min 150
- velocity_max 200
- time_to_live 0.2
- time_to_live_min 0.2
- time_to_live_max 0.75
- duration 0.1
- duration_min 0.1
- duration_max 0.1
- repeat_delay 20
- repeat_delay_min 20
- repeat_delay_max 20
- }
-
- affector ColourFader
- {
- red 0.2432
- green -1
- blue -1
- alpha -1
- }
-}
+
+particle_system orxonox/explosion_sparks2
+{
+ quota 2000
+ material PE/explosion
+ particle_width 1.5
+ particle_height 13.98
+ cull_each false
+ renderer billboard
+ billboard_type oriented_self
+
+ emitter Point
+ {
+ angle 180
+ colour 1 1 1 1
+ colour_range_start 1 1 1 1
+ colour_range_end 1 1 1 1
+ direction -0.684313 -0.325257 0.652628
+ emission_rate 1000
+ position 0 0 0
+ velocity 150
+ velocity_min 150
+ velocity_max 200
+ time_to_live 0.2
+ time_to_live_min 0.2
+ time_to_live_max 0.75
+ duration 0.1
+ duration_min 0.1
+ duration_max 0.1
+ repeat_delay 20
+ repeat_delay_min 20
+ repeat_delay_max 20
+ }
+
+ affector ColourFader
+ {
+ red 0.2432
+ green -1
+ blue -1
+ alpha -1
+ }
+}
Property changes on: code/branches/presentationFS15merge/data/particle/orxonox_explosionSparks2.particle
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/presentationFS15merge/data/particle/orxonox_explosionStreak1.particle
===================================================================
--- code/branches/presentationFS15merge/data/particle/orxonox_explosionStreak1.particle 2015-10-04 12:23:33 UTC (rev 10618)
+++ code/branches/presentationFS15merge/data/particle/orxonox_explosionStreak1.particle 2015-10-04 12:30:26 UTC (rev 10619)
@@ -1,42 +1,42 @@
-
-particle_system orxonox/explosion_streak1
-{
- quota 4000
- material orxonox/explosion_streak1
- particle_width 12.15
- particle_height 82.13
- cull_each false
- renderer billboard
- billboard_type oriented_self
-
- emitter Point
- {
- angle 180
- colour 0.191667 0.191667 0.191667 1
- colour_range_start 0.191667 0.191667 0.191667 1
- colour_range_end 0.191667 0.191667 0.191667 1
- direction 0 1 0
- emission_rate 400
- position 0 0 0
- velocity 30
- velocity_min 30
- velocity_max 100
- time_to_live 1
- time_to_live_min 1
- time_to_live_max 2
- duration 0.1
- duration_min 0.1
- duration_max 0.1
- repeat_delay 20
- repeat_delay_min 20
- repeat_delay_max 20
- }
-
- affector ColourFader
- {
- red -0.2
- green -0.2
- blue -0.2
- alpha 0
- }
-}
+
+particle_system orxonox/explosion_streak1
+{
+ quota 4000
+ material orxonox/explosion_streak1
+ particle_width 12.15
+ particle_height 82.13
+ cull_each false
+ renderer billboard
+ billboard_type oriented_self
+
+ emitter Point
+ {
+ angle 180
+ colour 0.191667 0.191667 0.191667 1
+ colour_range_start 0.191667 0.191667 0.191667 1
+ colour_range_end 0.191667 0.191667 0.191667 1
+ direction 0 1 0
+ emission_rate 400
+ position 0 0 0
+ velocity 30
+ velocity_min 30
+ velocity_max 100
+ time_to_live 1
+ time_to_live_min 1
+ time_to_live_max 2
+ duration 0.1
+ duration_min 0.1
+ duration_max 0.1
+ repeat_delay 20
+ repeat_delay_min 20
+ repeat_delay_max 20
+ }
+
+ affector ColourFader
+ {
+ red -0.2
+ green -0.2
+ blue -0.2
+ alpha 0
+ }
+}
Property changes on: code/branches/presentationFS15merge/data/particle/orxonox_explosionStreak1.particle
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/presentationFS15merge/data/particle/orxonox_explosionStreak2.particle
===================================================================
--- code/branches/presentationFS15merge/data/particle/orxonox_explosionStreak2.particle 2015-10-04 12:23:33 UTC (rev 10618)
+++ code/branches/presentationFS15merge/data/particle/orxonox_explosionStreak2.particle 2015-10-04 12:30:26 UTC (rev 10619)
@@ -1,47 +1,47 @@
-
-particle_system orxonox/explosion_streak2
-{
- quota 4000
- material orxonox/explosion_streak1
- particle_width 14
- particle_height 75
- cull_each false
- renderer billboard
- billboard_type oriented_self
-
- emitter Point
- {
- angle 180
- colour 0.466667 0.341667 0.216667 1
- colour_range_start 0.466667 0.341667 0.216667 1
- colour_range_end 0.466667 0.341667 0.216667 1
- direction 0 1 0
- emission_rate 400
- position 0 0 0
- velocity 50
- velocity_min 50
- velocity_max 80
- time_to_live 1
- time_to_live_min 1
- time_to_live_max 2
- duration 0.1
- duration_min 0.1
- duration_max 0.1
- repeat_delay 20
- repeat_delay_min 20
- repeat_delay_max 20
- }
-
- affector ColourFader
- {
- red -0.3
- green -0.25
- blue -0.2
- alpha 0
- }
-
- affector Scaler
- {
- rate 10
- }
-}
+
+particle_system orxonox/explosion_streak2
+{
+ quota 4000
+ material orxonox/explosion_streak1
+ particle_width 14
+ particle_height 75
+ cull_each false
+ renderer billboard
+ billboard_type oriented_self
+
+ emitter Point
+ {
+ angle 180
+ colour 0.466667 0.341667 0.216667 1
+ colour_range_start 0.466667 0.341667 0.216667 1
+ colour_range_end 0.466667 0.341667 0.216667 1
+ direction 0 1 0
+ emission_rate 400
+ position 0 0 0
+ velocity 50
+ velocity_min 50
+ velocity_max 80
+ time_to_live 1
+ time_to_live_min 1
+ time_to_live_max 2
+ duration 0.1
+ duration_min 0.1
+ duration_max 0.1
+ repeat_delay 20
+ repeat_delay_min 20
+ repeat_delay_max 20
+ }
+
+ affector ColourFader
+ {
+ red -0.3
+ green -0.25
+ blue -0.2
+ alpha 0
+ }
+
+ affector Scaler
+ {
+ rate 10
+ }
+}
Property changes on: code/branches/presentationFS15merge/data/particle/orxonox_explosionStreak2.particle
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentationFS15merge/src/modules/towerdefense/TowerDefenseSelecter.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentationFS15merge/src/modules/towerdefense/TowerDefenseSelecter.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentationFS15merge/src/modules/weapons/munitions/GravityBombMunition.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentationFS15merge/src/modules/weapons/munitions/GravityBombMunition.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentationFS15merge/src/modules/weapons/projectiles/GravityBomb.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentationFS15merge/src/modules/weapons/projectiles/GravityBomb.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentationFS15merge/src/modules/weapons/projectiles/GravityBombField.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentationFS15merge/src/modules/weapons/projectiles/GravityBombField.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentationFS15merge/src/modules/weapons/projectiles/RocketOld.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentationFS15merge/src/modules/weapons/projectiles/RocketOld.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/GravityBombFire.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/GravityBombFire.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/RocketFireOld.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/RocketFireOld.h
___________________________________________________________________
Added: svn:eol-style
+ native
More information about the Orxonox-commit
mailing list