Merge branch 'devel' into experimental

cvarinfo.txt

@@ -42,3 +42,4 @@ server bool flak_doomtest = false;			// made toggleable due to loud complaints
 server bool flak_dmsshock = false;			// allow enhanced shock rifle on deathmatch (otherwise they are replaced with udamage)
 server noarchive bool flak_instagib = false;		// instagib mode (only for dm) - this cvar has to be set from the command line
 user float flak_flashstrength = 1.0;			// strength of screen flashes
+server bool flak_sawammo = false;			// chainsaw uses fuel

gldefs.txt

@@ -508,6 +508,14 @@ Brightmap Texture "models/Chunk_a11.png"
 {
 	Map "brightmaps/Chunk_a11.png"
 }
+HardwareShader Texture "models/JChainSawPick1.png"
+{
+	Shader "shaders/glsl/AmbientGlow.fp"
+}
+HardwareShader Texture "models/jbarrel4.png"
+{
+	Shader "shaders/glsl/AmbientGlow.fp"
+}
 PulseLight "UTRedKeyLight"
 {
 	Color 1.0 0.0 0.0