]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
22 months agoAdd Q3COMPAT_COMMON to work around #2812
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.

22 months agoMerge branch 'bones_was_here/no_clobber_DP_cmds' into 'master'
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

22 months agoRevert "Restore a safety check removed in the previous merge commit and put it in...
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.

22 months agoRestore a safety check removed in the previous merge commit and put it in better...
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)

22 months agoMerge branch 'Mario/rocket_blaster_fix' into 'master'
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

22 months agoUpdate credits
Mario [Tue, 7 Feb 2023 15:12:33 +0000 (01:12 +1000)]
Update credits

22 months agoAlso reverse trace_plane_normal to match the engine's behaviour
Mario [Tue, 7 Feb 2023 14:34:19 +0000 (00:34 +1000)]
Also reverse trace_plane_normal to match the engine's behaviour

22 months agoCheck to make sure neither entity has been freed when calling touch functions, fixes...
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

22 months agoAdd a global to enable engine physics for testing purposes
Mario [Tue, 7 Feb 2023 05:07:17 +0000 (15:07 +1000)]
Add a global to enable engine physics for testing purposes

22 months agoRemove BLASTER_SECONDARY_ATTACK, now less useful thanks to the previous commit
terencehill [Mon, 6 Feb 2023 19:07:20 +0000 (20:07 +0100)]
Remove BLASTER_SECONDARY_ATTACK, now less useful thanks to the previous commit

22 months agoClean blaster code up to reduce code and fields
terencehill [Mon, 6 Feb 2023 17:43:11 +0000 (18:43 +0100)]
Clean blaster code up to reduce code and fields

22 months agoSkip division by zero in snapback anticheat.
Rudolf Polzer [Sun, 5 Feb 2023 13:47:17 +0000 (08:47 -0500)]
Skip division by zero in snapback anticheat.

22 months agoMerge branch 'bones_was_here/warmup' into 'master'
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

22 months agoTransifex autosync
Rudolf Polzer [Sun, 5 Feb 2023 06:23:07 +0000 (07:23 +0100)]
Transifex autosync

22 months agooops, remove some testing code I accidentally put in the previous commit
terencehill [Sun, 5 Feb 2023 00:12:58 +0000 (01:12 +0100)]
oops, remove some testing code I accidentally put in the previous commit

22 months agoCount votes of eliminated players too if sv_vote_nospectators is active
terencehill [Sat, 4 Feb 2023 23:47:20 +0000 (00:47 +0100)]
Count votes of eliminated players too if sv_vote_nospectators is active

22 months agoAdd snapback detection.
Rudolf Polzer [Sat, 4 Feb 2023 15:11:16 +0000 (10:11 -0500)]
Add snapback detection.

22 months agoRemove a FIXME that's fixed
bones_was_here [Sat, 4 Feb 2023 08:04:54 +0000 (18:04 +1000)]
Remove a FIXME that's fixed

22 months agoFix the txt file.
Rudolf Polzer [Fri, 3 Feb 2023 12:16:42 +0000 (13:16 +0100)]
Fix the txt file.

22 months agoTransifex autosync
Rudolf Polzer [Fri, 3 Feb 2023 12:13:04 +0000 (13:13 +0100)]
Transifex autosync

22 months agoRemove the stupid qcc calls in check-translations.sh.
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.

22 months agocheck-translations.sh: bail out if QCC not found
Rudolf Polzer [Fri, 3 Feb 2023 12:07:52 +0000 (13:07 +0100)]
check-translations.sh: bail out if QCC not found

22 months agoMore translation damage fixing.
Rudolf Polzer [Fri, 3 Feb 2023 11:59:56 +0000 (12:59 +0100)]
More translation damage fixing.

22 months agoUndo damage to the .pot file.
Rudolf Polzer [Fri, 3 Feb 2023 11:45:32 +0000 (12:45 +0100)]
Undo damage to the .pot file.

22 months agoAdd back lost translations.
Rudolf Polzer [Fri, 3 Feb 2023 11:39:12 +0000 (12:39 +0100)]
Add back lost translations.

22 months agoTransifex autosync
Rudolf Polzer [Wed, 1 Feb 2023 14:45:26 +0000 (15:45 +0100)]
Transifex autosync

22 months agoTransifex autosync
Rudolf Polzer [Wed, 1 Feb 2023 14:39:40 +0000 (15:39 +0100)]
Transifex autosync

22 months agoTransifex autosync
Rudolf Polzer [Wed, 1 Feb 2023 06:23:49 +0000 (07:23 +0100)]
Transifex autosync

22 months agoTransifex autosync
Rudolf Polzer [Tue, 31 Jan 2023 06:23:48 +0000 (07:23 +0100)]
Transifex autosync

