]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
k9wolf8634 [Thu, 14 Nov 2024 15:49:52 +0000 (23:49 +0800)]
Revert
8f3e028c
Turns out there's a lot more transifex grammar issues, no point fixing
just one
otta8634 [Mon, 30 Sep 2024 17:00:30 +0000 (01:00 +0800)]
Loosen jumpspeed restrictions
Now it'll appear whenever z-velocity rises, rather than inconsistently
showing up based on whether the player was holding +jump in some cases
Also changed hud_panel_physics_speed_vertical description to reflect it
doesn't work for jumpspeed
otta8634 [Mon, 30 Sep 2024 16:36:06 +0000 (00:36 +0800)]
Change some common_physics vars to constants
Most were only used once
otta8634 [Mon, 30 Sep 2024 12:53:35 +0000 (20:53 +0800)]
Fix jumpspeed not working when !islocal
Removed the real_onground check
Player shouldn't really be onground if they're holding jump & just jumped
Couldn't find any situations where this change breaks things
otta8634 [Sat, 28 Sep 2024 12:12:51 +0000 (20:12 +0800)]
Make hud_panel_physics_update_interval a perfect float
otta8634 [Sat, 28 Sep 2024 12:05:11 +0000 (20:05 +0800)]
Make topspeed respect hud_panel_physics_update_time
Didn't do the same for jumpspeed
otta8634 [Sat, 28 Sep 2024 11:51:14 +0000 (19:51 +0800)]
Fix topspeed not being shown
Also removed some unnecessary documentation
otta8634 [Thu, 26 Sep 2024 08:52:08 +0000 (16:52 +0800)]
Make physics hud text sizing & centering consistent
Regarding jumpspeed/topspeed/speed unit:
- If only one is enabled, it'll be large, and centered
- If jumpspeed/topspeed are both drawn, they'll be equal size
- If speed unit and one other are drawn, the unit will be slightly smaller
Previously it was inconsistent
otta8634 [Wed, 25 Sep 2024 10:46:54 +0000 (18:46 +0800)]
Fix grammar in physics hud & strafehud menus
"Enable even observing" -> "Enable even if observing"
otta8634 [Wed, 25 Sep 2024 10:45:21 +0000 (18:45 +0800)]
Add jumpspeed option to the menu
It seems useful enough to be shown on the menu
otta8634 [Wed, 25 Sep 2024 08:16:28 +0000 (16:16 +0800)]
Make topspeed text larger when there's no upper text
Previously the topspeed text was limited to 60% height and shifted
downards, even when speed unit or jumpspeed weren't drawn
Now when neither are drawn it's vertically centered and up to 80% height
otta8634 [Wed, 25 Sep 2024 07:30:00 +0000 (15:30 +0800)]
Shorten some variable names in physics hud
otta8634 [Wed, 25 Sep 2024 07:21:42 +0000 (15:21 +0800)]
Add a cvar to force layout type in physics hud
Previously it was aligned vertical or horizontally automatically, unless
_acceleration_progressbar_scale was >1
Added a new cvar (hud_panel_physics_force_layout) to force layout type
otta8634 [Wed, 25 Sep 2024 07:05:02 +0000 (15:05 +0800)]
Revert physics text_scale limit changes, cleanup
Allowing text_scale > 1 properly would require DRAWSTRING_ASPECT_SCALE
Made configure default values look more realistic
Added more constants to physics.qh
Added a bit of documentation regarding panel_ar
otta8634 [Wed, 25 Sep 2024 06:00:20 +0000 (14:00 +0800)]
Fix issues with physics hud jumpspeed
Previous commit broke the previous-speed caching
Made it use xy-speed rather than xyz-speed (ignores vertical speed)
Made the cvar description reflect that it ignores vertical speed
Used previous-frame speed rather than current frame -- acceleration after
the jump would've already happened in the current frame
otta8634 [Wed, 25 Sep 2024 05:43:08 +0000 (13:43 +0800)]
Standardise physics hud code formatting
It was a bit of a mess beforehand
Also cleaned up some logic
otta8634 [Wed, 25 Sep 2024 04:47:19 +0000 (12:47 +0800)]
Cleanup common_physics code
Relocated some more pieces of code to it
Removed unnecessary cvars duplicating common_physics code things
otta8634 [Tue, 24 Sep 2024 13:40:48 +0000 (21:40 +0800)]
Add a cvar to control physics hud's movingaverage weighting
Previously it was hardcoded as 10
otta8634 [Tue, 24 Sep 2024 13:30:09 +0000 (21:30 +0800)]
Move physics-state strafehud/physics hud code to ../common_physics.qc
The physics hud and strafehud require similar calculations/variables (e.g. vel,
onslick, speed, immobile, onground, jumpheld (& keys), swimming, alive_player).
Moved all associated code to client/hud/common_physics.qc which runs before the
HUDs are drawn. This prevents duplicate code.
Consequently, includes for these huds could be cleaned up.
Updated strafehud and physics hud code accordingly.
Added GeomLerp to common/physics/player.qh for strafehud.
otta8634 [Tue, 24 Sep 2024 09:03:30 +0000 (17:03 +0800)]
Fix missing includes in common/physics/player.qh
common/physics/player.qh didn't include client/csqcmodel_hooks.qh, common/resources/cl_resources.qh,
nor lib/csqcmodel/common.qh when CSQC is defined, but all were needed.
These includes were previously added to strafehud and physics hud just so it'd compile.
Relocated to proper place now
otta8634 [Tue, 24 Sep 2024 08:13:37 +0000 (16:13 +0800)]
Add new physics cvars to export function
Also add missed includes
otta8634 [Tue, 24 Sep 2024 08:05:22 +0000 (16:05 +0800)]
Add different physics hud _acceleration_max cvar for slick
While on slick acceleration is much higher, so the default
_acceleration_max is useless until very high speeds (e.g. ~2800 qu/s).
Reuses some code from strafehud. Later a lot of the shared code should be
migrated to a shared file instead.
Currently physics hud only uses csqcplayer instead of fetching the
playermodel from the server. Using strafehud's code this too would also fix
the associated issues
otta8634 [Tue, 24 Sep 2024 07:47:47 +0000 (15:47 +0800)]
Display physics hud's max acceleration properly on config
Previously when configuring the hud, it used an acceleration value
relative to _acceleration_max. This meant players with the acceleration
text off saw no visible change when changing the cvar.
Configuring the hud now uses a static 0.45 acceleration so the change is
reflected. 0.45 was shown before with the default 1.5 _acceleration_max
otta8634 [Tue, 24 Sep 2024 07:34:39 +0000 (15:34 +0800)]
Allow hud_panel_physics_text_scale > 1
Consequently some text can be rendered "out of the hud", but this is
useful for seeing the hud's small text (units, top speed, jump speed)
otta8634 [Tue, 24 Sep 2024 05:19:09 +0000 (13:19 +0800)]
Add jump speed text to physics hud
Replaces the unit text when shown
Currently includes some extra cases such as jumppads, bouncing on an
upward ramp, etc.
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
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