]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
bones_was_here [Fri, 7 Jul 2023 10:02:41 +0000 (20:02 +1000)]
Disable keepaway ball pickup delay
The delay was frustrating when getting a bckill in midair but being
unable to pick up the ball despite having travelled through it.
We still need to prevent instant pickup by the previous owner so the
ball can be dropped manually. Sharing a field from KH for this with the
same 0.5s delay as used when throwing a weapon.
terencehill [Mon, 13 Jan 2025 22:23:07 +0000 (22:23 +0000)]
Merge branch 'k9er/implement-2562' into 'master'
Split up nades & buffs into individual files
Closes #2562
See merge request xonotic/xonotic-data.pk3dir!1428
k9er [Mon, 13 Jan 2025 22:23:07 +0000 (22:23 +0000)]
Split up nades & buffs into individual files
terencehill [Mon, 13 Jan 2025 20:50:05 +0000 (20:50 +0000)]
Merge branch 'k9er/compress-genmod' into 'master'
Merge adjacent identical ifdefs in genmod
See merge request xonotic/xonotic-data.pk3dir!1430
k9er [Mon, 13 Jan 2025 20:50:05 +0000 (20:50 +0000)]
Merge adjacent identical ifdefs in genmod
terencehill [Mon, 13 Jan 2025 18:06:32 +0000 (18:06 +0000)]
Merge branch 'k9er/improve-wep-colors' into 'master'
Improve weapon colors, and make HLAC green
Closes #2278
See merge request xonotic/xonotic-data.pk3dir!1400
k9er [Mon, 13 Jan 2025 18:06:31 +0000 (18:06 +0000)]
Improve weapon colors, and make HLAC green
terencehill [Mon, 13 Jan 2025 17:51:26 +0000 (17:51 +0000)]
Merge branch 'k9er/give-ammo-color' into 'master'
Color the ammo hud text and progressbars
See merge request xonotic/xonotic-data.pk3dir!1416
k9er [Mon, 13 Jan 2025 17:51:25 +0000 (17:51 +0000)]
Color the ammo hud text and progressbars
Rudolf Polzer [Sat, 11 Jan 2025 06:23:16 +0000 (07:23 +0100)]
Transifex autosync
terencehill [Fri, 10 Jan 2025 22:46:59 +0000 (23:46 +0100)]
Code cleanup
* rename Superweapons class to Superweapon because class names should always be singular
* rename StatusEffects class to StatusEffect because class names should always be singular
* rename StatusEffect registry to StatusEffects because registry names should always be plural
* rename Powerup class child of StatusEffect to PowerupStatusEffect so to remove ambiguity
with Powerup child of Pickup
terencehill [Fri, 10 Jan 2025 16:38:33 +0000 (16:38 +0000)]
Merge branch 'k9er/class-refactoring' into 'master'
Various class refactors
See merge request xonotic/xonotic-data.pk3dir!1425
terencehill [Fri, 10 Jan 2025 01:26:58 +0000 (01:26 +0000)]
Merge branch 'Mario/projectile_div0_fix' into 'master'
Add a workaround for projectile fade rates in the event of ticrate being 0
See merge request xonotic/xonotic-data.pk3dir!1423
Mario [Fri, 10 Jan 2025 01:26:58 +0000 (01:26 +0000)]
Add a workaround for projectile fade rates in the event of ticrate being 0
otta8634 [Thu, 9 Jan 2025 05:29:20 +0000 (13:29 +0800)]
Fix typos made in
253640f352
otta8634 [Tue, 7 Jan 2025 14:50:14 +0000 (22:50 +0800)]
Rename .gametype_description to .m_description
.m_description is already used elsewhere.
otta8634 [Tue, 7 Jan 2025 14:45:32 +0000 (22:45 +0800)]
Rename .turret_name to .m_name
Turrets don't also use .m_name so this shouldn't introduce any regressions.
Makes it more consistent and removes one unnecessary entity field.
Mostly copied from
b416d03c68 .
otta8634 [Sun, 22 Dec 2024 16:58:25 +0000 (00:58 +0800)]
Give powerup statuseffect classes better names (cherry-pick
28ca8192ce )
This helps distinction between the Item and the StatusEffect clear for the main 4 powerups.
Also moved relevant attributes into their classes.
otta8634 [Sun, 22 Dec 2024 09:57:53 +0000 (17:57 +0800)]
Rename common/mutators/mutator/nades/nades.inc to all.inc
Noticed this inconsistency while working through all the previous edits, figured I may as well address it.
otta8634 [Fri, 20 Dec 2024 09:00:47 +0000 (17:00 +0800)]
Use m_name for vehicles and monsters (cherry-pick
2e32f2e7d3 )
Previously monster_name and vehicle_name were used, which were obviously used nowhere else.
Renamed them both to m_name so that there's less unnecessary entity fields, and for consistency's sake.
otta8634 [Fri, 20 Dec 2024 08:28:53 +0000 (16:28 +0800)]
Use the translatable strings for some default classes
The "Monster", "Buff", and "Vehicle" transifex strings already existed but weren't used here for some reason.
This is unrelated to the guide but I saw it as a good opportunity to fix this.
otta8634 [Fri, 20 Dec 2024 08:26:17 +0000 (16:26 +0800)]
Move attributes for items and nades into their classes (cherry-pick
4192f3a1af )
This makes it more consistent with weapons, buff, some powerups, monsters, and vehicles.
Also fixed issue where REGISTER_NADE had no second parameter, yet one was passed anyway.
otta8634 [Tue, 7 Jan 2025 13:49:34 +0000 (21:49 +0800)]
Rename .wpcolor to .m_color
Weapons didn't simultaneously use .m_color so this shouldn't introduce any regressions.
Removes an unnecessary entity field, and helps make the coloring of things more standardized.
otta8634 [Tue, 7 Jan 2025 13:43:12 +0000 (21:43 +0800)]
Make REGISTER_ITEM call NEW, like most other REGISTER_* macros
terencehill [Sat, 4 Jan 2025 14:11:16 +0000 (14:11 +0000)]
Merge branch 'terencehill/wepflags_stuff' into 'master'
Refactor code to remove WEP_FLAG_SPECIALATTACK checks if WEP_FLAG_HIDDEN is already checked
See merge request xonotic/xonotic-data.pk3dir!1373
terencehill [Sat, 4 Jan 2025 14:04:08 +0000 (15:04 +0100)]
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.
Dr. Jaska [Sat, 4 Jan 2025 02:07:51 +0000 (02:07 +0000)]
Merge branch 'k9er/standardize-cvar-descs' into 'master'
Standardize cvar descriptions
See merge request xonotic/xonotic-data.pk3dir!1393
k9er [Sat, 4 Jan 2025 02:07:51 +0000 (02:07 +0000)]
Standardize cvar descriptions
Rudolf Polzer [Thu, 2 Jan 2025 23:58:19 +0000 (18:58 -0500)]
Fix case of trails not being drawn on CSQC models with unset alpha.
That bug was found by Mario in
https://gitlab.com/xonotic/xonotic-data.pk3dir/-/merge_requests/1410#note_2279399941
and was actually pre-existing even before the change, as it was passing
0 to both alpha and count modifiers.
Dr. Jaska [Thu, 2 Jan 2025 23:32:52 +0000 (23:32 +0000)]
Merge branch 'Mario/relay_support' into 'master'
Add activation support to some map entities lacking it
See merge request xonotic/xonotic-data.pk3dir!1318
Mario [Thu, 2 Jan 2025 23:32:51 +0000 (23:32 +0000)]
Add activation support to some map entities lacking it
Dr. Jaska [Thu, 2 Jan 2025 23:31:25 +0000 (23:31 +0000)]
Merge branch 'drjaska/viewmodel_alpha' into 'master'
Implement cl_viewmodel_alpha_min cvar
See merge request xonotic/xonotic-data.pk3dir!1388
Dr. Jaska [Thu, 2 Jan 2025 23:31:25 +0000 (23:31 +0000)]
Implement cl_viewmodel_alpha_min cvar
Dr. Jaska [Thu, 2 Jan 2025 23:30:18 +0000 (23:30 +0000)]
Merge branch 'Mario/effect_colors' into 'master'
Add support for networked effect colors
See merge request xonotic/xonotic-data.pk3dir!1405
Mario [Thu, 2 Jan 2025 23:30:18 +0000 (23:30 +0000)]
Add support for networked effect colors
Dr. Jaska [Thu, 2 Jan 2025 23:29:56 +0000 (23:29 +0000)]
Merge branch 'Mario/reticle_minalpha' into 'master'
Give the zoom reticle a minimum opacity from zooming to make it always visible
See merge request xonotic/xonotic-data.pk3dir!1413
terencehill [Thu, 2 Jan 2025 23:27:53 +0000 (23:27 +0000)]
Merge branch 'drjaska/df_wp_stackoverflow' into 'master'
Add stack overflow safeguard to defrag_waypointsprites
See merge request xonotic/xonotic-data.pk3dir!1389
terencehill [Thu, 2 Jan 2025 23:24:44 +0000 (23:24 +0000)]
Merge branch 'k9er/random-nade' into 'master'
Allow selecting a random nade
See merge request xonotic/xonotic-data.pk3dir!1403
k9er [Thu, 2 Jan 2025 23:24:44 +0000 (23:24 +0000)]
Allow selecting a random nade
terencehill [Thu, 2 Jan 2025 16:59:11 +0000 (16:59 +0000)]
Merge branch 'divVerent/alpha_comments' into 'master'
Skip projectile alpha math if it'd be a NOP.
See merge request xonotic/xonotic-data.pk3dir!1410
terencehill [Thu, 2 Jan 2025 12:48:06 +0000 (12:48 +0000)]
Merge branch 'k9er/show-vaporizer-dmgtxt' into 'master'
Show Vaporizer damagetext when not playing InstaGib
Closes #1879
See merge request xonotic/xonotic-data.pk3dir!1397
k9er [Thu, 2 Jan 2025 12:48:06 +0000 (12:48 +0000)]
Show Vaporizer damagetext when not playing InstaGib
Mario [Thu, 2 Jan 2025 06:40:02 +0000 (16:40 +1000)]
Give the zoom reticle a minimum opacity from zooming to make it always visible
Dr. Jaska [Thu, 2 Jan 2025 01:37:20 +0000 (01:37 +0000)]
Merge branch 'Mario/monster_teamcolor_fix' into 'master'
Fix monsters preferring player colours over team colours
Closes #2953
See merge request xonotic/xonotic-data.pk3dir!1402
Mario [Thu, 2 Jan 2025 01:37:20 +0000 (01:37 +0000)]
Fix monsters preferring player colours over team colours
Dr. Jaska [Thu, 2 Jan 2025 00:59:27 +0000 (00:59 +0000)]
Merge branch 'k9er/update-player-ready-icon' into 'master'
Update the player_ready scoreboard icon
See merge request xonotic/xonotic-data.pk3dir!1395
terencehill [Thu, 2 Jan 2025 00:25:24 +0000 (00:25 +0000)]
Merge branch 'k9er/optimize-bitset-ops' into 'master'
Optimize bitset operations
See merge request xonotic/xonotic-data.pk3dir!1409
k9er [Thu, 2 Jan 2025 00:25:24 +0000 (00:25 +0000)]
Optimize bitset operations
Rudolf Polzer [Mon, 30 Dec 2024 18:06:29 +0000 (13:06 -0500)]
Skip projectile alpha math if it'd be a NOP.
Also, comment why it works the way it is, and what it'd take to possibly
remove it.
terencehill [Wed, 1 Jan 2025 23:48:07 +0000 (00:48 +0100)]
Fix time of the dropped Invisibility being read from autocvar_g_balance_powerup_invincible_time
terencehill [Wed, 1 Jan 2025 23:41:31 +0000 (23:41 +0000)]
Merge branch 'Mario/spawn_color_fix' into 'master'
Fix spawn particles sometimes showing the wrong color
Closes #2955
See merge request xonotic/xonotic-data.pk3dir!1408
Mario [Mon, 30 Dec 2024 12:46:14 +0000 (22:46 +1000)]
Move client-side spawn point code to its own file
Mario [Mon, 30 Dec 2024 12:35:53 +0000 (22:35 +1000)]
Send the team number with the spawn event to ensure an accurate team colour
Rudolf Polzer [Mon, 30 Dec 2024 06:23:12 +0000 (07:23 +0100)]
Transifex autosync
otta8634 [Mon, 23 Dec 2024 11:19:07 +0000 (19:19 +0800)]
Refactor and reformat weapons hud code a bit
Having almost all code in the one function made it a bit difficult to understand.
Rudolf Polzer [Sun, 22 Dec 2024 06:23:15 +0000 (07:23 +0100)]
Transifex autosync
otta8634 [Sat, 14 Dec 2024 10:28:49 +0000 (18:28 +0800)]
Update the player_ready scoreboard icon
Seems that the TGA is made from some outdated SVG not available on mediasource, the associated SVG in mediasource looks cleaner and is more consistent with the luma styling.
Regenerated the TGA.
terencehill [Fri, 13 Dec 2024 13:28:10 +0000 (13:28 +0000)]
Merge branch 'Mario/race_string_namelength' into 'master'
Add an option to shorten player names in checkpoint messages to reduce overflow
See merge request xonotic/xonotic-data.pk3dir!1394
terencehill [Thu, 12 Dec 2024 17:18:41 +0000 (17:18 +0000)]
Merge branch 'Mario/typehit_spam_fix' into 'master'
Don't play teamshoot sounds for damage dealt with HITTYPE_SPAM
See merge request xonotic/xonotic-data.pk3dir!1392
Mario [Thu, 12 Dec 2024 17:18:40 +0000 (17:18 +0000)]
Don't play teamshoot sounds for damage dealt with HITTYPE_SPAM
Mario [Thu, 12 Dec 2024 13:56:50 +0000 (23:56 +1000)]
Add an option to shorten player names in checkpoint messages to reduce overflow
Rudolf Polzer [Tue, 10 Dec 2024 06:23:18 +0000 (07:23 +0100)]
Transifex autosync
drjaska [Fri, 29 Nov 2024 01:31:58 +0000 (03:31 +0200)]
Add stack overflow safeguard to defrag_waypointsprites
Dr. Jaska [Tue, 3 Dec 2024 10:11:34 +0000 (10:11 +0000)]
Merge branch 'des/racetimer_speed' into 'master'
Add support for showing speed in splits to racetimer
See merge request xonotic/xonotic-data.pk3dir!1351
Des - [Tue, 3 Dec 2024 10:11:34 +0000 (10:11 +0000)]
Add support for showing speed in splits to racetimer
Dr. Jaska [Tue, 3 Dec 2024 01:57:33 +0000 (01:57 +0000)]
Merge branch 'Mario/checkpoint_recursion_fix' into 'master'
Prevent recursively applying waypoints to checkpoints
See merge request xonotic/xonotic-data.pk3dir!1390
Mario [Mon, 2 Dec 2024 07:34:35 +0000 (17:34 +1000)]
Prevent recursively applying waypoints to checkpoints
terencehill [Sat, 30 Nov 2024 10:41:53 +0000 (11:41 +0100)]
Oops, forgot to remove debugging code in the previous commit
terencehill [Sat, 30 Nov 2024 10:24:10 +0000 (11:24 +0100)]
Physics code: calculate wishdir without using normalize and apply other minor math optimizations
The different wishdir formula causes a hash change despite the meaningless difference in the output
terencehill [Sat, 30 Nov 2024 10:04:31 +0000 (10:04 +0000)]
Merge branch 'Mario/electro_combo_over_time' into 'master'
Add an option for Electro combos to deal damage over time
Minor tweak to the combo particle effect to give it a more pronounced border
See merge request xonotic/xonotic-data.pk3dir!1067
Mario [Sat, 30 Nov 2024 10:04:31 +0000 (10:04 +0000)]
Add an option for Electro combos to deal damage over time
Minor tweak to the combo particle effect to give it a more pronounced border
terencehill [Thu, 28 Nov 2024 15:16:12 +0000 (15:16 +0000)]
Merge branch 'des/defragcp_gen_fix2' into 'master'
Fix wrong numbering on target_checkpoints with duplicate targetname
See merge request xonotic/xonotic-data.pk3dir!1374
terencehill [Thu, 28 Nov 2024 15:15:09 +0000 (15:15 +0000)]
Merge branch 'drjaska/q3df-rl-h-force' into 'master'
q3compat: New Devastator cvar for mimicking q3df rl's horizontal force 1.2x multiplier
See merge request xonotic/xonotic-data.pk3dir!1161
Dr. Jaska [Thu, 28 Nov 2024 15:15:08 +0000 (15:15 +0000)]
q3compat: New Devastator cvar for mimicking q3df rl's horizontal force 1.2x multiplier
Dr. Jaska [Thu, 28 Nov 2024 03:43:10 +0000 (03:43 +0000)]
Merge branch 'Mario/server_list_bots' into 'master'
Explicitly mark bots with a tag in the server list to reduce activity spoofing
See merge request xonotic/xonotic-data.pk3dir!1384
Mario [Thu, 28 Nov 2024 03:43:09 +0000 (03:43 +0000)]
Explicitly mark bots with a tag in the server list to reduce activity spoofing
Dr. Jaska [Thu, 28 Nov 2024 03:41:36 +0000 (03:41 +0000)]
Merge branch 'z411/stalemate-fix' into 'master'
CA: Floor health and armor in PreventStalemate
See merge request xonotic/xonotic-data.pk3dir!1387
z411 [Thu, 28 Nov 2024 03:41:36 +0000 (03:41 +0000)]
CA: Floor health and armor in PreventStalemate
Des [Mon, 25 Nov 2024 23:01:26 +0000 (20:01 -0300)]
Move comment down to lower lines length
Des [Mon, 25 Nov 2024 12:04:05 +0000 (09:04 -0300)]
Detect broken .defragcp files and flag them to be recreated on map completion.
Rudolf Polzer [Sun, 24 Nov 2024 06:23:17 +0000 (07:23 +0100)]
Transifex autosync
Dr. Jaska [Sun, 24 Nov 2024 01:45:04 +0000 (01:45 +0000)]
Merge branch 'Mario/buffs_replace_available' into 'master'
Add an option to turn off replacing disabled buffs with an available type
Closes #2948
See merge request xonotic/xonotic-data.pk3dir!1386
Mario [Sun, 24 Nov 2024 01:45:04 +0000 (01:45 +0000)]
Add an option to turn off replacing disabled buffs with an available type
drjaska [Tue, 19 Nov 2024 03:46:19 +0000 (05:46 +0200)]
Copy
98038bf81 changes to bal-wep-xdf.cfg
drjaska [Tue, 19 Nov 2024 03:36:05 +0000 (05:36 +0200)]
Implement https://xonotic.org/balancevotes/25/
Merge branch 'bones_was_here/crylink_pri'
Rudolf Polzer [Sat, 16 Nov 2024 06:23:16 +0000 (07:23 +0100)]
Transifex autosync
drjaska [Sun, 10 Nov 2024 11:58:49 +0000 (13:58 +0200)]
Add a string_null check to inputbox input filter
This check was forgotten and in the cases where the inputbox doesn't
have a defined allowed characters list causes all input to be filtered.
Fixes https://gitlab.com/xonotic/xonotic-data.pk3dir/-/issues/2946
terencehill [Wed, 6 Nov 2024 13:12:28 +0000 (14:12 +0100)]
var.string -> var .string
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