Merge remote-tracking branch 'origin/Mirio/runningmanctf'

diff --git a/maps/afterslime.map b/maps/afterslime.map
index 61d5c4dabe099f7e799bfac90f8489b0dfd94c07..439e188b719d089112cf7f538e88d98264914f13 100644 (file)
--- a/maps/afterslime.map
+++ b/maps/afterslime.map
@@ -52908,7 +52908,7 @@ exx/trim-metalsupp01
 "origin" "704.000000 -512.000000 -152.000000"
 "netname" "^4Blue Team^3"
 "model" "models/domination/dom_blue.md3"
-"message" "Blue team has captured a control point"
+"message" "Blue Team has captured a control point"
 "noise" "domination/claim.wav"
 "noise1" "domination/claim.wav"
 "cnt" "13"
@@ -52917,7 +52917,7 @@ exx/trim-metalsupp01
 "classname" "dom_team"
 "origin" "704.000000 -576.000000 -152.000000"
 "cnt" "4"
-"message" "Red team has captured a control point"
+"message" "Red Team has captured a control point"
 "model" "models/domination/dom_red.md3"
 "netname" "^1Red Team^3"
 "noise" "domination/claim.wav"
@@ -52932,17 +52932,18 @@ exx/trim-metalsupp01
 "classname" "dom_controlpoint"
 "origin" "1152.000000 -352.000000 512.000000"
 "angle" "-180.000000"
-"message" "has captured ControlPoint 1"
+"message" " has captured the Strength control point"
 }
 {
 "classname" "dom_controlpoint"
 "origin" "-1312.000000 -576.000000 16.000000"
-"message" "has captured ControlPoint 2"
+"message" " has captured the Mortar control point"
 }
 {
 "classname" "dom_controlpoint"
 "origin" "160.000000 -2048.000000 12.000000"
 "angle" "90.000000"
+"message" " has captured the Crylink control point"
 }
 {
 "classname" "trigger_teleport"
@@ -52985,3 +52986,23 @@ exx/trim-metalsupp01
 "origin" "1016.98907 -2265.43896 481.283722"
 "angles" "12.6727295 141.146851 0"
 }
+{
+"classname" "dom_team"
+"origin" "704.000000 -544.000000 -152.000000"
+"netname" "^3Yellow Team^3"
+"model" "models/domination/dom_yellow.md3"
+"message" "Yellow Team has captured a control point"
+"noise" "domination/claim.wav"
+"noise1" "domination/claim.wav"
+"cnt" "12"
+}
+{
+"classname" "dom_team"
+"origin" "704.000000 -616.000000 -152.000000"
+"netname" "^6Pink Team^3"
+"model" "models/domination/dom_pink.md3"
+"message" "Pink Team has captured a control point"
+"noise" "domination/claim.wav"
+"noise1" "domination/claim.wav"
+"cnt" "9"
+}

diff --git a/maps/afterslime.mapinfo b/maps/afterslime.mapinfo
index 1c455b60bdeb5e0cc247cf72431852b5eaff3fed..a4a9d9ec26f558d00c624eb515b0abb171be38ef 100644 (file)
--- a/maps/afterslime.mapinfo
+++ b/maps/afterslime.mapinfo
@@ -1,6 +1,6 @@
 title Afterslime
 description Medium sized indoor deathmatch map
-author kuniuthefrogg
+author kuniu the frogg
 cdtrack 12
 has weapons
 gametype dm

diff --git a/maps/afterslime.tga b/maps/afterslime.tga
new file mode 100644 (file)
index 0000000..6661698
Binary files /dev/null and b/maps/afterslime.tga differ

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/drain.map b/maps/drain.map
index d87cee43480a77900dc805cb7b06d2b49e6b8720..8d8478f8c52db0e3413a94efa4bc7e2fcd223ad2 100644 (file)
--- a/maps/drain.map
+++ b/maps/drain.map
@@ -353,7 +353,7 @@
 ( 0 -288 0 ) ( 0 -96 0 ) ( 0 -288 192 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
-( 128 160 -32 ) ( 128 -32 -32 ) ( 64 160 -32 ) phillipk1x/floors-pk01_tile_floor01a 0 0 0 0.25 0.25 0 0 0
+( 128 160 -16 ) ( 128 -32 -16 ) ( 64 160 -16 ) phillipk1x/floors-pk01_tile_floor01a 0 0 0 0.25 0.25 0 0 0
 ( 128 160 0 ) ( 64 160 0 ) ( 128 160 -64 ) phillipk1x/floors-pk01_tile_floor01a 0 0 0 0.25 0.25 0 0 0
 ( 128 160 0 ) ( 128 160 -64 ) ( 128 -32 0 ) phillipk1x/floors-pk01_tile_floor01a 0 0 0 0.25 0.25 0 0 0
 ( 64 -32 -64 ) ( 128 -32 -64 ) ( 64 160 -64 ) phillipk1x/floors-pk01_tile_floor01a 0 0 0 0.25 0.25 0 0 0

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/silentsiege.map b/maps/silentsiege.map
index d5ac1c9ff53e64ff33267baaa4934d961ac6fdd0..4491518700dbbfc368da35bb4b26e4a1caa0acb4 100644 (file)
--- a/maps/silentsiege.map
+++ b/maps/silentsiege.map
@@ -49750,7 +49750,7 @@ brushDef
 {
 "classname" "misc_model"
 "origin" "-903.999939 -512.000122 320.000000"
-"model" "models/final_rage/gspawn.md3"
+"model" "models/map_silentsiege/gspawn.md3"
 "angle" "-179.999985"
 }
 {

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