22 months agoTransifex autosync
Rudolf Polzer [Mon, 30 Jan 2023 06:23:48 +0000 (07:23 +0100)]
Transifex autosync

22 months agoTransifex autosync
Rudolf Polzer [Sun, 29 Jan 2023 06:24:34 +0000 (07:24 +0100)]
Transifex autosync

22 months agoTransifex autosync
Rudolf Polzer [Sat, 28 Jan 2023 06:23:48 +0000 (07:23 +0100)]
Transifex autosync

22 months agoTransifex autosync
Rudolf Polzer [Fri, 27 Jan 2023 06:23:48 +0000 (07:23 +0100)]
Transifex autosync

23 months agoTransifex autosync
Rudolf Polzer [Thu, 26 Jan 2023 06:23:56 +0000 (07:23 +0100)]
Transifex autosync

23 months agoMerge branch 'Mario/monster_lod_models' into 'master'
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

23 months agoTransifex autosync
Rudolf Polzer [Wed, 25 Jan 2023 06:23:50 +0000 (07:23 +0100)]
Transifex autosync

23 months agoMerge branch 'bones_was_here/r_ambient' into 'master'
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

23 months agoMerge branch 'drjaska/ctsdamagescorelabels' into 'master'
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

23 months agoRemove damage dealt, damage taken and ELO scoreinfo labels and therefore scoreboard...
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)

23 months agoMerge branch 'terencehill/default_server_quickmenu' into 'master'
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

23 months agoQuickmenu: allow players to make server's custom quickmenu default
terencehill [Mon, 23 Jan 2023 00:34:54 +0000 (00:34 +0000)]
Quickmenu: allow players to make server's custom quickmenu default

23 months agoUse gender-neutral pronouns when referring to the player
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

23 months agoUse gender-neutral pronouns when referring to the player
squidink7 [Mon, 23 Jan 2023 00:19:50 +0000 (00:19 +0000)]
Use gender-neutral pronouns when referring to the player

23 months agoMerge branch 'Mario/item_replacement_fix' into 'master'
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

23 months agoMerge branch 'Mario/qc_setcolor' into 'master'
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

23 months agoRemove override of engine +showscores command
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.

23 months agoTransifex autosync
Rudolf Polzer [Sun, 22 Jan 2023 06:24:27 +0000 (07:24 +0100)]
Transifex autosync

23 months agoTransifex autosync
Rudolf Polzer [Sat, 21 Jan 2023 06:23:49 +0000 (07:23 +0100)]
Transifex autosync

23 months agoTransifex autosync
Rudolf Polzer [Fri, 20 Jan 2023 06:23:50 +0000 (07:23 +0100)]
Transifex autosync

23 months agoTransifex autosync
Rudolf Polzer [Thu, 19 Jan 2023 06:23:50 +0000 (07:23 +0100)]
Transifex autosync

23 months agoTransifex autosync
Rudolf Polzer [Wed, 18 Jan 2023 06:23:47 +0000 (07:23 +0100)]
Transifex autosync

23 months agoTransifex autosync
Rudolf Polzer [Tue, 17 Jan 2023 06:23:46 +0000 (07:23 +0100)]
Transifex autosync

23 months agoFix compilation unit test derp
bones_was_here [Tue, 17 Jan 2023 05:30:30 +0000 (15:30 +1000)]
Fix compilation unit test derp

23 months agoUse correct droptofloor distance for each Quake map format
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

23 months agoAdd more name checks
terencehill [Mon, 16 Jan 2023 13:05:57 +0000 (14:05 +0100)]
Add more name checks

23 months agoFix #2798 "Armor shards stuck in ground on equinox_lightfix"
terencehill [Sat, 14 Jan 2023 22:33:15 +0000 (23:33 +0100)]
Fix #2798 "Armor shards stuck in ground on equinox_lightfix"

23 months agoTransifex autosync
Rudolf Polzer [Wed, 11 Jan 2023 06:23:46 +0000 (07:23 +0100)]
Transifex autosync

23 months agoTransifex autosync
Rudolf Polzer [Tue, 10 Jan 2023 06:23:45 +0000 (07:23 +0100)]
Transifex autosync

23 months agoTransifex autosync
Rudolf Polzer [Mon, 9 Jan 2023 06:23:51 +0000 (07:23 +0100)]
Transifex autosync

23 months agoAvoid running ColorTranslateRGB on an empty string
Mario [Sun, 8 Jan 2023 10:21:20 +0000 (20:21 +1000)]
Avoid running ColorTranslateRGB on an empty string

23 months agoSwitch to QC-based setcolor implementation, don't fall back to engine player values
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

23 months agoTransifex autosync
Rudolf Polzer [Sun, 8 Jan 2023 06:24:33 +0000 (07:24 +0100)]
Transifex autosync

