]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
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
Rudolf Polzer [Sat, 12 Oct 2024 05:23:14 +0000 (07:23 +0200)]
Transifex autosync
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
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
bones_was_here [Sat, 21 Sep 2024 14:15:32 +0000 (14:15 +0000)]
Merge branch 'k9er/strafehud-changes' into 'master'
Strafehud fixes and additions related to W-turning, side-strafing, and angle accuracy
See merge request xonotic/xonotic-data.pk3dir!1353
k9er [Sat, 21 Sep 2024 14:15:32 +0000 (14:15 +0000)]
Strafehud fixes and additions related to W-turning, side-strafing, and angle accuracy
terencehill [Sat, 21 Sep 2024 14:09:39 +0000 (14:09 +0000)]
Merge branch 'des/quickmenu_keep' into 'master'
Implement KEEP_OPEN flag for quickmenu, and make holding CTRL coherent with it
See merge request xonotic/xonotic-data.pk3dir!1350
Des - [Sat, 21 Sep 2024 14:09:39 +0000 (14:09 +0000)]
Implement KEEP_OPEN flag for quickmenu, and make holding CTRL coherent with it
terencehill [Fri, 20 Sep 2024 20:03:41 +0000 (20:03 +0000)]
Merge branch 'Mario/infinite_ammo_start' into 'master'
Don't force all ammo values to 999 when spawning with infinite ammo
See merge request xonotic/xonotic-data.pk3dir!1314
Mario [Fri, 20 Sep 2024 20:03:40 +0000 (20:03 +0000)]
Don't force all ammo values to 999 when spawning with infinite ammo
terencehill [Sat, 14 Sep 2024 18:02:28 +0000 (18:02 +0000)]
Merge branch 'terencehill/spectator_camera_stuff' into 'master'
Spectator camera: allow switching from 3rd to 1st person camera by setting chase_active to 0
Closes #2873
See merge request xonotic/xonotic-data.pk3dir!1355
bones_was_here [Fri, 13 Sep 2024 06:23:38 +0000 (16:23 +1000)]
pipeline: update hash for stormkeep changes, prevent potential flakiness
I have isolated the cause of the hash change to
https://gitlab.com/xonotic/xonotic-maps.pk3dir/-/merge_requests/191
(only change needed to restore the previous hash is using stormkeep from
the previous autobuild 20240906_2).
DP uses nonblocking stdout on Linux by default, in theory this could
cause occasional pipeline failures that can't be reproduced.
Rudolf Polzer [Tue, 10 Sep 2024 05:23:52 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Mon, 9 Sep 2024 17:58:49 +0000 (19:58 +0200)]
Spectator camera: move code to a dedicated function
terencehill [Mon, 9 Sep 2024 15:46:24 +0000 (17:46 +0200)]
Spectator camera: allow switching from 3rd to 1st person camera by setting chase_active to 0
Mario [Mon, 9 Sep 2024 05:38:04 +0000 (15:38 +1000)]
Remove sprint option from the Spiderbot vehicle
Rudolf Polzer [Sat, 7 Sep 2024 05:27:45 +0000 (07:27 +0200)]
Transifex autosync
drjaska [Thu, 5 Sep 2024 14:27:05 +0000 (17:27 +0300)]
Mostly whitespace weapons cleanup chores
terencehill [Thu, 5 Sep 2024 13:03:27 +0000 (15:03 +0200)]
Fix indenting in qcsrc/lib/stats.qh
Mario [Thu, 5 Sep 2024 10:36:48 +0000 (20:36 +1000)]
Give kill credit to the monster's owner if they're a player
Rudolf Polzer [Thu, 5 Sep 2024 05:23:33 +0000 (07:23 +0200)]
Transifex autosync
drjaska [Wed, 4 Sep 2024 14:49:42 +0000 (17:49 +0300)]
Remove ancient untouched legacy svn files
drjaska [Wed, 4 Sep 2024 09:38:36 +0000 (12:38 +0300)]
Yoink individual prog tests from qcsrc/Makefile
Rudolf Polzer [Wed, 4 Sep 2024 05:23:20 +0000 (07:23 +0200)]
Transifex autosync
Dr. Jaska [Tue, 3 Sep 2024 10:57:15 +0000 (10:57 +0000)]
Merge branch 'drjaska/nextmap' into 'master'
Show nextmap on HUD and rewrite nextmap from cvar to cmd
See merge request xonotic/xonotic-data.pk3dir!1341
Dr. Jaska [Tue, 3 Sep 2024 10:57:07 +0000 (10:57 +0000)]
Show nextmap on HUD and rewrite nextmap from cvar to cmd
Dr. Jaska [Tue, 3 Sep 2024 10:56:40 +0000 (10:56 +0000)]
Merge branch 'drjaska/shotgun-animation-time' into 'master'
Opt-in cvar to block shotgun melee directly after a shot
See merge request xonotic/xonotic-data.pk3dir!1173
Dr. Jaska [Tue, 3 Sep 2024 10:56:35 +0000 (10:56 +0000)]
Opt-in cvar to block shotgun melee directly after a shot
terencehill [Mon, 2 Sep 2024 16:33:12 +0000 (16:33 +0000)]
Merge branch 'des/print-race-splits-v2' into 'master'
Add optional split times in infomessage hud, and print_cptimes command to display the stored splits
See merge request xonotic/xonotic-data.pk3dir!1330
Des - [Mon, 2 Sep 2024 16:33:12 +0000 (16:33 +0000)]
Add optional split times in infomessage hud, and print_cptimes command to display the stored splits
terencehill [Sun, 1 Sep 2024 12:35:30 +0000 (12:35 +0000)]
Merge branch 'terencehill/status_effect_fix' into 'master'
Fix some minor issues
See merge request xonotic/xonotic-data.pk3dir!1228
terencehill [Sun, 1 Sep 2024 12:24:22 +0000 (14:24 +0200)]
Fix `give no superweapons` giving default superweapons time
It happened because GiveStatusEffect removed superweapons status effect and this code block added it back.
terencehill [Sun, 1 Sep 2024 12:22:42 +0000 (14:22 +0200)]
Simplify buff effect time calculation
terencehill [Sun, 1 Sep 2024 12:12:09 +0000 (14:12 +0200)]
Don't allow StatusEffects_gettime to return a time in the past
By not doing so the effect would be still active in the last frame even if end time has passed.
It prevents wrong usage of the returned value, for example in Fire_AddDamage where mintime can be set to a negative value and used to apply a negative damage to the player
Removed now redundant max operations at StatusEffects_gettime call sites