]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
terencehill [Tue, 7 Mar 2023 15:36:43 +0000 (16:36 +0100)]
Merge branch 'master' into terencehill/lms_spec
terencehill [Wed, 2 Nov 2022 23:15:14 +0000 (00:15 +0100)]
LMS: correctly update last forfeiter's health and armor if they forfeited when dead
Also remove a TODO comment I resolved in the previous commit
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
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
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
Rudolf Polzer [Sun, 19 Feb 2023 06:23:13 +0000 (07:23 +0100)]
Transifex autosync
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
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.
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
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
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
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
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
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.
bones_was_here [Sat, 4 Feb 2023 08:04:54 +0000 (18:04 +1000)]
Remove a FIXME that's fixed
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
Rudolf Polzer [Mon, 30 Jan 2023 06:23:48 +0000 (07:23 +0100)]
Transifex autosync
Rudolf Polzer [Sun, 29 Jan 2023 06:24:34 +0000 (07:24 +0100)]
Transifex autosync
Rudolf Polzer [Sat, 28 Jan 2023 06:23:48 +0000 (07:23 +0100)]
Transifex autosync
Rudolf Polzer [Fri, 27 Jan 2023 06:23:48 +0000 (07:23 +0100)]
Transifex autosync
Rudolf Polzer [Thu, 26 Jan 2023 06:23:56 +0000 (07:23 +0100)]
Transifex autosync
terencehill [Wed, 25 Jan 2023 11:00:41 +0000 (11:00 +0000)]
Merge branch 'Mario/monster_lod_models' into 'master'
Add LOD models for the monsters to boost performance with lots of monsters in the map and fix some LOD related bugs
See merge request xonotic/xonotic-data.pk3dir!1069
Rudolf Polzer [Wed, 25 Jan 2023 06:23:50 +0000 (07:23 +0100)]
Transifex autosync
bones_was_here [Wed, 25 Jan 2023 05:18:21 +0000 (05:18 +0000)]
Merge branch 'bones_was_here/r_ambient' into 'master'
r_ambient: default to 0
Closes #2767 and xonotic#47
See merge request xonotic/xonotic-data.pk3dir!993
terencehill [Tue, 24 Jan 2023 17:59:47 +0000 (17:59 +0000)]
Merge branch 'drjaska/ctsdamagescorelabels' into 'master'
Remove damage dealt, damage taken and ELO scoreinfo labels and therefore scoreboard panels from modes with independent players (CTS)
See merge request xonotic/xonotic-data.pk3dir!1030
Dr. Jaska [Tue, 24 Jan 2023 17:59:47 +0000 (17:59 +0000)]
Remove damage dealt, damage taken and ELO scoreinfo labels and therefore scoreboard panels from modes with independent players (CTS)
bones_was_here [Mon, 23 Jan 2023 00:34:54 +0000 (00:34 +0000)]
Merge branch 'terencehill/default_server_quickmenu' into 'master'
Quickmenu: allow players to make server's custom quickmenu default
See merge request xonotic/xonotic-data.pk3dir!1090
terencehill [Mon, 23 Jan 2023 00:34:54 +0000 (00:34 +0000)]
Quickmenu: allow players to make server's custom quickmenu default
bones_was_here [Mon, 23 Jan 2023 00:19:51 +0000 (00:19 +0000)]
Use gender-neutral pronouns when referring to the player
Closes #2783, #2784, #2751, #2749, #2734, #2704, #2360, and #2135
See merge request xonotic/xonotic-data.pk3dir!1111
squidink7 [Mon, 23 Jan 2023 00:19:50 +0000 (00:19 +0000)]
Use gender-neutral pronouns when referring to the player
bones_was_here [Mon, 23 Jan 2023 00:01:33 +0000 (00:01 +0000)]
Merge branch 'Mario/item_replacement_fix' into 'master'
Add a new function to copy fields from items to replacements
Closes #2792
See merge request xonotic/xonotic-data.pk3dir!1124
terencehill [Sun, 22 Jan 2023 23:56:48 +0000 (23:56 +0000)]
Merge branch 'Mario/qc_setcolor' into 'master'
Switch to QC-based setcolor implementation, don't fall back to engine player values
See merge request xonotic/xonotic-data.pk3dir!1126
bones_was_here [Sun, 22 Jan 2023 20:39:42 +0000 (06:39 +1000)]
Remove override of engine +showscores command
This is unnecessary because it's duplicating the same behaviour already
implemented in DP (and FTEQW), just with a different variable name.
It should be noted that a QC command implementation will be
slower than an engine implementation.
Rudolf Polzer [Sun, 22 Jan 2023 06:24:27 +0000 (07:24 +0100)]
Transifex autosync
Rudolf Polzer [Sat, 21 Jan 2023 06:23:49 +0000 (07:23 +0100)]
Transifex autosync
Rudolf Polzer [Fri, 20 Jan 2023 06:23:50 +0000 (07:23 +0100)]
Transifex autosync
Rudolf Polzer [Thu, 19 Jan 2023 06:23:50 +0000 (07:23 +0100)]
Transifex autosync
Rudolf Polzer [Wed, 18 Jan 2023 06:23:47 +0000 (07:23 +0100)]
Transifex autosync
Rudolf Polzer [Tue, 17 Jan 2023 06:23:46 +0000 (07:23 +0100)]
Transifex autosync
bones_was_here [Tue, 17 Jan 2023 05:30:30 +0000 (15:30 +1000)]
Fix compilation unit test derp
bones_was_here [Tue, 17 Jan 2023 04:42:11 +0000 (14:42 +1000)]
Use correct droptofloor distance for each Quake map format
Fixes #2800
terencehill [Mon, 16 Jan 2023 13:05:57 +0000 (14:05 +0100)]
Add more name checks
terencehill [Sat, 14 Jan 2023 22:33:15 +0000 (23:33 +0100)]
Fix #2798 "Armor shards stuck in ground on equinox_lightfix"
Rudolf Polzer [Wed, 11 Jan 2023 06:23:46 +0000 (07:23 +0100)]
Transifex autosync
Rudolf Polzer [Tue, 10 Jan 2023 06:23:45 +0000 (07:23 +0100)]
Transifex autosync
Rudolf Polzer [Mon, 9 Jan 2023 06:23:51 +0000 (07:23 +0100)]
Transifex autosync
Mario [Sun, 8 Jan 2023 10:21:20 +0000 (20:21 +1000)]
Avoid running ColorTranslateRGB on an empty string
Mario [Sun, 8 Jan 2023 09:58:56 +0000 (19:58 +1000)]
Switch to QC-based setcolor implementation, don't fall back to engine player values
Rudolf Polzer [Sun, 8 Jan 2023 06:24:33 +0000 (07:24 +0100)]
Transifex autosync
Rudolf Polzer [Sat, 7 Jan 2023 13:36:13 +0000 (14:36 +0100)]
Transifex autosync
Mario [Sat, 7 Jan 2023 11:32:19 +0000 (21:32 +1000)]
Fix a minor typo in a comment
Mario [Sat, 7 Jan 2023 08:21:53 +0000 (18:21 +1000)]
Remove an unclear comment about copyentity
Mario [Fri, 6 Jan 2023 18:40:27 +0000 (04:40 +1000)]
Add a new function to copy fields from items to replacements, fixes #2792
bones_was_here [Tue, 13 Dec 2022 05:14:43 +0000 (15:14 +1000)]
Support multi-stage warmups in Announcer_Time()
bones_was_here [Thu, 24 Nov 2022 11:54:05 +0000 (21:54 +1000)]
Remove command-specific anti spam from ClientCommand_ready()
bones_was_here [Thu, 24 Nov 2022 11:43:40 +0000 (21:43 +1000)]
Improve SVQC command flood control
Changes to the same logic used by chat flood control which is more
progressive. The previous command flood control was only triggered if a
client managed to send more than 8 commands within 1 second, and then
it reset immediately.
Prints an informative message when flood control blocks a command.
Previously this was silent.
Special cases the client's initial connect commands, as these would
otherwise trigger the new flood logic with the current default settings.
Exempts chat commands from command flood control, as these have their
own flood control.
Simplifies the code for max perf.
bones_was_here [Wed, 23 Nov 2022 15:14:31 +0000 (01:14 +1000)]
Block spectators from changing their ready status
This is consistent with the existing behaviour of setting .ready to
false when a player switches to spectating.
Also reduces indenting and removes a condition that's no longer needed
since sv_ready_restart was removed.
bones_was_here [Wed, 23 Nov 2022 15:12:36 +0000 (01:12 +1000)]
Update the types of some voting related globals and fields
bones_was_here [Wed, 23 Nov 2022 14:59:28 +0000 (00:59 +1000)]
Refactor Nagger_SendEntity and Net_Handle_ENT_CLIENT_NAGGER
This will no longer network ready status outside of warmup_stage in the
case that some clients manage to have ready status then. This change is
made possible by the removal of sv_ready_restart in
https://gitlab.com/xonotic/xonotic-data.pk3dir/-/merge_requests/940
It also simplifies the code and no longer networks the ready status of
some SVQC entities that are not clients in the case that maxclients is
not a multiple of 8.
bones_was_here [Wed, 23 Nov 2022 14:46:55 +0000 (00:46 +1000)]
Refactor HUD_InfoMessages()
Because sv_ready_restart (ReadyRestart triggered by readying up
*without* being in warmup_stage) was removed in
https://gitlab.com/xonotic/xonotic-data.pk3dir/-/merge_requests/940
we no longer need to display any ready-related messages outside of
warmup_stage.
bones_was_here [Mon, 24 Oct 2022 18:57:35 +0000 (04:57 +1000)]
Fix HUD timer and infomessage support for g_warmup_limit -1 && (g_warmup -1 || g_warmup > 1)
bones_was_here [Sun, 23 Oct 2022 22:08:52 +0000 (08:08 +1000)]
Update hash due to some bot_think code running during countdown
bones_was_here [Thu, 20 Oct 2022 15:30:31 +0000 (01:30 +1000)]
Campaign: don't display scoreboard player count or ReadyRestart notification
bones_was_here [Thu, 20 Oct 2022 15:30:25 +0000 (01:30 +1000)]
Give bots genuine ready status, fixes not appearing ready until a human is ready
bones_was_here [Thu, 20 Oct 2022 15:29:21 +0000 (01:29 +1000)]
Refactor ReadyCount() and handle bots properly
bones_was_here [Thu, 20 Oct 2022 15:29:14 +0000 (01:29 +1000)]
Improve end of warmup countdown abort (when player count drops too low)
Respects g_warmup_allguns 1.
Previously players were left with only shotgun and blaster in the
resumed warmup when sv_ready_restart_after_countdown 0.
Fixes incomplete countdown abort when sv_ready_restart_after_countdown 1.
Allows bots to start playing again immediately when countdown is aborted.
bones_was_here [Thu, 20 Oct 2022 15:29:06 +0000 (01:29 +1000)]
Implement g_warmup > 1: manual min player setting (overrides map settings)
bones_was_here [Tue, 11 Oct 2022 14:19:15 +0000 (00:19 +1000)]
Convert g_warmup to an autocvar and related refactoring