23 months agoTransifex autosync
Rudolf Polzer [Sat, 7 Jan 2023 13:36:13 +0000 (14:36 +0100)]
Transifex autosync

23 months agoFix a minor typo in a comment
Mario [Sat, 7 Jan 2023 11:32:19 +0000 (21:32 +1000)]
Fix a minor typo in a comment

23 months agoRemove an unclear comment about copyentity
Mario [Sat, 7 Jan 2023 08:21:53 +0000 (18:21 +1000)]
Remove an unclear comment about copyentity

23 months agoAdd a new function to copy fields from items to replacements, fixes #2792
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

23 months agoSupport multi-stage warmups in Announcer_Time()
bones_was_here [Tue, 13 Dec 2022 05:14:43 +0000 (15:14 +1000)]
Support multi-stage warmups in Announcer_Time()

23 months agoRemove command-specific anti spam from ClientCommand_ready()
bones_was_here [Thu, 24 Nov 2022 11:54:05 +0000 (21:54 +1000)]
Remove command-specific anti spam from ClientCommand_ready()

23 months agoImprove SVQC command flood control
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.

23 months agoBlock spectators from changing their ready status
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.

23 months agoUpdate the types of some voting related globals and fields
bones_was_here [Wed, 23 Nov 2022 15:12:36 +0000 (01:12 +1000)]
Update the types of some voting related globals and fields

23 months agoRefactor Nagger_SendEntity and Net_Handle_ENT_CLIENT_NAGGER
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.

23 months agoRefactor HUD_InfoMessages()
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.

23 months agoFix HUD timer and infomessage support for g_warmup_limit -1 && (g_warmup -1 || g_warm...
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)

23 months agoUpdate hash due to some bot_think code running during countdown
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

23 months agoCampaign: don't display scoreboard player count or ReadyRestart notification
bones_was_here [Thu, 20 Oct 2022 15:30:31 +0000 (01:30 +1000)]
Campaign: don't display scoreboard player count or ReadyRestart notification

23 months agoGive bots genuine ready status, fixes not appearing ready until a human is ready
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

23 months agoRefactor ReadyCount() and handle bots properly
bones_was_here [Thu, 20 Oct 2022 15:29:21 +0000 (01:29 +1000)]
Refactor ReadyCount() and handle bots properly

23 months agoImprove end of warmup countdown abort (when player count drops too low)
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.

23 months agoImplement g_warmup > 1: manual min player setting (overrides map settings)
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)

23 months agoConvert g_warmup to an autocvar and related refactoring
bones_was_here [Tue, 11 Oct 2022 14:19:15 +0000 (00:19 +1000)]
Convert g_warmup to an autocvar and related refactoring

23 months agoMerge branch 'z411/ctf_notif_fix' into 'master'
terencehill [Thu, 5 Jan 2023 16:15:48 +0000 (16:15 +0000)]
Merge branch 'z411/ctf_notif_fix' into 'master'

Fixed notification bug in 3-4 team CTF

See merge request xonotic/xonotic-data.pk3dir!1087

23 months agoFixed notification bug in 3-4 team CTF
z411 [Thu, 5 Jan 2023 16:15:47 +0000 (16:15 +0000)]
Fixed notification bug in 3-4 team CTF

Added pickup notification for 3-4 team CTF

23 months agoMerge branch 'terencehill/gibs_config' into 'master'
LegendaryGuard [Thu, 5 Jan 2023 00:21:19 +0000 (00:21 +0000)]
Merge branch 'terencehill/gibs_config' into 'master'

Gibs: tweak settings to reduce exaggerated throw velocity

See merge request xonotic/xonotic-data.pk3dir!1114

23 months agoMerge branch 'terencehill/weapon_decals_fix' into 'master'
LegendaryGuard [Thu, 5 Jan 2023 00:20:57 +0000 (00:20 +0000)]
Merge branch 'terencehill/weapon_decals_fix' into 'master'

Fix #2777 and a related issue (about decals)

Closes #2777

See merge request xonotic/xonotic-data.pk3dir!1112

23 months agoMerge branch 'LegendaryGuard/scale_weapon_models' into 'master'
terencehill [Thu, 5 Jan 2023 00:02:04 +0000 (00:02 +0000)]
Merge branch 'LegendaryGuard/scale_weapon_models' into 'master'

Update and optimize Akordeon, Devastator, Fireball, Tuba and Vortex v_* files, scaled by -15%. Fix Fireball Gloss material, fix Tuba UVs scaled by -20% and scale v_kleinbottle by -35%

Closes #2786 and #2629

See merge request xonotic/xonotic-data.pk3dir!1113

