diff --git a/platform/base_textures.pk3dir/textures/editor/info_node.mat b/platform/base_textures.pk3dir/textures/editor/info_node.mat new file mode 100644 index 00000000..1826ad2a --- /dev/null +++ b/platform/base_textures.pk3dir/textures/editor/info_node.mat @@ -0,0 +1,8 @@ +{ + diffusemap textures/editor/info_node.tga + + { + map $diffuse + blendFunc blend + } +} diff --git a/platform/base_textures.pk3dir/textures/editor/info_node.tga b/platform/base_textures.pk3dir/textures/editor/info_node.tga new file mode 100644 index 00000000..c42bf3a8 Binary files /dev/null and b/platform/base_textures.pk3dir/textures/editor/info_node.tga differ diff --git a/platform/base_textures.pk3dir/textures/editor/info_node_air.mat b/platform/base_textures.pk3dir/textures/editor/info_node_air.mat new file mode 100644 index 00000000..1a54303f --- /dev/null +++ b/platform/base_textures.pk3dir/textures/editor/info_node_air.mat @@ -0,0 +1,8 @@ +{ + diffusemap textures/editor/info_node_air.tga + + { + map $diffuse + blendFunc blend + } +} diff --git a/platform/base_textures.pk3dir/textures/editor/info_node_air.tga b/platform/base_textures.pk3dir/textures/editor/info_node_air.tga new file mode 100644 index 00000000..6f9bb146 Binary files /dev/null and b/platform/base_textures.pk3dir/textures/editor/info_node_air.tga differ diff --git a/platform/base_textures.pk3dir/textures/editor/light_dynamic.mat b/platform/base_textures.pk3dir/textures/editor/light_dynamic.mat new file mode 100644 index 00000000..93f29a95 --- /dev/null +++ b/platform/base_textures.pk3dir/textures/editor/light_dynamic.mat @@ -0,0 +1,9 @@ +{ + diffusemap textures/editor/light_dynamic.tga + + { + map $diffuse + blendFunc blend + rgbGen vertex + } +} diff --git a/platform/base_textures.pk3dir/textures/editor/light_dynamic.tga b/platform/base_textures.pk3dir/textures/editor/light_dynamic.tga new file mode 100644 index 00000000..f1cd81bf Binary files /dev/null and b/platform/base_textures.pk3dir/textures/editor/light_dynamic.tga differ diff --git a/platform/base_textures.pk3dir/textures/editor/model_bone.mat b/platform/base_textures.pk3dir/textures/editor/model_bone.mat new file mode 100644 index 00000000..a1054ffb --- /dev/null +++ b/platform/base_textures.pk3dir/textures/editor/model_bone.mat @@ -0,0 +1,8 @@ +{ + diffusemap textures/editor/model_bone.tga + + { + map $diffuse + blendFunc blend + } +} diff --git a/platform/base_textures.pk3dir/textures/editor/model_bone.tga b/platform/base_textures.pk3dir/textures/editor/model_bone.tga new file mode 100644 index 00000000..7afd2da6 Binary files /dev/null and b/platform/base_textures.pk3dir/textures/editor/model_bone.tga differ diff --git a/platform/base_textures.pk3dir/textures/editor/path_track.mat b/platform/base_textures.pk3dir/textures/editor/path_track.mat new file mode 100644 index 00000000..7809f8da --- /dev/null +++ b/platform/base_textures.pk3dir/textures/editor/path_track.mat @@ -0,0 +1,8 @@ +{ + diffusemap textures/editor/path_track.tga + + { + map $diffuse + blendFunc blend + } +} diff --git a/platform/base_textures.pk3dir/textures/editor/path_track.tga b/platform/base_textures.pk3dir/textures/editor/path_track.tga new file mode 100644 index 00000000..666d51d4 Binary files /dev/null and b/platform/base_textures.pk3dir/textures/editor/path_track.tga differ diff --git a/platform/base_textures.pk3dir/textures/editor/scripted_sequence.mat b/platform/base_textures.pk3dir/textures/editor/scripted_sequence.mat new file mode 100644 index 00000000..8a473835 --- /dev/null +++ b/platform/base_textures.pk3dir/textures/editor/scripted_sequence.mat @@ -0,0 +1,8 @@ +{ + diffusemap textures/editor/scripted_sequence.tga + + { + map $diffuse + blendFunc blend + } +} diff --git a/platform/base_textures.pk3dir/textures/editor/scripted_sequence.tga b/platform/base_textures.pk3dir/textures/editor/scripted_sequence.tga new file mode 100644 index 00000000..6b39c3c9 Binary files /dev/null and b/platform/base_textures.pk3dir/textures/editor/scripted_sequence.tga differ diff --git a/src/gs-entbase/server/path_track.qc b/src/gs-entbase/server/path_track.qc index faa82c7c..dcf28fa9 100644 --- a/src/gs-entbase/server/path_track.qc +++ b/src/gs-entbase/server/path_track.qc @@ -61,6 +61,7 @@ public: nonvirtual void PathEndTrigger(entity, triggermode_t); /* overrides */ + virtual void DebugDraw(void); virtual void Respawn(void); virtual void SpawnKey(string, string); virtual void Save(float); @@ -89,6 +90,25 @@ path_track::path_track(void) m_strEndTrigger = __NULL__; } +void +path_track::DebugDraw(void) +{ + vector pos = GetOrigin(); + pos[2] += 32; + R_BeginPolygon("textures/editor/path_track", 0, 0); + R_PolygonVertex(pos + v_right * 24 - v_up * 24, [1,1], [1,1,1], 1.0f); + R_PolygonVertex(pos - v_right * 24 - v_up * 24, [0,1], [1,1,1], 1.0f); + R_PolygonVertex(pos - v_right * 24 + v_up * 24, [0,0], [1,1,1], 1.0f); + R_PolygonVertex(pos + v_right * 24 + v_up * 24, [1,0], [1,1,1], 1.0f); + R_EndPolygon(); + + R_BeginPolygon("", 0, 0); + R_PolygonVertex(GetOrigin(), [0,1], [1,1,1], 0.5f); + R_PolygonVertex(pos, [1,1], [1,1,1], 0.5f); + R_EndPolygon(); +} + + void path_track::SpawnKey(string keyName, string setValue) { diff --git a/src/gs-entbase/server/scripted_sequence.qc b/src/gs-entbase/server/scripted_sequence.qc index 4bca8574..1285e2e8 100644 --- a/src/gs-entbase/server/scripted_sequence.qc +++ b/src/gs-entbase/server/scripted_sequence.qc @@ -104,6 +104,7 @@ public: virtual void Respawn(void); virtual void SpawnKey(string,string); virtual void Touch(entity); + virtual void DebugDraw(void); nonvirtual void RunOnEntity(entity); nonvirtual void InitIdle(void); @@ -128,6 +129,25 @@ scripted_sequence::scripted_sequence(void) m_iMove = 0i; } +void +scripted_sequence::DebugDraw(void) +{ + vector pos = GetOrigin(); + pos[2] += 32; + + R_BeginPolygon("textures/editor/scripted_sequence", 0, 0); + R_PolygonVertex(pos + v_right * 24 - v_up * 24, [1,1], [1,1,1], 1.0f); + R_PolygonVertex(pos - v_right * 24 - v_up * 24, [0,1], [1,1,1], 1.0f); + R_PolygonVertex(pos - v_right * 24 + v_up * 24, [0,0], [1,1,1], 1.0f); + R_PolygonVertex(pos + v_right * 24 + v_up * 24, [1,0], [1,1,1], 1.0f); + R_EndPolygon(); + + R_BeginPolygon("", 0, 0); + R_PolygonVertex(GetOrigin(), [0,1], [1,1,1], 0.5); + R_PolygonVertex(pos, [1,1], [1,1,1], 0.5); + R_EndPolygon(); +} + void scripted_sequence::Save(float handle) { diff --git a/src/server/entry.qc b/src/server/entry.qc index e4dbc12d..1ff831a3 100644 --- a/src/server/entry.qc +++ b/src/server/entry.qc @@ -92,7 +92,9 @@ ClientDisconnect(void) pl.Disappear(); pl.classname = ""; pl.flags = 0; - + pl.deaths = 0; + pl.frags = 0; + pl.score = 0; } /** Called by the `kill` console command. @@ -161,7 +163,10 @@ PutClientInServer(void) } Plugin_PlayerEntered((NSClientPlayer)self); - bprint(PRINT_HIGH, sprintf("%s^d entered the game.\n", self.netname)); + + if (g_grMode.IsMultiplayer() == true && self.deaths <= 0) { + bprint(PRINT_HIGH, sprintf("%s^d entered the game.\n", self.netname)); + } /* activate all game_playerspawn entities */ for (entity a = world; (a = find(a, ::targetname, "game_playerspawn"));) { diff --git a/src/server/nodes.qc b/src/server/nodes.qc index 0d493787..9a5357bd 100644 --- a/src/server/nodes.qc +++ b/src/server/nodes.qc @@ -286,38 +286,5 @@ SV_AddDebugPolygons(void) R_PolygonVertex(w->origin + v_right * 8 + v_up * 8, [1,0], NODE_RECT_COLOR, NODE_RECT_ALPHA); R_EndPolygon(); } - - for (entity s = world; (s = find(s, ::classname, "path_track"));) { - vector pos = s.origin; - pos[2] += 32; - R_BeginPolygon("textures/dev/path_track", 0, 0); - R_PolygonVertex(pos + v_right * 24 - v_up * 24, [1,1], [1,1,1], 1.0f); - R_PolygonVertex(pos - v_right * 24 - v_up * 24, [0,1], [1,1,1], 1.0f); - R_PolygonVertex(pos - v_right * 24 + v_up * 24, [0,0], [1,1,1], 1.0f); - R_PolygonVertex(pos + v_right * 24 + v_up * 24, [1,0], [1,1,1], 1.0f); - R_EndPolygon(); - - R_BeginPolygon("", 0, 0); - R_PolygonVertex(s.origin, [0,1], [1,1,1], NODE_LINE_ALPHA); - R_PolygonVertex(pos, [1,1], [1,1,1], NODE_LINE_ALPHA); - R_EndPolygon(); - } - - for (entity s = world; (s = find(s, ::classname, "scripted_sequence"));) { - vector pos = s.origin; - pos[2] += 32; - - R_BeginPolygon("textures/dev/scripted_sequence", 0, 0); - R_PolygonVertex(pos + v_right * 24 - v_up * 24, [1,1], SEQUENCE_RECT_COLOR, NODE_RECT_ALPHA); - R_PolygonVertex(pos - v_right * 24 - v_up * 24, [0,1], SEQUENCE_RECT_COLOR, NODE_RECT_ALPHA); - R_PolygonVertex(pos - v_right * 24 + v_up * 24, [0,0], SEQUENCE_RECT_COLOR, NODE_RECT_ALPHA); - R_PolygonVertex(pos + v_right * 24 + v_up * 24, [1,0], SEQUENCE_RECT_COLOR, NODE_RECT_ALPHA); - R_EndPolygon(); - - R_BeginPolygon("", 0, 0); - R_PolygonVertex(s.origin, [0,1], [1,1,1], NODE_LINE_ALPHA); - R_PolygonVertex(pos, [1,1], [1,1,1], NODE_LINE_ALPHA); - R_EndPolygon(); - } } #endif