]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
Nick S [Wed, 5 Apr 2023 17:16:50 +0000 (20:16 +0300)]
Merge remote-tracking branch 'origin/master' into morosophos/server-current4
terencehill [Tue, 4 Apr 2023 12:24:41 +0000 (12:24 +0000)]
Merge branch 'Juhu/strafehud-fixes' into 'master'
Improved StrafeHUD
See merge request xonotic/xonotic-data.pk3dir!1066
bones_was_here [Sun, 2 Apr 2023 20:09:33 +0000 (06:09 +1000)]
Decide if an item will spawn before precaching its assets
May help with #2799
bones_was_here [Sun, 2 Apr 2023 20:25:35 +0000 (06:25 +1000)]
Fix null ptr deref when starting map dfwc2017-6
Caused by
9b8502fe368052b4b81985084542548e6992cf72
which was needed for
b95beb262077d8f733bbee7cb0d5f4c05b7b3e2f
Nick S [Sun, 2 Apr 2023 17:35:54 +0000 (20:35 +0300)]
Merge remote-tracking branch 'origin/master' into morosophos/server-current4
Rudolf Polzer [Sun, 2 Apr 2023 05:23:09 +0000 (07:23 +0200)]
Transifex autosync
Nick S [Sat, 1 Apr 2023 16:31:04 +0000 (19:31 +0300)]
Merge remote-tracking branch 'origin/drjaska/q3df-rl-h-force' into morosophos/server-current4
drjaska [Sat, 1 Apr 2023 00:29:00 +0000 (03:29 +0300)]
move defi check first to micro-optimize
drjaska [Fri, 31 Mar 2023 23:43:16 +0000 (02:43 +0300)]
whitespace OCD
drjaska [Fri, 31 Mar 2023 23:42:09 +0000 (02:42 +0300)]
q3df rl 1.2x horizontal force in specific context
Nick S [Thu, 30 Mar 2023 18:46:58 +0000 (21:46 +0300)]
Merge remote-tracking branch 'origin/Juhu/scoreboard-strafe' into morosophos/server-current4
Nick S [Thu, 30 Mar 2023 18:45:43 +0000 (21:45 +0300)]
Merge remote-tracking branch 'origin/Juhu/strafehud-server' into morosophos/server-current4
Nick S [Thu, 30 Mar 2023 18:43:13 +0000 (21:43 +0300)]
Merge remote-tracking branch 'origin/Juhu/velocity_pads' into morosophos/server-current4
Nick S [Thu, 30 Mar 2023 18:42:20 +0000 (21:42 +0300)]
Merge remote-tracking branch 'origin/Juhu/q3df_teleporter_flags' into morosophos/server-current4
Nick S [Thu, 30 Mar 2023 18:42:11 +0000 (21:42 +0300)]
Merge remote-tracking branch 'origin/Juhu/q3df_fragsfilter_flags' into morosophos/server-current4
Juhu [Tue, 28 Mar 2023 21:11:37 +0000 (23:11 +0200)]
Merge branch 'master' into Juhu/strafehud-server
Fixed merge conflict caused by the new speed unit cvar
Juhu [Tue, 28 Mar 2023 20:58:25 +0000 (22:58 +0200)]
Add patch from Juhu/strafehud-fixes branch: "strafehud: connect the arrow to the line when drawing the angle indicator"
bones_was_here [Tue, 28 Mar 2023 14:15:42 +0000 (14:15 +0000)]
Merge branch 'bones_was_here/q3compat_gravity' into 'master'
Compensate for Q3 frametime-dependent gravity in configs and jump pad code
Closes #2187
See merge request xonotic/xonotic-data.pk3dir!1138
Juhu [Mon, 27 Mar 2023 16:43:38 +0000 (18:43 +0200)]
Merge branch 'master' into Juhu/scoreboard-strafe
Fixed compile error caused by new speed unit cvar
Juhu [Mon, 27 Mar 2023 15:55:29 +0000 (17:55 +0200)]
Merge branch 'master' into Juhu/strafehud-fixes
Fixed merge conflict caused by the new speed unit cvar
Juhu [Mon, 27 Mar 2023 07:29:57 +0000 (09:29 +0200)]
strafehud: connect the arrow to the line when drawing the angle indicator
Juhu [Thu, 16 Mar 2023 06:46:00 +0000 (07:46 +0100)]
strafehud: reformat code to match Xonotic code style
bones_was_here [Sun, 26 Mar 2023 17:33:54 +0000 (17:33 +0000)]
Merge branch 'terencehill/il_loop_fix' into 'master'
Implement safe removal of elements of an intrusive list while looping over them
Closes #2790
See merge request xonotic/xonotic-data.pk3dir!1148
Rudolf Polzer [Sun, 26 Mar 2023 05:23:09 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Fri, 24 Mar 2023 21:12:39 +0000 (22:12 +0100)]
Update hash
terencehill [Sun, 19 Mar 2023 23:19:39 +0000 (00:19 +0100)]
Add back support for nested intrusive list loops
terencehill [Sun, 19 Mar 2023 17:17:05 +0000 (18:17 +0100)]
Implement a qc version of copyentity that clears intrusive list data from the copied entity
terencehill [Sun, 19 Mar 2023 11:07:04 +0000 (11:07 +0000)]
Merge branch 'z411/speed_unit' into 'master'
Make the speed unit a global, consistent setting
Closes #2804
See merge request xonotic/xonotic-data.pk3dir!1130
z411 [Sun, 19 Mar 2023 11:07:04 +0000 (11:07 +0000)]
Make the speed unit a global, consistent setting
terencehill [Sun, 19 Mar 2023 10:59:28 +0000 (10:59 +0000)]
Merge branch 'terencehill/decals_fix' into 'master'
Fix 2 decal issues
Closes #2128
See merge request xonotic/xonotic-data.pk3dir!1127
terencehill [Fri, 17 Mar 2023 23:30:42 +0000 (00:30 +0100)]
Add some automated tests of intrusive lists when they change during a loop (run tests with sv_cmd runtest)
Rudolf Polzer [Sun, 19 Mar 2023 06:23:11 +0000 (07:23 +0100)]
Transifex autosync
terencehill [Fri, 17 Mar 2023 22:08:19 +0000 (23:08 +0100)]
Make work IL_POP (pop from tail) and IL_SHIFT (pop from head) too during a loop (these functions are currently never used). Also make sure il_prev and il_next fields of popped elements are consistently cleared
terencehill [Fri, 17 Mar 2023 18:15:50 +0000 (19:15 +0100)]
Refactor IL_CLEAR to avoid using IL_EACH which is now incompatible with it. As bonus the expanded code of IL_CLEAR is now simpler and optimized
terencehill [Fri, 17 Mar 2023 00:01:45 +0000 (01:01 +0100)]
Run genmod.sh
terencehill [Thu, 16 Mar 2023 23:36:22 +0000 (23:36 +0000)]
Merge branch 'master' into 'master'
Fix qcsrc genmod.sh including files twice
See merge request xonotic/xonotic-data.pk3dir!1129
terencehill [Thu, 16 Mar 2023 15:54:35 +0000 (16:54 +0100)]
Implement safe removal of elements of an intrusive list while looping over them. It fixes #2790 "Hitting a player with crylink primary causes `setorigin: can not modify free entity`"
bones_was_here [Mon, 13 Mar 2023 15:26:21 +0000 (01:26 +1000)]
Only set up q3compat item teaming for enabled and mapper-placed items
bones_was_here [Mon, 13 Mar 2023 15:24:41 +0000 (01:24 +1000)]
Fix an inconsistency with applying ITEM_FLAG_MUTATORBLOCKED
bones_was_here [Mon, 13 Mar 2023 15:17:06 +0000 (01:17 +1000)]
Fix mapinfo settemp of individual powerup cvars
The cvars were read before the settemps were applied.
When StartItem() calls .m_iteminit() the settemps have been applied.
bones_was_here [Mon, 13 Mar 2023 17:48:51 +0000 (03:48 +1000)]
fix pipeline: use a more stable version of stormkeep
Rudolf Polzer [Sun, 12 Mar 2023 06:23:33 +0000 (07:23 +0100)]
Transifex autosync
terencehill [Fri, 10 Mar 2023 00:14:33 +0000 (01:14 +0100)]
Print the "Incorrect parameters for ..." message with the more appropriated LOG_HELPF
terencehill [Fri, 10 Mar 2023 00:07:00 +0000 (01:07 +0100)]
Prevent errors and a few crashes running most of the server commands while the server isn't running
terencehill [Tue, 7 Mar 2023 11:52:47 +0000 (12:52 +0100)]
Listbox: don't allow double-click on non-selectable items
terencehill [Tue, 7 Mar 2023 11:22:00 +0000 (12:22 +0100)]
Show the scoreboard user interface shortcut in the keybinder
terencehill [Tue, 7 Mar 2023 11:15:38 +0000 (12:15 +0100)]
Keybinder: make sure the selected keybind is always visible when user clicks a button to edit it
terencehill [Sun, 5 Mar 2023 18:35:33 +0000 (18:35 +0000)]
Merge branch 'drjaska/mayhem' into 'master'
Mayhem and Team Mayhem gamemodes
See merge request xonotic/xonotic-data.pk3dir!884
Dr. Jaska [Sun, 5 Mar 2023 18:35:32 +0000 (18:35 +0000)]
Mayhem and Team Mayhem gamemodes
Each player spawns with 200/200 and full ammo like in LMS&CA and pickup items are removed by default, powerups are kept for extra spice but can be removed with whitelisted cvars.
Rudolf Polzer [Sun, 5 Mar 2023 06:23:09 +0000 (07:23 +0100)]
Transifex autosync
Juhu [Sat, 4 Mar 2023 19:14:54 +0000 (20:14 +0100)]
Add patch from Juhu/strafehud-fixes branch: "strafehud: if the slick detector is enabled reserve space for text indicators even if there's currently no slick being detected"
Juhu [Sat, 4 Mar 2023 19:12:43 +0000 (20:12 +0100)]
strafehud: if the slick detector is enabled reserve space for text indicators even if there's currently no slick being detected
terencehill [Fri, 3 Mar 2023 11:23:31 +0000 (12:23 +0100)]
Document item_armor25 usage in Nexuiz
terencehill [Fri, 3 Mar 2023 11:06:59 +0000 (12:06 +0100)]
Remove an unused parameter from reset_map
terencehill [Fri, 3 Mar 2023 11:02:59 +0000 (12:02 +0100)]
Give a local variable a less ambiguous name (fraglimit_override is also a cvar)
bones_was_here [Wed, 1 Mar 2023 19:39:22 +0000 (19:39 +0000)]
Merge branch 'Spike29/languages' into 'master'
Add proper names to the Indonesian and Latin translations
See merge request xonotic/xonotic-data.pk3dir!1143
Juhu [Tue, 28 Feb 2023 22:43:30 +0000 (23:43 +0100)]
add support for the target_teleporter KEEP_SPEED spawnflag, clarify origin of spectator only teleport spawnflag
Spike29 [Mon, 27 Feb 2023 22:32:06 +0000 (23:32 +0100)]
Add proper names to the Indonesian and Latin translations
Rudolf Polzer [Sun, 26 Feb 2023 06:23:08 +0000 (07:23 +0100)]
Transifex autosync
terencehill [Mon, 20 Feb 2023 18:09:12 +0000 (19:09 +0100)]
Use a temp entity to avoid linking kh_controller to the world with setmodel
terencehill [Sun, 19 Feb 2023 15:23:58 +0000 (16:23 +0100)]
Fix waypoints marked as pure but still linked to the world and with collision testing enabled
Juhu [Sun, 19 Feb 2023 09:58:04 +0000 (10:58 +0100)]
only remember one velocity pad, matches q3df behaviour. remove velocity pad think function
Rudolf Polzer [Sun, 19 Feb 2023 06:23:13 +0000 (07:23 +0100)]
Transifex autosync
Juhu [Fri, 17 Feb 2023 22:11:21 +0000 (23:11 +0100)]
q3df compat: show "x more frags needed" message when using a target_fragsFilter with insufficient frags
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 [Fri, 17 Feb 2023 07:34:28 +0000 (07:34 +0000)]
Merge branch 'Juhu/q3_jumppads' into 'master'
Jump pad trajectory origin and q3compat
See merge request xonotic/xonotic-data.pk3dir!1134
Juhu [Fri, 17 Feb 2023 07:34:28 +0000 (07:34 +0000)]
Use same jump pad trajectory origin as Q3 on Q3 maps, make that optional for Xonotic maps
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
terencehill [Wed, 8 Feb 2023 22:34:41 +0000 (23:34 +0100)]
Document the negative w_backoff factor of the hook bomb
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.