23 months agoUpdate and optimize Akordeon, Devastator, Fireball, Tuba and Vortex v_* files, scaled...
LegendaryGuard [Thu, 5 Jan 2023 00:02:04 +0000 (00:02 +0000)]
Update and optimize Akordeon, Devastator, Fireball, Tuba and Vortex v_* files, scaled by -15%. Fix Fireball Gloss material, fix Tuba UVs scaled by -20% and scale v_kleinbottle by -35%

23 months agoMerge branch 'z411/pickup_panel' into 'master'
terencehill [Wed, 4 Jan 2023 20:40:42 +0000 (20:40 +0000)]
Merge branch 'z411/pickup_panel' into 'master'

Item Pickup panel

See merge request xonotic/xonotic-data.pk3dir!1094

23 months agoItem Pickup panel
z411 [Wed, 4 Jan 2023 20:40:42 +0000 (20:40 +0000)]
Item Pickup panel

* This panel shows the weapon or item that has been just picked up, with its icon, item name, and time of pickup.
* The time of pickup can be hidden by the client or the server (default in XPM ruleset).
* If you pick up the same item several times in a row it will show (x2, x3...) in parentheses.
* Display time, fade out time and icon size can all be configured. The size of its contents automatically change size to fit the panel size.

23 months agoMerge branch 'Mario/ammo_panel_alphabetical' into 'master'
terencehill [Mon, 2 Jan 2023 23:58:55 +0000 (23:58 +0000)]
Merge branch 'Mario/ammo_panel_alphabetical' into 'master'

Clean up ammo sorting in the HUD to not reference items directly

See merge request xonotic/xonotic-data.pk3dir!1121

23 months agoClean up ammo sorting in the HUD to not reference items directly
Mario [Mon, 2 Jan 2023 23:58:54 +0000 (23:58 +0000)]
Clean up ammo sorting in the HUD to not reference items directly

23 months agoMerge branch 'Mario/no_engine_physics' into 'master'
bones_was_here [Mon, 2 Jan 2023 16:02:47 +0000 (16:02 +0000)]
Merge branch 'Mario/no_engine_physics' into 'master'

Make all entities (such as monsters and turrets) use physics logic handled by Xonotic rather than the engine, allowing for future advancements in movement and gameplay

See merge request xonotic/xonotic-data.pk3dir!1044

23 months agoMore whitespace fixes
terencehill [Sun, 1 Jan 2023 12:15:43 +0000 (13:15 +0100)]
More whitespace fixes

23 months agoDisplay ammo types in the Items Stats panel in the same order as the Ammo panel
terencehill [Sun, 1 Jan 2023 12:13:54 +0000 (13:13 +0100)]
Display ammo types in the Items Stats panel in the same order as the Ammo panel

Implemented by rearranging ammo registration calls. Also fixed some whitespace.

23 months agoRevert "Add brackets around the nested viewmodel draw call, seems to fix a strange...
Mario [Sun, 1 Jan 2023 08:48:14 +0000 (18:48 +1000)]
Revert "Add brackets around the nested viewmodel draw call, seems to fix a strange case of weapon models disappearing"

This reverts commit e02b28a21e077b9d74bcd6bb610e684ae6abd4ba.

23 months agoAdd brackets around the nested viewmodel draw call, seems to fix a strange case of...
Mario [Sun, 1 Jan 2023 04:10:25 +0000 (14:10 +1000)]
Add brackets around the nested viewmodel draw call, seems to fix a strange case of weapon models disappearing

23 months agoMerge branch 'bones_was_here/gunoffset' into 'master'
terencehill [Sat, 31 Dec 2022 23:37:05 +0000 (23:37 +0000)]
Merge branch 'bones_was_here/gunoffset' into 'master'

Implement cl_gunoffset and related fixes and refactoring

Closes #2374 and #2017

See merge request xonotic/xonotic-data.pk3dir!1100

23 months agoMerge branch 'Mario/simple_ammo_pickupevalfunc' into 'master'
terencehill [Sat, 31 Dec 2022 17:49:15 +0000 (17:49 +0000)]
Merge branch 'Mario/simple_ammo_pickupevalfunc' into 'master'

Clean up ammo_pickupevalfunc to not reference items directly

See merge request xonotic/xonotic-data.pk3dir!1120

23 months agoClean up ammo_pickupevalfunc to not reference items directly
Mario [Sat, 31 Dec 2022 17:49:15 +0000 (17:49 +0000)]
Clean up ammo_pickupevalfunc to not reference items directly

23 months agoMerge branch 'z411/annce_queue' into 'master'
bones_was_here [Sat, 31 Dec 2022 12:17:55 +0000 (12:17 +0000)]
Merge branch 'z411/annce_queue' into 'master'

Implemented announcer queue

Closes #1358

See merge request xonotic/xonotic-data.pk3dir!1075