Index: code/branches/particleEffectsHS15/data/levels/emptyLevel.oxw
===================================================================
--- code/branches/particleEffectsHS15/data/levels/emptyLevel.oxw	(revision 10706)
+++ code/branches/particleEffectsHS15/data/levels/emptyLevel.oxw	(revision 10836)
@@ -34,14 +34,31 @@
     <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />
 
-    <ParticleEmitter
-        source="Orxonox/engine"
-        position="0,0,0"
-        lifetime=1.0 loop=1 startdelay=2.0
-    />
- 	<ParticleEmitter
-        source="Orxonox/ice"
-        position="0,0,100"
-        lifetime=2.0 loop=1 startdelay=3.0
-    />
+        <Pawn team=1 health=30 position="0,100,0" direction="0,-1,0" collisionType=dynamic mass=100000 name=box RVName = "Box 4" >
+        <events>
+          <visibility>
+            <EventListener event="flying4" />
+          </visibility>
+        </events>
+        <attached>
+            <Model position="0,0,0" mesh="crate.mesh" scale3D="3,3,3" />
+        </attached>
+        <collisionShapes>
+            <BoxCollisionShape position="0,0,0" halfExtents="15,15,15" />
+        </collisionShapes>
+    </Pawn>
+
+    <Pawn team=1 health=30 position="0,200,0" direction="0,-1,0" collisionType=dynamic mass=100000 name=box RVName = "Box 3">
+        <events>
+          <visibility>
+            <EventListener event="flying4" />
+          </visibility>
+        </events>
+        <attached>
+           <Model position="0,0,0" mesh="crate.mesh" scale3D="3,3,3" />
+        </attached>
+        <collisionShapes>
+            <BoxCollisionShape position="0,0,0" halfExtents="15,15,15" />
+        </collisionShapes>
+    </Pawn>
     
   </Scene>
Index: code/branches/particleEffectsHS15/data/levels/includes/weaponSettingsAssff2.oxi
===================================================================
--- code/branches/particleEffectsHS15/data/levels/includes/weaponSettingsAssff2.oxi	(revision 10706)
+++ code/branches/particleEffectsHS15/data/levels/includes/weaponSettingsAssff2.oxi	(revision 10836)
@@ -1,3 +1,3 @@
-    <weaponslots>
+t    <weaponslots>
       <WeaponSlot position="-15.0,-1.5,0" />
       <WeaponSlot position=" 15.0,-1.5,0" />
Index: code/branches/particleEffectsHS15/data/levels/includes/weaponSettingsEscort.oxi
===================================================================
--- code/branches/particleEffectsHS15/data/levels/includes/weaponSettingsEscort.oxi	(revision 10706)
+++ code/branches/particleEffectsHS15/data/levels/includes/weaponSettingsEscort.oxi	(revision 10836)
@@ -14,10 +14,8 @@
         </links>
         <Weapon>
-          <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" projectileMesh="LaserBeam2.mesh" />
-          <!--HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" projectileMesh="LaserBeam2.mesh" /-->
+          <MineGun mode=0 munitionpershot=0 delay=0.125 damage=9.3 muzzleoffset=" 0.1, 1.4,-3" />
         </Weapon>
         <Weapon>
-          <HsW01 mode=0 munitionpershot=0 delay=0     damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" projectileMesh="LaserBeam2.mesh" />
-          <!--HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-0.1, 1.6, -2.0" projectileMesh="LaserBeam2.mesh" /-->
+          <SplitGun mode=0 munitionpershot=0 delay=0.125 damage=9.3 muzzleoffset=" 0.1, 1.4,-3" />
         </Weapon>
       </WeaponPack>
Index: code/branches/particleEffectsHS15/data/levels/templates/spaceshipEscort.oxt
===================================================================
--- code/branches/particleEffectsHS15/data/levels/templates/spaceshipEscort.oxt	(revision 10706)
+++ code/branches/particleEffectsHS15/data/levels/templates/spaceshipEscort.oxt	(revision 10836)
@@ -92,25 +92,27 @@
     <EffectContainer condition="idle">
       <WorldSound mainstate="activity" source="sounds/Engine_idle.ogg" looping=1 active=false/>
+       />
+
+	   <Backlight mainstate=activity active=false scale=0.33 name=bltest position=" 12, -2, 14" colour="0.2, 0.5, 0.65, 1.0" width=150 length=15 lifetime=2 elements=1 trailmaterial="Trail/backlighttrail" turnontime=2 turnofftime=1 material="Flares/ThrusterFlare1" />
+
+      <Backlight mainstate=activity active=false scale=0.33 name=bltest position="-12, -2, 14" colour="0.2, 0.5, 0.65, 1.0" width=15 length=15 lifetime=2 elements=1 trailmaterial="Trail/backlighttrail" turnontime=2 turnofftime=1 material="Flares/ThrusterFlare1" />
+
     </EffectContainer>
     <EffectContainer condition="not idle">
