From 4347bd4648d9315f81c43fe093cb4a6b6ef8a030 Mon Sep 17 00:00:00 2001 From: perle Date: Wed, 31 Jul 2024 23:13:00 +0200 Subject: [PATCH] Revert "updated entities.def for 4TCTF" This reverts commit e063f6a4fd5a9da3c6ef6abd101a91c961a2534e. --- engine/code/qcommon/q_shared.h | 2 +- q3rallycode.ppr | Bin 32232 -> 34265 bytes .../q3rally.game/baseq3r/entities.def | 68 +++--------------- 3 files changed, 12 insertions(+), 58 deletions(-) diff --git a/engine/code/qcommon/q_shared.h b/engine/code/qcommon/q_shared.h index 899a2ba4..3c6aeff3 100644 --- a/engine/code/qcommon/q_shared.h +++ b/engine/code/qcommon/q_shared.h @@ -70,7 +70,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define BASETA "missionpack" #ifndef PRODUCT_VERSION -#define PRODUCT_VERSION "v0.5 r608" +#define PRODUCT_VERSION "v0.5 r607" #endif diff --git a/q3rallycode.ppr b/q3rallycode.ppr index 41e469d51eb45a94342a0b17d11d4eaee108ef20..f237ab0eaca318ff69e9e1093abe81ca0adb2f3d 100644 GIT binary patch delta 1391 zcmaKs&rcIU6vty55f&Cx6ykvv#26YgA^YaXcJ|PV9MupL96EU2< zX!dN3e*lU9hkt>Ie}E_c0WZFpWri_CZabaNd-HwoeP4h7x%Km7?fc$o`K7TC42tw* zCkq4UmSMA1quui5v*zuiFks#Cb7OT;y;u261Kga;i^hCSn9nd*CpJ2+F2AnanbT~? z9`Dv<#U2-GFv?7##Qd^1%_fC9oTSCTJRfycJ{;w$pG^j;KTOA}pNDqJ`fm8ow7Ehsw`3R>S=5C?8HuBq~QDoTbH38F_%> zb<9kqV?&q)X?{a&C9I%uZw7?*-ejo~E{| z(|#DdnjAmJ>bt-=4};ybP_r&$1XxVNpogPbZ+R3;z(NV(QLGUhTlwR3X+ ziMcTja*r$bd#VMva*^axm#g=pZTG@srNo-5VFJV?sd}l?+LiI(_{zILq!}fW+tn(0 z97J))X5|zuB2kbY=lVmRqTnhQ5gL?ZP!E@I?X^egzFq3W?%X)JBQFf}YE*F)Cnrr; ntHoXNyH7i=t3U~rMglH%yHIabq4G@O|A?3O%6XEJ1m*k%7xs^c delta 43 vcmccF&Gh0o;|BlQ$$hmVlg%2;!1U(^EkQFwUM}avqSO*wV^bY-V_q%*oB|K3 diff --git a/tools/radiant-config/radiant15-netradiant/q3rally.game/baseq3r/entities.def b/tools/radiant-config/radiant15-netradiant/q3rally.game/baseq3r/entities.def index 118ae567..94825a64 100644 --- a/tools/radiant-config/radiant15-netradiant/q3rally.game/baseq3r/entities.def +++ b/tools/radiant-config/radiant15-netradiant/q3rally.game/baseq3r/entities.def @@ -1,4 +1,4 @@ -// Q3Rally entity definition file for NetRadiant +// Quake3 Arena entity definition file for Q3Radiant // Based on draft by Suicide 20 7.30.99 and inolen 9-3-99 // Upgraded by Eutectic: eutectic@ritualistic.com // Q3Rally model defs added (info_player_start scale modified) by: To-mos 3-13-2021 @@ -2038,14 +2038,15 @@ TEAM_* ENTITIES //============================================================================= -/*QUAKED team_CTF_blueflag (0 0 1) (-16 -16 -16) (16 16 16) +/*QUAKED team_CTF_blueflag (0 .2 1) (-16 -16 -16) (16 16 16) Blue team flag for CTF games. -------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY -------- model="models/flags/b_flag.md3"*/ //============================================================================= -/*QUAKED team_CTF_blueplayer (0 0 1) (-50 -24 -24) (50 24 24) +//*QUAKED team_CTF_blueplayer (0 .2 1) (-16 -16 -24) (16 16 32) +/*QUAKED team_CTF_blueplayer (0 .2 1) (-50 -24 -24) (50 24 24) Initial Blue team spawning position for CTF games. This is where players spawn when they join the Blue team. -------- KEYS -------- target : this can point at a target_give entity for respawn freebies. @@ -2055,7 +2056,8 @@ count : number of times this spawnpoint can be used to spawn a player. Omit or s //============================================================================= -/*QUAKED team_CTF_bluespawn (0 0 1) (-50 -24 -24) (50 24 24) +//*QUAKED team_CTF_bluespawn (0 .2 1) (-16 -16 -24) (16 16 32) +/*QUAKED team_CTF_bluespawn (0 .2 1) (-50 -24 -24) (50 24 24) Blue team respawning position for CTF games. This is where Blue team players respawn after they get fragged. -------- KEYS -------- target : this can point at a target_give entity for respawn freebies. @@ -2064,14 +2066,15 @@ count : number of times this spawnpoint can be used to spawn a player. Omit or s //============================================================================= -/*QUAKED team_CTF_redflag (1 0 0) (-16 -16 -16) (16 16 16) +/*QUAKED team_CTF_redflag (1 .2 0) (-16 -16 -16) (16 16 16) Red team flag for CTF games. -------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY -------- model="models/flags/r_flag.md3"*/ //============================================================================= -/*QUAKED team_CTF_redplayer (1 0 0) (-50 -24 -24) (50 24 24) +//*QUAKED team_CTF_redplayer (1 .2 0) (-16 -16 -24) (16 16 32) +/*QUAKED team_CTF_redplayer (1 .2 0) (-50 -24 -24) (50 24 24) Initial Red team spawning position for CTF games. This is where players spawn when they join the Red team. -------- KEYS -------- target : this can point at a target_give entity for respawn freebies. @@ -2080,7 +2083,8 @@ count : number of times this spawnpoint can be used to spawn a player. Omit or s //============================================================================= -/*QUAKED team_CTF_redspawn (1 0 0) (-50 -24 -24) (50 24 24) +//*QUAKED team_CTF_redspawn (1 .2 0) (-16 -16 -24) (16 16 32) +/*QUAKED team_CTF_redspawn (1 .2 0) (-50 -24 -24) (50 24 24) Red team respawning position for CTF games. This is where Red team players respawn after they get fragged. -------- KEYS -------- target : this can point at a target_give entity for respawn freebies. @@ -2089,56 +2093,6 @@ count : number of times this spawnpoint can be used to spawn a player. Omit or s //============================================================================= -/*QUAKED team_CTF_greenflag (0 1 0) (-16 -16 -16) (16 16 16) -Green team flag for CTF games. --------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY -------- -model="models/flags/g_flag.md3"*/ - -//============================================================================= - -/*QUAKED team_CTF_greenplayer (0 1 0) (-50 -24 -24) (50 24 24) -Initial Green team spawning position for CTF games. This is where players spawn when they join the Green team. --------- KEYS -------- -target : this can point at a target_give entity for respawn freebies. -target2 : this can point at a target_give entity for respawn freebies. -count : number of times this spawnpoint can be used to spawn a player. Omit or set to 0 to set no limit.*/ - -//============================================================================= - -/*QUAKED team_CTF_greenspawn (0 1 0) (-50 -24 -24) (50 24 24) -Green team respawning position for CTF games. This is where Green team players respawn after they get fragged. --------- KEYS -------- -target : this can point at a target_give entity for respawn freebies. -target2 : this can point at a target_give entity for respawn freebies. -count : number of times this spawnpoint can be used to spawn a player. Omit or set to 0 to set no limit.*/ - -//============================================================================= - -/*QUAKED team_CTF_yellowflag (1 1 0) (-16 -16 -16) (16 16 16) -Yellow team flag for CTF games. --------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY -------- -model="models/flags/y_flag.md3"*/ - -//============================================================================= - -/*QUAKED team_CTF_yellowplayer (1 1 0) (-50 -24 -24) (50 24 24) -Initial Yellow team spawning position for CTF games. This is where players spawn when they join the Yellow team. --------- KEYS -------- -target : this can point at a target_give entity for respawn freebies. -target2 : this can point at a target_give entity for respawn freebies. -count : number of times this spawnpoint can be used to spawn a player. Omit or set to 0 to set no limit.*/ - -//============================================================================= - -/*QUAKED team_CTF_yellowspawn (1 1 0) (-50 -24 -24) (50 24 24) -Yellow team respawning position for CTF games. This is where Yellow team players respawn after they get fragged. --------- KEYS -------- -target : this can point at a target_give entity for respawn freebies. -target2 : this can point at a target_give entity for respawn freebies. -count : number of times this spawnpoint can be used to spawn a player. Omit or set to 0 to set no limit.*/ - -//============================================================================= - TRIGGER_* ENTITIES //=============================================================================