]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
terencehill [Wed, 6 Nov 2024 13:09:41 +0000 (13:09 +0000)]
Merge branch 'Mario/load_autoscreenshot_file' into 'master'
Automatically load entity data created by the create_scrshot_ent command
See merge request xonotic/xonotic-data.pk3dir!1357
terencehill [Wed, 6 Nov 2024 13:08:55 +0000 (13:08 +0000)]
Merge branch 'drjaska/sens-setting' into 'master'
Settings: Mouse sensitivity: added a text input box next to the slider
Closes #2833
See merge request xonotic/xonotic-data.pk3dir!1167
Dr. Jaska [Wed, 6 Nov 2024 13:08:55 +0000 (13:08 +0000)]
Settings: Mouse sensitivity: added a text input box next to the slider
Rudolf Polzer [Mon, 4 Nov 2024 06:23:18 +0000 (07:23 +0100)]
Transifex autosync
Rudolf Polzer [Sun, 3 Nov 2024 06:23:15 +0000 (07:23 +0100)]
Transifex autosync
Rudolf Polzer [Sun, 3 Nov 2024 01:41:52 +0000 (21:41 -0400)]
Unbreak compile with gmqcc by performing
01157543f102ad69e8d08885e20113b77776bf17 only in fteqcc.
Rudolf Polzer [Sun, 3 Nov 2024 01:36:59 +0000 (21:36 -0400)]
Explicitly support compile using current fteqcc.
To do so, use:
make -C data/xonotic-data.pk3dir/qcsrc ../progs.dat QCC=$HOME/Downloads/fteqw/build/fteqcc
Rudolf Polzer [Sun, 3 Nov 2024 01:19:32 +0000 (21:19 -0400)]
Do not overwrite builtins defined in dpextensions.
Instead, use our own variables for this.
Fixes compile with fteqcc.
Rudolf Polzer [Sun, 3 Nov 2024 01:03:08 +0000 (21:03 -0400)]
Fix some inconsistent ifdeffery.
Note that the function changed can't actually be called unless KEEP_ROLL
is defined, which Xonotic does not define.
Rudolf Polzer [Sat, 2 Nov 2024 06:23:17 +0000 (07:23 +0100)]
Transifex autosync
terencehill [Fri, 1 Nov 2024 21:16:22 +0000 (22:16 +0100)]
Add proper en_GB entry to the language list
terencehill [Fri, 1 Nov 2024 21:12:37 +0000 (21:12 +0000)]
Merge branch 'terencehill/trigger_hurt_messages' into 'master'
trigger_hurt death message patch
Closes #2933
See merge request xonotic/xonotic-data.pk3dir!1375
terencehill [Fri, 1 Nov 2024 21:11:45 +0000 (21:11 +0000)]
Merge branch 'drjaska/credits-update' into 'master'
Update credits
See merge request xonotic/xonotic-data.pk3dir!1379
Dr. Jaska [Fri, 1 Nov 2024 21:11:45 +0000 (21:11 +0000)]
Update credits
terencehill [Fri, 1 Nov 2024 21:11:06 +0000 (21:11 +0000)]
Merge branch 'terencehill/stats_fix' into 'master'
Fix int and bool STATs working as float STATs
See merge request xonotic/xonotic-data.pk3dir!1352
terencehill [Thu, 31 Oct 2024 22:01:05 +0000 (23:01 +0100)]
Reduce code duplication in REGISTER_STAT
This change slightly improves compilation performance since it avoids generating about 120KB of completely useless qc code both from server and client code
terencehill [Thu, 31 Oct 2024 21:56:44 +0000 (22:56 +0100)]
Fix int and bool STATs working as float STATs
Dr. Jaska [Thu, 31 Oct 2024 13:34:16 +0000 (13:34 +0000)]
Merge branch 'Mario/plasma_removal' into 'master'
Remove the unused Plasma ammo type
Closes #2936
See merge request xonotic/xonotic-data.pk3dir!1372
terencehill [Thu, 31 Oct 2024 13:28:40 +0000 (14:28 +0100)]
Hook code: minor optimizations and cleanups
Optimizations:
- calculate dir without using normalize
- reduce scope of some variables
Cleanups:
- remove useless and outdated installation instructions
- fix mixed indentation in 2 functions (now hook.qc is fully indented with tabs)
- don't mention cvar values next to autocvars
terencehill [Thu, 31 Oct 2024 12:02:08 +0000 (13:02 +0100)]
Indent with tabs the only 2 functions indented with spaces in chat.qc; while at it shorten a few lines
terencehill [Thu, 31 Oct 2024 11:47:40 +0000 (12:47 +0100)]
havocbot_chooseweapon: minor optimizations and cleanups
Optimizations:
- Simplify combo_time calculation
- Calculate distance only when needed
Rudolf Polzer [Wed, 30 Oct 2024 16:57:24 +0000 (12:57 -0400)]
Fix the bounds check issue for real.
No idea _why_ we get here with a null weaponentity though.
Rudolf Polzer [Wed, 30 Oct 2024 16:50:40 +0000 (12:50 -0400)]
Fix another invalid array access.
Rudolf Polzer [Wed, 30 Oct 2024 16:41:51 +0000 (12:41 -0400)]
Fix an out of bounds array access.
Rudolf Polzer [Wed, 30 Oct 2024 06:23:16 +0000 (07:23 +0100)]
Transifex autosync
Rudolf Polzer [Tue, 29 Oct 2024 06:23:16 +0000 (07:23 +0100)]
Transifex autosync
Dr. Jaska [Fri, 25 Oct 2024 22:43:18 +0000 (22:43 +0000)]
Merge branch 'drjaska/mgdamageaccumulation' into 'master'
Machinegun cold/heat damage multipliers based on accumulated spread
See merge request xonotic/xonotic-data.pk3dir!930
drjaska [Thu, 5 Sep 2024 05:50:38 +0000 (08:50 +0300)]
Implement damage scaling based on accumulated spread
terencehill [Thu, 24 Oct 2024 19:49:04 +0000 (19:49 +0000)]
Merge branch 'terencehill/menu_textbox_fixes' into 'master'
Menu: fix some issues with text boxes
See merge request xonotic/xonotic-data.pk3dir!1378
terencehill [Thu, 24 Oct 2024 16:04:03 +0000 (16:04 +0000)]
Merge branch 'terencehill/arc-beam_more_fixes' into 'master'
Fix and optimize Arc beam code
See merge request xonotic/xonotic-data.pk3dir!1304
terencehill [Thu, 24 Oct 2024 15:59:22 +0000 (17:59 +0200)]
Update hash
terencehill [Thu, 24 Oct 2024 15:56:15 +0000 (17:56 +0200)]
Merge branch 'master' into terencehill/arc-beam_more_fixes
terencehill [Thu, 24 Oct 2024 15:53:49 +0000 (15:53 +0000)]
Merge branch 'terencehill/corpse_size_fix' into 'master'
Fix #2922 "Player corpse not resized when suiciding with a weapon"
Closes #2922
See merge request xonotic/xonotic-data.pk3dir!1376
terencehill [Thu, 24 Oct 2024 15:44:46 +0000 (17:44 +0200)]
Fix #2922 "Player corpse not resized when suiciding with a weapon"
Fixed by moving code that resizes player bbox from PlayerPostThink to EndFrame, which is executed later.
Also update hash
terencehill [Thu, 24 Oct 2024 15:42:50 +0000 (15:42 +0000)]
Merge branch 'drjaska/mgspreaddecay' into 'master'
Machinegun time based spread decay, support for inverse spread
Closes #2560
See merge request xonotic/xonotic-data.pk3dir!889
drjaska [Thu, 24 Oct 2024 05:32:00 +0000 (08:32 +0300)]
Allow for reversed spread, inaccurate to accurate
drjaska [Wed, 4 Sep 2024 18:03:25 +0000 (21:03 +0300)]
Rework Machinegun's spread to be time-based
Rudolf Polzer [Tue, 22 Oct 2024 05:23:18 +0000 (07:23 +0200)]
Transifex autosync
Dr. Jaska [Mon, 21 Oct 2024 20:04:58 +0000 (20:04 +0000)]
Merge branch 'Mario/spawn_unique' into 'master'
Add Spawn Unique mutator to prevent spawning at the same spawn point twice in a row
See merge request xonotic/xonotic-data.pk3dir!1335
Mario [Mon, 21 Oct 2024 20:04:57 +0000 (20:04 +0000)]
Add Spawn Unique mutator to prevent spawning at the same spawn point twice in a row
terencehill [Mon, 21 Oct 2024 10:41:07 +0000 (10:41 +0000)]
Merge branch 'Mario/chase_reticle' into 'master'
Hide the zoom scope while in third person mode
Closes #2870
See merge request xonotic/xonotic-data.pk3dir!1377
Mario [Mon, 21 Oct 2024 10:41:06 +0000 (10:41 +0000)]
Hide the zoom scope while in third person mode
terencehill [Mon, 21 Oct 2024 10:41:01 +0000 (10:41 +0000)]
Merge branch 'drjaska/genmod' into 'master'
Reformat genmod.sh
See merge request xonotic/xonotic-data.pk3dir!1337
Dr. Jaska [Mon, 21 Oct 2024 10:41:01 +0000 (10:41 +0000)]
Reformat genmod.sh
Dr. Jaska [Sun, 20 Oct 2024 02:50:32 +0000 (02:50 +0000)]
Merge branch 'drjaska/race-respawn-impulse-141' into 'master'
Remove "tried to use cheat 'impulse 141'" console spam from Race/CTS
Closes #2862
See merge request xonotic/xonotic-data.pk3dir!1347
drjaska [Wed, 4 Sep 2024 09:51:54 +0000 (12:51 +0300)]
Fix #2862 "Remove "tried to use cheat 'impulse 141'" console spam from Race/CTS"
https://gitlab.com/xonotic/xonotic-data.pk3dir/-/issues/2862
terencehill [Fri, 18 Oct 2024 16:12:21 +0000 (18:12 +0200)]
Menu text boxes: don't allow drawing text over the scrollbar
terencehill [Fri, 18 Oct 2024 16:03:31 +0000 (18:03 +0200)]
Menu text boxes: fix a couple issues after screen resolution change:
1. Text wasn't rewrapped correctly for all text boxes
2. campaign and welcome text boxes displayed line feeds as unprintable characters
Also remove TOS dialogs' .text attribute since it's redundant now
terencehill [Thu, 17 Oct 2024 17:58:58 +0000 (17:58 +0000)]
Merge branch 'Mario/monster_kill_credit' into 'master'
Count frags by spawned monsters as murders
Closes #2750
See merge request xonotic/xonotic-data.pk3dir!1348
Rudolf Polzer [Wed, 16 Oct 2024 05:23:16 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Mon, 14 Oct 2024 11:15:43 +0000 (13:15 +0200)]
Replace # with attacker name in trigger_hurt entity murder message
terencehill [Fri, 11 Oct 2024 16:31:31 +0000 (18:31 +0200)]
Show trigger_hurt entity messages if present on trigger_hurt kill. FIXME: # should be replaced with attacker name in murder message
Rudolf Polzer [Sat, 12 Oct 2024 05:23:14 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Fri, 11 Oct 2024 10:49:27 +0000 (12:49 +0200)]
Show a translatable message when player is killed by trigger_hurt even if they weren't pushed by another player
terencehill [Fri, 11 Oct 2024 00:07:02 +0000 (02:07 +0200)]
Fix #2937 "Division by 0 error if starting the match while zoomed in"
terencehill [Thu, 10 Oct 2024 10:56:30 +0000 (12:56 +0200)]
Fix #2939 "New Toys showing up as an active modification"
Client code was wrongly building the active mutator list from local cvars when no mutator is active on the server
Rudolf Polzer [Thu, 10 Oct 2024 05:23:13 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Wed, 9 Oct 2024 18:05:07 +0000 (20:05 +0200)]
Merge branch 'master' into terencehill/arc-beam_more_fixes
# Conflicts:
# qcsrc/common/weapons/weapon/arc.qc
terencehill [Wed, 9 Oct 2024 16:27:20 +0000 (16:27 +0000)]
Merge branch 'des/race_cp_net_speed' into 'master'
Network player speed on checkpoints messages and use it for strafehud start speed
Closes #2863
See merge request xonotic/xonotic-data.pk3dir!1364
Des - [Wed, 9 Oct 2024 16:27:20 +0000 (16:27 +0000)]
Network player speed on checkpoints messages and use it for strafehud start speed
Rudolf Polzer [Wed, 9 Oct 2024 05:23:16 +0000 (07:23 +0200)]
Transifex autosync
Mario [Wed, 9 Oct 2024 01:28:10 +0000 (11:28 +1000)]
Remove the unused Plasma ammo type
terencehill [Tue, 8 Oct 2024 18:12:57 +0000 (18:12 +0000)]
Merge branch 'k9er/autodemo-keep-matches' into 'master'
Add cl_autodemo_delete_keepmatches cvar
See merge request xonotic/xonotic-data.pk3dir!1366
k9er [Tue, 8 Oct 2024 18:12:57 +0000 (18:12 +0000)]
Add cl_autodemo_delete_keepmatches cvar
Similar to `cl_autodemo_delete_keeprecords`, doesn't delete any demos where the player joined the match. Useful for non-race non-cts gamemodes.
Rudolf Polzer [Tue, 8 Oct 2024 05:23:18 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Mon, 7 Oct 2024 22:22:15 +0000 (00:22 +0200)]
Run qcsrc/tools/genmod.sh
terencehill [Mon, 7 Oct 2024 22:21:31 +0000 (22:21 +0000)]
Merge branch 'k9er/rename-intermediate' into 'master'
Rename "Intermediate %d" to "Checkpoint %d"
See merge request xonotic/xonotic-data.pk3dir!1368
k9er [Mon, 7 Oct 2024 22:21:31 +0000 (22:21 +0000)]
Rename "Intermediate %d" to "Checkpoint %d"
terencehill [Mon, 7 Oct 2024 18:05:46 +0000 (18:05 +0000)]
Merge branch 'des/remove_many_backslashes' into 'master'
Chat: Remove support for \ as escape character for everything but "\\", "\n" and "\%".
Closes #2529
See merge request xonotic/xonotic-data.pk3dir!1369
drjaska [Wed, 4 Sep 2024 09:51:31 +0000 (12:51 +0300)]
Allow logless cheat legality checks
terencehill [Sun, 6 Oct 2024 10:06:16 +0000 (12:06 +0200)]
Fix wrong initialization of it.tur_head.aim_speed (frametime is 0.1 during worldspawn)
terencehill [Sat, 5 Oct 2024 17:15:48 +0000 (17:15 +0000)]
Merge branch 'drjaska/Makefile' into 'master'
Yoink individual prog tests from qcsrc/Makefile
See merge request xonotic/xonotic-data.pk3dir!1346
Des [Sat, 5 Oct 2024 12:45:41 +0000 (09:45 -0300)]
Remove support for \ as escape character for everything but "\\", "\n" and "\%".
Keep a warning for previously valid escape characters (except mutator ones, if they exists).
Rudolf Polzer [Sat, 5 Oct 2024 05:23:17 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Fri, 4 Oct 2024 10:30:45 +0000 (12:30 +0200)]
Simplify it.tur_head.aim_speed calculation; also remove a few outdated comments and fix some inconsistent style in turret code
terencehill [Fri, 4 Oct 2024 09:42:00 +0000 (11:42 +0200)]
Define HITTYPE constants using BIT
terencehill [Fri, 4 Oct 2024 09:40:46 +0000 (11:40 +0200)]
Fix poweroff sound played when a spectator switches to observer or disconnects if the spectated player has a powerup
Rudolf Polzer [Fri, 4 Oct 2024 05:23:16 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Thu, 3 Oct 2024 18:20:05 +0000 (20:20 +0200)]
Fix another grayed out setting in the menu.
It amends
0ef3b5b6b7
terencehill [Thu, 3 Oct 2024 17:40:34 +0000 (17:40 +0000)]
Merge branch 'Mario/hittype_spam' into 'master'
Add a spam hittype for weapon attacks that repeatedly trigger radius damage
See merge request xonotic/xonotic-data.pk3dir!1367
Mario [Thu, 3 Oct 2024 15:41:40 +0000 (01:41 +1000)]
Add a spam hittype for weapon attacks that repeatedly trigger radius damage
terencehill [Thu, 3 Oct 2024 14:21:32 +0000 (16:21 +0200)]
Remove useless vaporizer fields that I forgot to remove in !1282
It amends
be66a429a
terencehill [Thu, 3 Oct 2024 12:47:18 +0000 (12:47 +0000)]
Merge branch 'drjaska/survival-sendflags' into 'master'
Optimise sending survival statuses
See merge request xonotic/xonotic-data.pk3dir!1342
Dr. Jaska [Thu, 3 Oct 2024 12:47:18 +0000 (12:47 +0000)]
Optimise sending survival statuses
terencehill [Thu, 3 Oct 2024 12:38:38 +0000 (12:38 +0000)]
Merge branch 'Mario/ignore_cleanup' into 'master'
Move ignore functions out of the header to avoid potential inclusion errors
See merge request xonotic/xonotic-data.pk3dir!1363
Mario [Thu, 3 Oct 2024 12:38:33 +0000 (12:38 +0000)]
Move ignore functions out of the header to avoid potential inclusion errors
terencehill [Thu, 3 Oct 2024 10:09:33 +0000 (12:09 +0200)]
Fix #2890 "Several Effect settings are grayed out in current Xonotic git / autobuild"
Fixed by applying the same compatibility workaround used for settings in Settings - Video window
bones_was_here [Thu, 3 Oct 2024 08:30:11 +0000 (08:30 +0000)]
Merge branch 'bones_was_here/new_toys' into 'master'
Classify arc and shockwave as "new toys", allow "new toys" to spawn if placed by the mapper
See merge request xonotic/xonotic-data.pk3dir!1344
bones_was_here [Thu, 3 Oct 2024 08:13:09 +0000 (18:13 +1000)]
Allow weapons classified as "new toys" to spawn if placed by the mapper
See https://xonotic.org/balancevotes/24/
Changes the pipeline hash because bots may now use these weapons due to
`g_weaponarena all` in serverbench.cfg.
Signed-off-by: bones_was_here <bones_was_here@xonotic.au>
bones_was_here [Sun, 1 Sep 2024 04:35:28 +0000 (14:35 +1000)]
Classify arc and shockwave as "new toys"
These are very unfinished, some of the other "new toys" weapons are far
more polished. As with the others, they can be allowed to spawn as
placed with g_new_toys 1; g_new_toys_autoreplace 0.
Fixes shockwave being listed in nt_IsNewToy() but not having
WEP_FLAG_MUTATORBLOCKED.
Fixes item spawning and g_weaponarena all and all_available not
respecting WEP_FLAG_HIDDEN (g_warmup_allguns 1 did respect it).
Changes the pipeline hash because apparently bots have been using a
WEP_FLAG_HIDDEN weapon due to g_weaponarena all in serverbench.cfg.
Signed-off-by: bones_was_here <bones_was_here@xonotic.au>
bones_was_here [Thu, 3 Oct 2024 07:51:07 +0000 (07:51 +0000)]
Merge branch 'Spike29/ca_ft_teamspawnpoints' into 'master'
Use team spawn points (if any) by default in Clan Arena and Freeze Tag
See merge request xonotic/xonotic-data.pk3dir!1365
Spike29 [Sun, 29 Sep 2024 09:33:47 +0000 (11:33 +0200)]
Use team spawn points (if any) by default in Clan Arena, applies vote 23 of the Balance Council.
Spike29 [Sun, 29 Sep 2024 09:31:20 +0000 (11:31 +0200)]
Use team spawn points (if any) by default in Freeze Tag, applies vote 22 of the Balance Council.
terencehill [Thu, 26 Sep 2024 15:20:12 +0000 (15:20 +0000)]
Merge branch 'k9er/fix-2907' into 'master'
Remove queued cts-related kills when crossing finish line multiple times
Closes #2907
See merge request xonotic/xonotic-data.pk3dir!1362
k9er [Thu, 26 Sep 2024 15:20:12 +0000 (15:20 +0000)]
Remove queued cts-related kills when crossing finish line multiple times
Rudolf Polzer [Thu, 26 Sep 2024 05:23:21 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Wed, 25 Sep 2024 20:09:54 +0000 (22:09 +0200)]
Fix #2843 "Backwards compatibility strings for scoreboard cvars no longer needed"
terencehill [Mon, 23 Sep 2024 22:26:32 +0000 (22:26 +0000)]
Merge branch 'Mario/spiderbot_no_sprint' into 'master'
Remove sprint option from the Spiderbot vehicle
Closes #2403
See merge request xonotic/xonotic-data.pk3dir!1354
terencehill [Mon, 23 Sep 2024 19:40:32 +0000 (19:40 +0000)]
Merge branch 'Mario/observepoints' into 'master'
Make observers view from predefined locations if available
See merge request xonotic/xonotic-data.pk3dir!1356
Mario [Mon, 23 Sep 2024 19:40:32 +0000 (19:40 +0000)]
Make observers view from predefined locations if available