]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
terencehill [Thu, 3 Oct 2024 14:56:58 +0000 (16:56 +0200)]
Refactor code to remove WEP_FLAG_SPECIALATTACK checks if WEP_FLAG_HIDDEN is already checked.
This refactoring is now possible thanks to the changes of !1344, where all WEP_FLAG_SPECIALATTACK checks have been paired with WEP_FLAG_HIDDEN checks
To make sure WEP_FLAG_HIDDEN is always set on special attacks, weapon initialization code triggers a fatal error if WEP_FLAG_SPECIALATTACK is set but WEP_FLAG_HIDDEN is not.
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
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
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
terencehill [Sun, 1 Sep 2024 12:07:16 +0000 (14:07 +0200)]
Don't apply status effects ending the moment they are applied. It fixes spawnshield applied for a moment even if g_spawnshieldtime is 0
This change required a refactoring of the give command code, which now no longer needs changing internal fields of the status effects to update them
terencehill [Sun, 1 Sep 2024 11:07:17 +0000 (11:07 +0000)]
Merge branch 'des/cts_pbhook' into 'master'
Add cl_hook_race_pb to run on client when they set a new personal best time
See merge request xonotic/xonotic-data.pk3dir!1328
Des - [Sun, 1 Sep 2024 11:07:16 +0000 (11:07 +0000)]
Add cl_hook_race_pb to run on client when they set a new personal best time
Rudolf Polzer [Sun, 1 Sep 2024 05:23:20 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Sat, 31 Aug 2024 09:08:21 +0000 (09:08 +0000)]
Merge branch 'Mario/menu_developer_options' into 'master'
Clean up the use of developer in the menu and remove other weird settings
See merge request xonotic/xonotic-data.pk3dir!1323
Mario [Sat, 31 Aug 2024 09:08:21 +0000 (09:08 +0000)]
Clean up the use of developer in the menu and remove other weird settings
bones_was_here [Sat, 31 Aug 2024 08:51:58 +0000 (08:51 +0000)]
Merge branch 'bones_was_here/Q1BSP_items_droptofloor' into 'master'
Q1BSP: improve droptofloor compatibility with Quake progs
See merge request xonotic/xonotic-data.pk3dir!1327
terencehill [Sat, 31 Aug 2024 08:47:47 +0000 (08:47 +0000)]
Merge branch 'Mario/resource_item_cleanup' into 'master'
Clean up ammo displaying to not require direct item references
See merge request xonotic/xonotic-data.pk3dir!1326
Mario [Sat, 31 Aug 2024 08:47:47 +0000 (08:47 +0000)]
Clean up ammo displaying to not require direct item references
terencehill [Fri, 30 Aug 2024 14:21:32 +0000 (16:21 +0200)]
Refactor write_recordmarker to reduce engine function calls and while at it indent code with TABs
terencehill [Thu, 29 Aug 2024 09:16:44 +0000 (09:16 +0000)]
Merge branch 'des/cmd_cleancps' into 'master'
Race/CTS: Add clear_bestcptimes command to clear all your best checkpoint times
See merge request xonotic/xonotic-data.pk3dir!1332
Des - [Thu, 29 Aug 2024 09:16:44 +0000 (09:16 +0000)]
Race/CTS: Add clear_bestcptimes command to clear all your best checkpoint times
Rudolf Polzer [Thu, 29 Aug 2024 05:23:17 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Wed, 28 Aug 2024 23:50:51 +0000 (23:50 +0000)]
Merge branch 'des/race_dont_save_pb_on_demoplay' into 'master'
Don't save local record if we are just watching a demo
See merge request xonotic/xonotic-data.pk3dir!1340
terencehill [Wed, 28 Aug 2024 12:53:43 +0000 (12:53 +0000)]
Merge branch 'Spike29/campaign_french' into 'master'
Add a French translation to the Xonotic campaign
See merge request xonotic/xonotic-data.pk3dir!1338
Rudolf Polzer [Wed, 28 Aug 2024 05:23:17 +0000 (07:23 +0200)]
Transifex autosync
Rudolf Polzer [Tue, 27 Aug 2024 05:23:21 +0000 (07:23 +0200)]
Transifex autosync
Dr. Jaska [Tue, 27 Aug 2024 00:43:21 +0000 (00:43 +0000)]
Merge branch 'Mario/jetpack_powerup_settings' into 'master'
Make Jetpacks respect g_powerups and add settings to disable them individually
See merge request xonotic/xonotic-data.pk3dir!1321
Des [Mon, 26 Aug 2024 23:17:07 +0000 (20:17 -0300)]
Don't save local record if we are just watching a demo.
terencehill [Mon, 26 Aug 2024 13:33:01 +0000 (13:33 +0000)]
Merge branch 'terencehill/translatable_strings_cleanup' into 'master'
Clean up some translatable strings
See merge request xonotic/xonotic-data.pk3dir!1333
terencehill [Mon, 26 Aug 2024 12:51:21 +0000 (12:51 +0000)]
Merge branch 'drjaska/race_CheckName' into 'master'
Fix race_CheckName by actually using the given argument
Closes #2554 and #2123
See merge request xonotic/xonotic-data.pk3dir!1339
Rudolf Polzer [Mon, 26 Aug 2024 05:23:17 +0000 (07:23 +0200)]
Transifex autosync
drjaska [Mon, 26 Aug 2024 03:23:30 +0000 (06:23 +0300)]
Fix race_CheckName by actually using the given arg
// Check if the given name already exists in race rankings?
// In that case, where? (otherwise return 0)
int race_CheckName(string net_name)
terencehill [Sun, 25 Aug 2024 15:13:54 +0000 (15:13 +0000)]
Merge branch 'terencehill/blaster_attack_shared' into 'master'
Make weapons using blaster as secondary attack load settings from blaster
See merge request xonotic/xonotic-data.pk3dir!1282
Spike29 [Sun, 25 Aug 2024 15:11:44 +0000 (17:11 +0200)]
Add a French translation to the Xonotic campaign
terencehill [Sat, 24 Aug 2024 09:28:25 +0000 (09:28 +0000)]
Merge branch 'terencehill/antispam_stuff' into 'master'
Make cmd and chat anti spam systems work during timeouts
See merge request xonotic/xonotic-data.pk3dir!1334
Rudolf Polzer [Sat, 24 Aug 2024 05:23:16 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Fri, 23 Aug 2024 22:11:24 +0000 (00:11 +0200)]
Shownames: restore an early alpha check that was made exclusive to CTS by mistake in
0aa7cb88f
Rudolf Polzer [Thu, 22 Aug 2024 05:23:15 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Wed, 21 Aug 2024 14:16:07 +0000 (16:16 +0200)]
Hud editor: "Title at %s" --> "Title"
Rudolf Polzer [Wed, 21 Aug 2024 05:23:16 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Sun, 18 Aug 2024 22:50:03 +0000 (00:50 +0200)]
HUD editor: fix Chat, Vote and StrafeHud panels being visible while the settings menu of another panel is open
Rudolf Polzer [Sun, 18 Aug 2024 05:23:14 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Thu, 15 Aug 2024 14:38:37 +0000 (14:38 +0000)]
Merge branch 'des/race_honor_tracking' into 'master'
Don't save race times if player doesn't want tracking, even if we have uid2name stored
Closes #2806
See merge request xonotic/xonotic-data.pk3dir!1336
Des [Wed, 14 Aug 2024 12:58:18 +0000 (09:58 -0300)]
Don't save race times if player doesn't want tracking, even if we have uuid2name stored.
Rudolf Polzer [Wed, 14 Aug 2024 05:23:20 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Tue, 13 Aug 2024 08:51:08 +0000 (08:51 +0000)]
Merge branch 'terencehill/ctf_fixes' into 'master'
Misc CTF fixes
See merge request xonotic/xonotic-data.pk3dir!1331
Rudolf Polzer [Tue, 13 Aug 2024 05:23:18 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Tue, 13 Aug 2024 00:34:23 +0000 (02:34 +0200)]
Fix electro not leaving decals on all walls
terencehill [Mon, 12 Aug 2024 23:22:25 +0000 (01:22 +0200)]
Remove dead code after changes of the previous commit
terencehill [Mon, 12 Aug 2024 23:20:20 +0000 (01:20 +0200)]
Remove optional blaster secondary attack (copy of primary attack with slightly different settings)
Weapons using blaster as secondary attack now load settings from blaster primary
terencehill [Mon, 12 Aug 2024 23:19:01 +0000 (01:19 +0200)]
Make so that weapons using blaster as secondary attack load settings directly from blaster instead of loading their own blaster settings
It implements Balance Council vote 18 "Keep secondary/offhand blaster default settings (including vaporizer, ok*) the same as vanilla blaster defaults"
terencehill [Mon, 12 Aug 2024 22:59:46 +0000 (00:59 +0200)]
Simplify REGISTER_WEAPON, now possible thanks to the new WEP_CVAR* macros
terencehill [Sun, 11 Aug 2024 14:05:35 +0000 (16:05 +0200)]
Switch to using the WEP_CVAR* macros I added in the previous commit as they are more versatile
Rudolf Polzer [Mon, 12 Aug 2024 14:10:43 +0000 (16:10 +0200)]
Transifex autosync
Rudolf Polzer [Mon, 12 Aug 2024 14:07:51 +0000 (16:07 +0200)]
Transifex autosync
terencehill [Sun, 11 Aug 2024 13:04:17 +0000 (15:04 +0200)]
Fix weapons with blaster secondary attack improperly using damage and force settings of the blaster itself
terencehill [Sat, 10 Aug 2024 10:18:22 +0000 (12:18 +0200)]
Reduce code duplication in chat anti spam system
terencehill [Sat, 10 Aug 2024 09:05:51 +0000 (11:05 +0200)]
Make cmd and chat anti spam systems work during timeouts and make them work properly at different game speed
Chat anti spam code now works with flood time (.(flood_field)) initialized to 0, matching cmd anti spam code
terencehill [Fri, 9 Aug 2024 21:27:28 +0000 (23:27 +0200)]
Remove cruft of an outdated system against cmd name spam (not functional because .nickspamtime is never set).
cmd name is already protected by spam by the sv_clientcommand_antispam system anyway
Also remove unused floodcontrol_voice* fields
terencehill [Thu, 8 Aug 2024 21:33:42 +0000 (23:33 +0200)]
Make Domination capture message easier to translate (only the second part of the message is translatable). Also update notification argument descriptions
terencehill [Thu, 8 Aug 2024 21:01:31 +0000 (23:01 +0200)]
Replace notification color codes only in custom string arguments.
No message uses them in basic string arguments, except for player names where they shouldn't be replaced.
Also remove a pointless CCR (color code replace) call for the race_diff argument