Merge remote-tracking branch 'origin/master' into Mirio/silentsiege

diff --git a/maps/courtfun.mapinfo b/maps/courtfun.mapinfo
index 11a0defd9bb23d10f5112f9048b8812471070d3d..364fd3ef05d009f4a66b417089caed4f02589b9c 100644 (file)
--- a/maps/courtfun.mapinfo
+++ b/maps/courtfun.mapinfo
@@ -1,5 +1,5 @@
 title Courtfun
-description A classic large scale CTF map
+description A classic large scale CTF map supporting other gamemodes as well
 author SavageX, Calinou, Debugger
 cdtrack 9
 has weapons
@@ -34,4 +34,4 @@ settemp_for_type cts g_cts_finish_kill_delay 0
 settemp_for_type ons g_powerups 0
 
 clientsettemp_for_type all r_water 1
-clientsettemp_for_type all r_water_resolutionmultiplier 1
\ No newline at end of file
+clientsettemp_for_type all r_water_resolutionmultiplier 1

diff --git a/maps/fuse.mapinfo b/maps/fuse.mapinfo
index 1ea4fb2e43b9e74ef7ca055138d5b5a40aa863f8..d486ac949c512630a895832252b38e8b000fc7ba 100644 (file)
--- a/maps/fuse.mapinfo
+++ b/maps/fuse.mapinfo
@@ -1,5 +1,5 @@
 title Fuse
-description Duel Mapping Contest Winner 2012
+description Duel Mapping Contest Winner of 2012
 author Ferdinand 'cityy' List
 cdtrack 4
 has weapons

diff --git a/maps/g-23.mapinfo b/maps/g-23.mapinfo
index dcf02eeae927b92ab6c39112cb2919cfee9cf7bd..fdba466f3bdcd949d1cb60cba3c9f499fd6153e4 100644 (file)
--- a/maps/g-23.mapinfo
+++ b/maps/g-23.mapinfo
@@ -1,5 +1,5 @@
 title G-23
-description You and your expert team of soldiers have docked Docking Station G-23 for retrieving a package and letting no one stand in your way
+description A small DM map with tight corridors
 author MooKow
 cdtrack 2
 has weapons

diff --git a/maps/space-elevator.jpg b/maps/space-elevator.jpg
new file mode 100644 (file)
index 0000000..6834614
Binary files /dev/null and b/maps/space-elevator.jpg differ

diff --git a/maps/space-elevator.map b/maps/space-elevator.map
index 69d64efad85d1bee864092d7c5ad6d311357e6c8..8bdafe8fc8ce584044ffa403eba0fd5d3c5a3c65 100644 (file)
--- a/maps/space-elevator.map
+++ b/maps/space-elevator.map
@@ -30557,8 +30557,8 @@ effects_jumppad/jumppadfx1_a
 }
 {
 "classname" "info_autoscreenshot"
-"origin" "1187.67493 2221.96851 322.862885"
-"angles" "12.1453857 134.87915 0"
+"origin" "-1791.435547 -4204.274902 1521.009033"
+"angles" "26.112049 39.783573 0"
 }
 {
 "classname" "info_autoscreenshot"

diff --git a/maps/space-elevator.tga b/maps/space-elevator.tga
deleted file mode 100644 (file)
index 9e79027..0000000
Binary files a/maps/space-elevator.tga and /dev/null differ

diff --git a/models/map_silentsiege/gspawn.md3 b/models/map_silentsiege/gspawn.md3
new file mode 100644 (file)
index 0000000..6438194
Binary files /dev/null and b/models/map_silentsiege/gspawn.md3 differ

diff --git a/models/map_silentsiege/gspawn1.tga b/models/map_silentsiege/gspawn1.tga
new file mode 100644 (file)
index 0000000..3871467
Binary files /dev/null and b/models/map_silentsiege/gspawn1.tga differ

diff --git a/models/map_silentsiege/gspawn1_bump.tga b/models/map_silentsiege/gspawn1_bump.tga
new file mode 100644 (file)
index 0000000..b16361b
Binary files /dev/null and b/models/map_silentsiege/gspawn1_bump.tga differ

diff --git a/models/map_silentsiege/gspawn1_glow.tga b/models/map_silentsiege/gspawn1_glow.tga
new file mode 100644 (file)
index 0000000..cfc5441
Binary files /dev/null and b/models/map_silentsiege/gspawn1_glow.tga differ

diff --git a/scripts/map_silentsiege.shader b/scripts/map_silentsiege.shader
new file mode 100644 (file)
index 0000000..33661a6
--- /dev/null
+++ b/scripts/map_silentsiege.shader
@@ -0,0 +1,29 @@
+models/map_silentsiege/gspawn1-1
+{
+       qer_editorimage models/map_silentsiege/gspawn1.tga
+    
+       q3map_forcemeta
+       {
+               map $lightmap 
+               rgbGen identity
+               tcGen lightmap 
+       }
+       {
+               map models/map_silentsiege/gspawn1.tga
+               blendfunc filter
+       }
+}
+
+models/map_silentsiege/gspawn1-2
+{
+       qer_editorimage models/map_silentsiege/gspawn1.tga
+       surfaceparm nolightmap
+       surfaceparm nomarks
+       cull none
+       q3map_lightsubdivide 16
+       q3map_surfacelight 5000
+       {
+               map models/map_silentsiege/gspawn1.tga
+               blendfunc blend
+       }
+}

diff --git a/scripts/shaderlist.txt b/scripts/shaderlist.txt
index 57226fa3c5c6139fb3699fb3402a00e284367215..ce08e64fa30fc21047b8ed20835efe99733f7fe8 100644 (file)
--- a/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@ -25,6 +25,7 @@ map_leave_em_behind
 map_lightspeed
 map_newtonian-nightmare
 map_red-planet
+map_silentsiege
 map_solarium
 map_space-elevator
 map_stormkeep