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
