]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
Nick S [Thu, 16 Feb 2023 19:35:32 +0000 (21:35 +0200)]
Merge remote-tracking branch 'origin/bones_was_here/q3compat_gravity' into morosophos/server-current4
Nick S [Thu, 16 Feb 2023 19:32:06 +0000 (21:32 +0200)]
Merge remote-tracking branch 'origin/master' into morosophos/server-current4
bones_was_here [Thu, 16 Feb 2023 16:27:59 +0000 (02:27 +1000)]
Corrections and documentation for gravity etc in physicsCPMA.cfg and physicsQ3.cfg
Adds sv_track_canjump to configs that lacked it.
bones_was_here [Thu, 16 Feb 2023 18:21:48 +0000 (04:21 +1000)]
Adjust jump pad velocity on Q3 maps to match 125fps frametime-dependent behaviour
bones_was_here [Thu, 16 Feb 2023 10:50:28 +0000 (20:50 +1000)]
Add Q3COMPAT_COMMON to work around #2812
This is needed in a number of MRs whose scope doesn't include changing
the design of the STAT macro.
Nick S [Wed, 15 Feb 2023 18:39:14 +0000 (20:39 +0200)]
Merge remote-tracking branch 'origin/Juhu/q3df_fragsfilter_flags' into morosophos/server-current4
Nick S [Wed, 15 Feb 2023 18:39:02 +0000 (20:39 +0200)]
Merge remote-tracking branch 'origin/Juhu/q3df_teleporter_flags' into morosophos/server-current4
Nick S [Wed, 15 Feb 2023 18:38:48 +0000 (20:38 +0200)]
Merge remote-tracking branch 'origin/bones_was_here/q3compat_gravity' into morosophos/server-current4
Nick S [Wed, 15 Feb 2023 18:34:09 +0000 (20:34 +0200)]
Merge remote-tracking branch 'origin/Juhu/q3_jumppads' into morosophos/server-current4
Nick S [Wed, 15 Feb 2023 18:34:01 +0000 (20:34 +0200)]
Merge remote-tracking branch 'origin/Juhu/target_speed' into morosophos/server-current4
Nick S [Wed, 15 Feb 2023 18:33:51 +0000 (20:33 +0200)]
Merge remote-tracking branch 'origin/Juhu/velocity_pads' into morosophos/server-current4
Juhu [Wed, 15 Feb 2023 15:15:46 +0000 (16:15 +0100)]
q3df compat: add support for target_fragsFilter spawnflags
Nick S [Sat, 11 Feb 2023 10:31:09 +0000 (12:31 +0200)]
Merge remote-tracking branch 'origin/master' into morosophos/server-current4
Nick S [Sat, 11 Feb 2023 10:30:53 +0000 (12:30 +0200)]
Checkpoint house integration
z411 [Thu, 9 Feb 2023 21:47:29 +0000 (21:47 +0000)]
Merge branch 'bones_was_here/no_clobber_DP_cmds' into 'master'
Remove override of engine +showscores command
See merge request xonotic/xonotic-data.pk3dir!1128
Nick S [Thu, 9 Feb 2023 11:15:48 +0000 (13:15 +0200)]
Merge remote-tracking branch 'origin/master' into morosophos/server-current4
Juhu [Thu, 9 Feb 2023 10:12:23 +0000 (11:12 +0100)]
reformat one comment inside target_speed to match the formatting of the same code inside the loop
Juhu [Wed, 8 Feb 2023 23:20:08 +0000 (00:20 +0100)]
check if already in list before pushing entities into the trigger_push_velocity tracking list, avoids console spam
terencehill [Wed, 8 Feb 2023 21:40:34 +0000 (22:40 +0100)]
Revert "Restore a safety check removed in the previous merge commit and put it in better place (matching engine behaviour)", for some reason trace_ent is allowed be NULL, my bad.
This reverts commit
1d8f8ba43f23e2d949571624ba2ae2de9cdd24a8 .
terencehill [Wed, 8 Feb 2023 21:15:51 +0000 (22:15 +0100)]
Restore a safety check removed in the previous merge commit and put it in better place (matching engine behaviour)
terencehill [Wed, 8 Feb 2023 19:08:34 +0000 (19:08 +0000)]
Merge branch 'Mario/rocket_blaster_fix' into 'master'
Check to make sure neither entity has been freed when calling touch functions
Closes #2811
See merge request xonotic/xonotic-data.pk3dir!1139
Juhu [Wed, 8 Feb 2023 17:16:19 +0000 (18:16 +0100)]
document reasoning behind new q3df teleporter spawnflags
Juhu [Wed, 8 Feb 2023 17:14:17 +0000 (18:14 +0100)]
document new static spawnflag for push entities
Juhu [Wed, 8 Feb 2023 17:03:59 +0000 (18:03 +0100)]
reformat target_speed code comments
Juhu [Wed, 8 Feb 2023 16:58:20 +0000 (17:58 +0100)]
use #define instead of const for trigger_push_velocity MAX_PUSHED constant
Juhu [Wed, 8 Feb 2023 16:42:32 +0000 (17:42 +0100)]
formatting and comment changes in target_speed entity code
Juhu [Wed, 8 Feb 2023 16:20:26 +0000 (17:20 +0100)]
use #define instead of const for trigger_push_velocity spawnflags
Juhu [Wed, 8 Feb 2023 16:18:39 +0000 (17:18 +0100)]
use #define instead of const for target_speed spawnflags
Juhu [Wed, 8 Feb 2023 16:14:32 +0000 (17:14 +0100)]
use #define instead of const for new static jump pad spawnflag
Juhu [Wed, 8 Feb 2023 16:16:09 +0000 (17:16 +0100)]
use #define instead of const for new q3df teleporter spawnflags
bones_was_here [Tue, 7 Feb 2023 06:34:21 +0000 (16:34 +1000)]
Corrections and documentation for physicsCPMA.cfg and physicsQ3.cfg
Adds sv_track_canjump to configs that lacked it.
bones_was_here [Tue, 7 Feb 2023 05:20:41 +0000 (15:20 +1000)]
Adjust jump pad velocity on Q3 maps to match 125fps frametime-dependent behaviour
Nick S [Tue, 7 Feb 2023 16:39:51 +0000 (18:39 +0200)]
Merge remote-tracking branch 'origin/Juhu/q3df_teleporter_flags' into morosophos/server-current4
Nick S [Tue, 7 Feb 2023 16:39:36 +0000 (18:39 +0200)]
Merge remote-tracking branch 'origin/master' into morosophos/server-current4
Juhu [Tue, 7 Feb 2023 15:34:31 +0000 (16:34 +0100)]
check that the entity is in fact trigger_teleport before checking for trigger_teleport spawnflags, teleport function is shared with target_teleporter
Mario [Tue, 7 Feb 2023 15:12:33 +0000 (01:12 +1000)]
Update credits
Mario [Tue, 7 Feb 2023 14:34:19 +0000 (00:34 +1000)]
Also reverse trace_plane_normal to match the engine's behaviour
Mario [Tue, 7 Feb 2023 14:26:03 +0000 (00:26 +1000)]
Check to make sure neither entity has been freed when calling touch functions, fixes #2811
Nick S [Tue, 7 Feb 2023 13:24:53 +0000 (15:24 +0200)]
Merge remote-tracking branch 'origin/bones_was_here/q3compat_gravity' into morosophos/server-current4
Nick S [Tue, 7 Feb 2023 13:24:37 +0000 (15:24 +0200)]
Merge remote-tracking branch 'origin/master' into morosophos/server-current4
bones_was_here [Tue, 7 Feb 2023 06:34:21 +0000 (16:34 +1000)]
Corrections and documentation for physicsCPMA.cfg and physicsQ3.cfg
Adds sv_track_canjump to configs that lacked it.
bones_was_here [Tue, 7 Feb 2023 05:20:41 +0000 (15:20 +1000)]
Adjust jump pad velocity on Q3 maps to match 125fps frametime-dependent behaviour
Mario [Tue, 7 Feb 2023 05:07:17 +0000 (15:07 +1000)]
Add a global to enable engine physics for testing purposes
terencehill [Mon, 6 Feb 2023 19:07:20 +0000 (20:07 +0100)]
Remove BLASTER_SECONDARY_ATTACK, now less useful thanks to the previous commit
terencehill [Mon, 6 Feb 2023 17:43:11 +0000 (18:43 +0100)]
Clean blaster code up to reduce code and fields
Nick S [Mon, 6 Feb 2023 10:30:41 +0000 (12:30 +0200)]
Merge remote-tracking branch 'origin/Juhu/q3df_teleporter_flags' into morosophos/server-current4
Nick S [Mon, 6 Feb 2023 10:30:24 +0000 (12:30 +0200)]
Merge remote-tracking branch 'origin/Juhu/target_speed' into morosophos/server-current4
Nick S [Mon, 6 Feb 2023 10:28:59 +0000 (12:28 +0200)]
Merge remote-tracking branch 'origin/Juhu/q3_jumppads' into morosophos/server-current4
Juhu [Mon, 6 Feb 2023 10:04:59 +0000 (11:04 +0100)]
fix use of STAT() macro for trigger_push and others
Juhu [Mon, 6 Feb 2023 10:06:12 +0000 (11:06 +0100)]
fix use of STAT() macro for target_speed
Juhu [Mon, 6 Feb 2023 05:31:31 +0000 (06:31 +0100)]
new spawnflag that forces q3 jump pad behaviour on xonotic maps
Juhu [Mon, 6 Feb 2023 05:17:41 +0000 (06:17 +0100)]
make code for q3df trigger_teleport flags more concise
Nick S [Sun, 5 Feb 2023 21:19:54 +0000 (23:19 +0200)]
Merge remote-tracking branch 'origin/Juhu/q3df_teleporter_flags' into morosophos/server-current4
Juhu [Sun, 5 Feb 2023 21:17:33 +0000 (22:17 +0100)]
q3df compat: implement q3df flags for trigger_teleport
Nick S [Sun, 5 Feb 2023 20:02:30 +0000 (22:02 +0200)]
Merge remote-tracking branch 'origin/Juhu/q3_jumppads' into morosophos/server-current4
Nick S [Sun, 5 Feb 2023 20:02:17 +0000 (22:02 +0200)]
Merge remote-tracking branch 'origin/master' into morosophos/server-current4
Rudolf Polzer [Sun, 5 Feb 2023 13:47:17 +0000 (08:47 -0500)]
Skip division by zero in snapback anticheat.
terencehill [Sun, 5 Feb 2023 12:34:05 +0000 (12:34 +0000)]
Merge branch 'bones_was_here/warmup' into 'master'
Implement g_warmup > 1 and related fixes and refactoring
See merge request xonotic/xonotic-data.pk3dir!1082
Rudolf Polzer [Sun, 5 Feb 2023 06:23:07 +0000 (07:23 +0100)]
Transifex autosync
Juhu [Sun, 5 Feb 2023 01:24:35 +0000 (02:24 +0100)]
q3compat: make q3 jump pad compatibility configurable
terencehill [Sun, 5 Feb 2023 00:12:58 +0000 (01:12 +0100)]
oops, remove some testing code I accidentally put in the previous commit
terencehill [Sat, 4 Feb 2023 23:47:20 +0000 (00:47 +0100)]
Count votes of eliminated players too if sv_vote_nospectators is active
Rudolf Polzer [Sat, 4 Feb 2023 15:11:16 +0000 (10:11 -0500)]
Add snapback detection.
Nick S [Sat, 4 Feb 2023 10:33:41 +0000 (12:33 +0200)]
Merge remote-tracking branch 'origin/Juhu/target_speed' into morosophos/server-current4
Juhu [Sat, 4 Feb 2023 10:27:19 +0000 (11:27 +0100)]
q3df compat: only simulate q3df target_speed bugs when using Q3COMPAT
Nick S [Sat, 4 Feb 2023 10:08:55 +0000 (12:08 +0200)]
Merge remote-tracking branch 'origin/master' into morosophos/server-current4
Nick S [Sat, 4 Feb 2023 10:08:49 +0000 (12:08 +0200)]
Merge remote-tracking branch 'origin/Juhu/velocity_pads' into morosophos/server-current4
Nick S [Sat, 4 Feb 2023 10:08:44 +0000 (12:08 +0200)]
Merge remote-tracking branch 'origin/Juhu/target_speed' into morosophos/server-current4
Nick S [Sat, 4 Feb 2023 10:08:36 +0000 (12:08 +0200)]
Merge remote-tracking branch 'origin/Juhu/strafehud-server' into morosophos/server-current4
bones_was_here [Sat, 4 Feb 2023 08:04:54 +0000 (18:04 +1000)]
Remove a FIXME that's fixed
Juhu [Sat, 4 Feb 2023 00:27:15 +0000 (01:27 +0100)]
Add patch from Juhu/strafehud-features branch: "strafehud: simplify sonar string handling code"
Juhu [Fri, 3 Feb 2023 23:59:38 +0000 (00:59 +0100)]
Add patch from Juhu/strafehud-fixes branch: "strafehud: make gradient segments calculate their appearance using the center of the segment instead of the left edge"
Juhu [Fri, 3 Feb 2023 23:38:28 +0000 (00:38 +0100)]
q3df compat: implement target_speed entity
Juhu [Fri, 3 Feb 2023 23:34:04 +0000 (00:34 +0100)]
q3df compat: trigger_push_velocity code clean up and bug fix to properly remember last MAX_PUSHED velocity jump pads
Nick S [Fri, 3 Feb 2023 18:13:42 +0000 (20:13 +0200)]
Merge remote-tracking branch 'origin/master' into morosophos/server-current4
Rudolf Polzer [Fri, 3 Feb 2023 12:16:42 +0000 (13:16 +0100)]
Fix the txt file.
Rudolf Polzer [Fri, 3 Feb 2023 12:13:04 +0000 (13:13 +0100)]
Transifex autosync
Rudolf Polzer [Fri, 3 Feb 2023 12:11:06 +0000 (13:11 +0100)]
Remove the stupid qcc calls in check-translations.sh.
Much faster and more robust this way.
Rudolf Polzer [Fri, 3 Feb 2023 12:07:52 +0000 (13:07 +0100)]
check-translations.sh: bail out if QCC not found
Rudolf Polzer [Fri, 3 Feb 2023 11:59:56 +0000 (12:59 +0100)]
More translation damage fixing.
Rudolf Polzer [Fri, 3 Feb 2023 11:45:32 +0000 (12:45 +0100)]
Undo damage to the .pot file.
Rudolf Polzer [Fri, 3 Feb 2023 11:39:12 +0000 (12:39 +0100)]
Add back lost translations.
Rudolf Polzer [Wed, 1 Feb 2023 14:45:26 +0000 (15:45 +0100)]
Transifex autosync
Rudolf Polzer [Wed, 1 Feb 2023 14:39:40 +0000 (15:39 +0100)]
Transifex autosync
Rudolf Polzer [Wed, 1 Feb 2023 06:23:49 +0000 (07:23 +0100)]
Transifex autosync
Rudolf Polzer [Tue, 31 Jan 2023 06:23:48 +0000 (07:23 +0100)]
Transifex autosync
Juhu [Tue, 31 Jan 2023 04:24:48 +0000 (05:24 +0100)]
q3df compat: do not repeatedly play jump pad effect while inside a trigger_push_velocity regardless of flags and other minor improvements
Nick S [Mon, 30 Jan 2023 20:11:21 +0000 (22:11 +0200)]
Merge remote-tracking branch 'origin/master' into morosophos/server-current4
Nick S [Mon, 30 Jan 2023 20:11:02 +0000 (22:11 +0200)]
Merge remote-tracking branch 'origin/Juhu/velocity_pads' into morosophos/server-current4
Rudolf Polzer [Mon, 30 Jan 2023 06:23:48 +0000 (07:23 +0100)]
Transifex autosync
Juhu [Mon, 30 Jan 2023 03:16:12 +0000 (04:16 +0100)]
q3df compat: minor improvements to make trigger_push_velocity behaviour more consistent when using ADD_* spawnflags
Juhu [Mon, 30 Jan 2023 02:03:19 +0000 (03:03 +0100)]
q3df compat: remove IntrusiveList in entity field for trigger_push_velocity to avoid overflow crashes
Juhu [Sun, 29 Jan 2023 14:46:47 +0000 (15:46 +0100)]
q3compat: use the correct origin for q3 jump pads
Rudolf Polzer [Sun, 29 Jan 2023 06:24:34 +0000 (07:24 +0100)]
Transifex autosync
Juhu [Sat, 28 Jan 2023 14:35:33 +0000 (15:35 +0100)]
q3df compat: handle the z component correctly in trigger_push_velocity
Rudolf Polzer [Sat, 28 Jan 2023 06:23:48 +0000 (07:23 +0100)]
Transifex autosync
Nick S [Fri, 27 Jan 2023 15:21:56 +0000 (17:21 +0200)]
Merge remote-tracking branch 'origin/Juhu/velocity_pads' into morosophos/server-current4
Juhu [Fri, 27 Jan 2023 15:14:43 +0000 (16:14 +0100)]
q3df compat: only ADD_* operations in trigger_push_velocity activate a single time per trigger touch, also don't unset onground flag while in velocity pad
Nick S [Fri, 27 Jan 2023 14:26:22 +0000 (16:26 +0200)]
Merge remote-tracking branch 'origin/Juhu/velocity_pads' into morosophos/server-current4
Nick S [Fri, 27 Jan 2023 14:26:13 +0000 (16:26 +0200)]
Merge remote-tracking branch 'origin/master' into morosophos/server-current4