+      <FadingBillboard mainstate=activity active=false scale=0.09 position="12, -2, 13" 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="-12, -2, 13" 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">
-      <ParticleEmitter
-        source="Orxonox/engine"
-        position="-12,-1.75,13"
-        lifetime=5.0 loop=1 startdelay=0.0
-        scale=0.3
-    />
-	<ParticleEmitter
-        source="Orxonox/engine"
-        position="12,-1.75,13"
-        lifetime=5.0 loop=1 startdelay=0.0
-        scale=0.3
-    />
-      
+	
+	
+      <Backlight mainstate=activity active=false scale=0.33 name=bltest position=" 12, -2, 14" colour="0.2, 1.0, 0.65, 1.0" width=5 length=1500 lifetime=2 elements=1 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
+
+      <Backlight mainstate=activity active=false scale=0.33 name=bltest position="-12, -2, 14" colour="0.2, 1.0, 0.65, 1.0" width=15 length=1500 lifetime=2 elements=1 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=" 12, 0, 10" colour="0.6, 0.8, 0.75, 0.7" width=25 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
Index: code/branches/particleEffectsHS15/data/particle/ice.particle
===================================================================
--- code/branches/particleEffectsHS15/data/particle/ice.particle	(revision 10706)
+++ code/branches/particleEffectsHS15/data/particle/ice.particle	(revision 10836)
@@ -1,7 +1,7 @@
 particle_system Orxonox/ice
 {
-	material PE/Hidden.001
-	particle_width 66.6699981689453
-	particle_height 38.0999984741211
+	material PE/iceCrystal
+	particle_width 5
+	particle_height 5
 	quota 7000
 	cull_each false
@@ -18,15 +18,15 @@
 	emitter Box
 	{
-		position 0.0 500.0 0.0
-		direction 0.0 0.0 1.0
-		angle 0
-		width 200
-		height 200
-		depth 200
-		emission_rate 20
+		position 0.0 0.0 0.0
+		direction 1.0 1.0 1.0
+		angle 45
+		width 20
+		height 20
+		depth 20
+		emission_rate 200
 		velocity_min 1
 		velocity_max 1
-		time_to_live_min 10
-		time_to_live_max 20
+		time_to_live_min 3
+		time_to_live_max 6
 		duration_min 0
 		duration_max 0
@@ -34,5 +34,5 @@
 		repeat_delay_max 0
 		colour_range_start 1 1 1 1
-		colour_range_end 0.835294 0.956863 1 1
+		colour_range_end 0.9 1 1 1
 	}
 
Index: code/branches/particleEffectsHS15/data/particle/psygun.particle
===================================================================
--- code/branches/particleEffectsHS15/data/particle/psygun.particle	(revision 10836)
+++ code/branches/particleEffectsHS15/data/particle/psygun.particle	(revision 10836)
@@ -0,0 +1,62 @@
+particle_system Orxonox/psygun
+{
+	material PE/glowEffect
+	particle_width 200.0
+	particle_height 200.0
+	quota 300
+	cull_each false
+	sorted false
+	local_space false
+	iteration_interval 0.0
+	nonvisible_update_timeout 0.0
+	billboard_type point
+	billboard_origin top_right
+	billboard_rotation_type vertex
+	point_rendering false
+	accurate_facing true
+
+	emitter Point
+	{
+		position 0.0 0.0 0.0
+		direction 0.0 1.0 0.0
+		angle 154.8
+		emission_rate 400
+		velocity_min 100
+		velocity_max 300
+		time_to_live_min 0
+		time_to_live_max 3.38
+		duration_min 1
+		duration_max 1
+		repeat_delay_min 0.11
+		repeat_delay_max 2.81
+		colour_range_start 0.666667 0 0.498039 1
+		colour_range_end 1 0 0.498039 1
+	}
+
+	affector LinearForce
+	{
+		force_vector 0.0 12.32 0.0
+		force_application add
+	}
+
+	affector Rotator
+	{
+		rotation_speed_range_start 100
+		rotation_speed_range_end 500
+		rotation_range_start 0
+		rotation_range_end 180
+	}
+
+	affector Scaler
+	{
+		rate -98.82
+	}
+
+	affector ColourFader
+	{
+		red -0.93
+		green -1
+		blue 1
+		alpha -1
+	}
+}
Index: code/branches/particleEffectsHS15/data/particle/rocketfire.particle
===================================================================
--- code/branches/particleEffectsHS15/data/particle/rocketfire.particle	(revision 10706)
+++ code/branches/particleEffectsHS15/data/particle/rocketfire.particle	(revision 10836)
@@ -1,11 +1,11 @@
 particle_system Orxonox/rocketfire
 {
-	material PE/Special.001
-	particle_width 6.67000007629395
-	particle_height 3.80999994277954
-	quota 300
-	cull_each false
-	sorted false
-	local_space false
+	material PE/glowEffect
+	particle_width 2
+	particle_height 2
+	quota 10000
+	cull_each true
+	sorted true
+	local_space true
 	iteration_interval 0.0
 	nonvisible_update_timeout 0.0
@@ -18,5 +18,5 @@
 	emitter Ellipsoid
 	{
-		position 0.0 0.0 3.0
+		position 0.05 0.0 2.0
 		direction 0.0 0.0 1.0
 		angle 0
@@ -26,7 +26,7 @@
 		emission_rate 1200
 		velocity_min 10
-		velocity_max 48
+		velocity_max 20
 		time_to_live_min 0.1
-		time_to_live_max 0.19
+		time_to_live_max 0.1
 		duration_min 0
 		duration_max 0
@@ -36,4 +36,24 @@
 		colour_range_end 1 0 0 1
 	}
+	emitter Ellipsoid
+	{
+		position 0.05 0.0 2.0
+		direction 0.0 0.0 1.0
+		angle 0
+		width 0
+		height 0
+		depth 0
+		emission_rate 100
+		velocity_min 5
+		velocity_max 10
+		time_to_live_min 0.1
+		time_to_live_max 0.1
+		duration_min 0
+		duration_max 0
+		repeat_delay_min 0
+		repeat_delay_max 0
+		colour_range_start 0.2 0.5 0.65
+		colour_range_end 0.25 0.55 0.7
+	}
 
 	affector Scaler
