]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
2 months agoSet the player's team to 0 in non-teamplay gamemodes 1443/head
Mario [Fri, 24 Jan 2025 13:12:46 +0000 (23:12 +1000)]
Set the player's team to 0 in non-teamplay gamemodes

2 months agoTransifex autosync
Rudolf Polzer [Fri, 24 Jan 2025 06:23:13 +0000 (07:23 +0100)]
Transifex autosync

2 months agoMerge "Fix bugs and complete implementation of weapon group notification and centrepr...
bones_was_here [Thu, 23 Jan 2025 17:36:25 +0000 (17:36 +0000)]
Merge "Fix bugs and complete implementation of weapon group notification and centreprint logic"

Source branch: 'bones_was_here/weapon_group_fixes'
Target branch: 'master'

Closes #2380

See merge request xonotic/xonotic-data.pk3dir!1436

2 months agoFix gitlab syntax highlighting
bones_was_here [Thu, 23 Jan 2025 12:35:54 +0000 (22:35 +1000)]
Fix gitlab syntax highlighting

:face_palm:

2 months agoTransifex autosync
Rudolf Polzer [Thu, 23 Jan 2025 06:23:19 +0000 (07:23 +0100)]
Transifex autosync

2 months agoMerge "Remove reliance of gmqcc allowing to overwrite builtin."
Rudolf Polzer [Wed, 22 Jan 2025 15:36:01 +0000 (15:36 +0000)]
Merge "Remove reliance of gmqcc allowing to overwrite builtin."

Source branch: 'divVerent/no-overwrite-builtins'
Target branch: 'master'

See merge request xonotic/xonotic-data.pk3dir!1380

2 months agoRemove reliance of gmqcc allowing to overwrite builtin.
Rudolf Polzer [Wed, 22 Jan 2025 15:36:01 +0000 (15:36 +0000)]
Remove reliance of gmqcc allowing to overwrite builtin.

2 months agoMerge "Improve some Weapons panel dialog settings"
terencehill [Wed, 22 Jan 2025 14:38:22 +0000 (14:38 +0000)]
Merge "Improve some Weapons panel dialog settings"

Source branch: 'terencehill/weapon_panel_dialog_update'
Target branch: 'master'

See merge request xonotic/xonotic-data.pk3dir!1440

2 months agoFTEQCC compile fixes for fields with accidentally wrong types.
Rudolf Polzer [Wed, 22 Jan 2025 14:16:52 +0000 (09:16 -0500)]
FTEQCC compile fixes for fields with accidentally wrong types.

No idea why this even compiled before in GMQCC...

2 months agoApply standard code style to sv_rules.q*
bones_was_here [Wed, 22 Jan 2025 12:06:14 +0000 (22:06 +1000)]
Apply standard code style to sv_rules.q*

2 months agog_warmup -1: when rounding to a team multiple, go up at the midpoint
bones_was_here [Wed, 22 Jan 2025 11:50:30 +0000 (21:50 +1000)]
g_warmup -1: when rounding to a team multiple, go up at the midpoint

It seems from much testing that a 5 players min DM map is more likely to
suit 3v3 TDM/FT/CA than 2v2.

See also: fd673ca98255dc41b080411c59712137b189079e !1082 and !1022

2 months agoMerge "StrafeHUD-Next, new StrafeHUD features + fixes and refactoring"
bones_was_here [Wed, 22 Jan 2025 11:43:57 +0000 (11:43 +0000)]
Merge "StrafeHUD-Next, new StrafeHUD features + fixes and refactoring"

Source branch: 'Juhu/strafehud-next'
Target branch: 'master'

See merge request xonotic/xonotic-data.pk3dir!1370

2 months agoStrafeHUD-Next, new StrafeHUD features + fixes and refactoring
Juhu [Wed, 22 Jan 2025 11:43:57 +0000 (11:43 +0000)]
StrafeHUD-Next, new StrafeHUD features + fixes and refactoring

2 months agoMerge "Undo physics changes related to hash change of 0e542a1e"
bones_was_here [Wed, 22 Jan 2025 11:36:36 +0000 (11:36 +0000)]
Merge "Undo physics changes related to hash change of 0e542a1e"

Source branch: 'k9er/fix-phys-regressions'
Target branch: 'master'

See merge request xonotic/xonotic-data.pk3dir!1438

2 months agoTransifex autosync
Rudolf Polzer [Wed, 22 Jan 2025 06:23:14 +0000 (07:23 +0100)]
Transifex autosync

2 months agoImprove some Weapons panel dialog settings: 1440/head
terencehill [Mon, 20 Jan 2025 23:16:58 +0000 (00:16 +0100)]
Improve some Weapons panel dialog settings:

* Rename "Show weapon ID as:" to "Show label:" (weapon is implicit)
* Turn "Show label:" into a checkbox so to get rid of the "None" option
* Add "Name" checkbox as "Show label:" option
* Rename "Weapon ID scale:" to "Scale:" (weapon label is implicit)
* Fix a few wrong dependencies introduced by xonotic/xonotic-data.pk3dir!1414

2 months agoTransifex autosync
Rudolf Polzer [Tue, 21 Jan 2025 06:23:18 +0000 (07:23 +0100)]
Transifex autosync

2 months agoMerge branch 'k9er/update-hudpanel-dialogs' into 'master'
terencehill [Mon, 20 Jan 2025 21:58:22 +0000 (21:58 +0000)]
Merge branch 'k9er/update-hudpanel-dialogs' into 'master'

Update hudpanel dialogs

See merge request xonotic/xonotic-data.pk3dir!1414

2 months agoUpdate hudpanel dialogs
k9er [Mon, 20 Jan 2025 21:58:21 +0000 (21:58 +0000)]
Update hudpanel dialogs

2 months agoTransifex autosync
Rudolf Polzer [Mon, 20 Jan 2025 06:23:17 +0000 (07:23 +0100)]
Transifex autosync

2 months agoMerge branch 'k9er/scrollable-zoom' into 'master'
terencehill [Sun, 19 Jan 2025 18:54:07 +0000 (18:54 +0000)]
Merge branch 'k9er/scrollable-zoom' into 'master'

Implement zoom scrolling

Closes #2114

See merge request xonotic/xonotic-data.pk3dir!1411

2 months agoImplement zoom scrolling
k9er [Sun, 19 Jan 2025 18:54:07 +0000 (18:54 +0000)]
Implement zoom scrolling

2 months agoMerge branch 'k9er/fix-autoswitch-regression' into 'master'
terencehill [Sun, 19 Jan 2025 18:33:10 +0000 (18:33 +0000)]
Merge branch 'k9er/fix-autoswitch-regression' into 'master'

Fix autoswitch bug from !1398

See merge request xonotic/xonotic-data.pk3dir!1439

2 months agoFix autoswitch bug from !1398
k9er [Sun, 19 Jan 2025 18:33:10 +0000 (18:33 +0000)]
Fix autoswitch bug from !1398

2 months agoMerge branch 'k9er/improve-tooltips' into 'master'
terencehill [Sun, 19 Jan 2025 11:57:31 +0000 (11:57 +0000)]
Merge branch 'k9er/improve-tooltips' into 'master'

Improve advanced menu tooltips

Closes #2501 and #2482

See merge request xonotic/xonotic-data.pk3dir!1435

2 months agoImprove advanced menu tooltips
k9er [Sun, 19 Jan 2025 11:57:30 +0000 (11:57 +0000)]
Improve advanced menu tooltips

2 months agoAdd campaign translator names in the translation files
terencehill [Sun, 19 Jan 2025 11:47:08 +0000 (12:47 +0100)]
Add campaign translator names in the translation files

2 months agoSome ecs physics cleanups and small optimizations 1438/head
otta8634 [Sat, 18 Jan 2025 08:02:42 +0000 (16:02 +0800)]
Some ecs physics cleanups and small optimizations

2 months agoUndo physics changes related to hash change of 0e542a1e
otta8634 [Sat, 18 Jan 2025 07:52:46 +0000 (15:52 +0800)]
Undo physics changes related to hash change of 0e542a1e

This commit altered how physics code works, changing the hash.
This is a regression.
The rest of the changes in 0e542a1e didn't update the hash, and logically speaking shouldn't alter how physics works.
Undid changes which led to the hash change, at the tiny cost of some lost regained performance.

2 months agoTransifex autosync
Rudolf Polzer [Fri, 17 Jan 2025 06:23:14 +0000 (07:23 +0100)]
Transifex autosync

2 months agoFix a regression regarding ExtraLife and Invisibility powerups
terencehill [Fri, 17 Jan 2025 02:07:23 +0000 (03:07 +0100)]
Fix a regression regarding ExtraLife and Invisibility powerups

Introduced by https://gitlab.com/xonotic/xonotic-data.pk3dir/-/merge_requests/1425

Also sync the ready command description with the ready alias description in commands.cfg

2 months agoTransifex autosync
Rudolf Polzer [Thu, 16 Jan 2025 06:23:14 +0000 (07:23 +0100)]
Transifex autosync

2 months agoMerge branch 'drjaska/moar_test' into 'master'
Dr. Jaska [Wed, 15 Jan 2025 07:22:46 +0000 (07:22 +0000)]
Merge branch 'drjaska/moar_test' into 'master'

Add genmod and cvar spelling into CI/CD tests

See merge request xonotic/xonotic-data.pk3dir!1417

2 months agoAdd genmod and cvar spelling into CI/CD tests
Dr. Jaska [Wed, 15 Jan 2025 07:22:46 +0000 (07:22 +0000)]
Add genmod and cvar spelling into CI/CD tests

2 months agoTransifex autosync
Rudolf Polzer [Wed, 15 Jan 2025 06:23:22 +0000 (07:23 +0100)]
Transifex autosync

2 months agoMerge branch 'k9er/cts-autoswitch' into 'master'
terencehill [Tue, 14 Jan 2025 22:38:15 +0000 (22:38 +0000)]
Merge branch 'k9er/cts-autoswitch' into 'master'

Improve autoswitching options in CTS

See merge request xonotic/xonotic-data.pk3dir!1398

2 months agoImprove autoswitching options in CTS
k9er [Tue, 14 Jan 2025 22:38:15 +0000 (22:38 +0000)]
Improve autoswitching options in CTS

2 months agoPrevent hidden weapons being revealed with waypoints and centreprints 1436/head
bones_was_here [Tue, 14 Jan 2025 15:30:41 +0000 (01:30 +1000)]
Prevent hidden weapons being revealed with waypoints and centreprints

Normally this issue isn't noticeable, but with
g_balance_blaster_weaponstart 0 the secret tubas were revealed by the
weapon_group_1 bind.

If all weapons in a group are HIDDEN, nothing is displayed when the
group bind is pressed.  This seems better than the alternatives:
- "AOL CD Thrower is not available"
- "@!#%'n Tuba is not available" even though it's in the secret room
- "No weapon in the group is available" but it's a lie

2 months agoImplement weapon availability warnings for custom weapon groups
bones_was_here [Tue, 14 Jan 2025 12:21:12 +0000 (22:21 +1000)]
Implement weapon availability warnings for custom weapon groups

Fixes "AOL CD Thrower is not available" (see previous commit and #2380)
when using a cl_weaponpriorityN custom weapon group and none of its
weapons are on the map.

Refactors and somewhat documents the `have_other` checking for
compatibility, performance and clarity.

2 months agoRemove duplicate code and fix div0 when warning about weapon availability
bones_was_here [Mon, 13 Jan 2025 22:05:29 +0000 (08:05 +1000)]
Remove duplicate code and fix div0 when warning about weapon availability

Fixes #2380 but doesn't add proper support for that feature (player is
informed that "AOL CD Thrower is not available").

2 months agoMerge branch 'Mario/hidden_weapons_spawn' into 'master'
bones_was_here [Tue, 14 Jan 2025 15:56:41 +0000 (15:56 +0000)]
Merge branch 'Mario/hidden_weapons_spawn' into 'master'

Fix Tuba not appearing in maps

Closes #2945

See merge request xonotic/xonotic-data.pk3dir!1420

2 months agoMerge branch 'bones_was_here/ka_nodel' into 'master'
terencehill [Tue, 14 Jan 2025 14:29:02 +0000 (14:29 +0000)]
Merge branch 'bones_was_here/ka_nodel' into 'master'

Disable keepaway ball pickup delay

See merge request xonotic/xonotic-data.pk3dir!1432

2 months agoDisable keepaway ball pickup delay 1432/head
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.

2 months agoMerge branch 'k9er/implement-2562' into 'master'
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

2 months agoSplit up nades & buffs into individual files
k9er [Mon, 13 Jan 2025 22:23:07 +0000 (22:23 +0000)]
Split up nades & buffs into individual files

2 months agoMerge branch 'k9er/compress-genmod' into 'master'
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

2 months agoMerge adjacent identical ifdefs in genmod
k9er [Mon, 13 Jan 2025 20:50:05 +0000 (20:50 +0000)]
Merge adjacent identical ifdefs in genmod

2 months agoMerge branch 'k9er/improve-wep-colors' into 'master'
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

2 months agoImprove weapon colors, and make HLAC green
k9er [Mon, 13 Jan 2025 18:06:31 +0000 (18:06 +0000)]
Improve weapon colors, and make HLAC green

2 months agoMerge branch 'k9er/give-ammo-color' into 'master'
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

2 months agoColor the ammo hud text and progressbars
k9er [Mon, 13 Jan 2025 17:51:25 +0000 (17:51 +0000)]
Color the ammo hud text and progressbars

2 months agoTransifex autosync
Rudolf Polzer [Sat, 11 Jan 2025 06:23:16 +0000 (07:23 +0100)]
Transifex autosync

2 months agoCode cleanup
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

2 months agoMerge branch 'k9er/class-refactoring' into 'master'
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

2 months agoMerge branch 'Mario/projectile_div0_fix' into 'master'
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

2 months agoAdd a workaround for projectile fade rates in the event of ticrate being 0
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

2 months agoFix typos made in 253640f352 1425/head
otta8634 [Thu, 9 Jan 2025 05:29:20 +0000 (13:29 +0800)]
Fix typos made in 253640f352

2 months agoRename .gametype_description to .m_description
otta8634 [Tue, 7 Jan 2025 14:50:14 +0000 (22:50 +0800)]
Rename .gametype_description to .m_description

.m_description is already used elsewhere.

2 months agoRename .turret_name to .m_name
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.

2 months agoGive powerup statuseffect classes better names (cherry-pick 28ca8192ce)
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.

2 months agoRename common/mutators/mutator/nades/nades.inc to all.inc
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.

2 months agoUse m_name for vehicles and monsters (cherry-pick 2e32f2e7d3)
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.

2 months agoUse the translatable strings for some default classes
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.

2 months agoMove attributes for items and nades into their classes (cherry-pick 4192f3a1af)
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.

2 months agoRename .wpcolor to .m_color
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.

2 months agoMake REGISTER_ITEM call NEW, like most other REGISTER_* macros
otta8634 [Tue, 7 Jan 2025 13:43:12 +0000 (21:43 +0800)]
Make REGISTER_ITEM call NEW, like most other REGISTER_* macros

2 months agoRestore the ability to spawn hidden weapons in maps 1420/head
Mario [Sun, 5 Jan 2025 01:30:01 +0000 (11:30 +1000)]
Restore the ability to spawn hidden weapons in maps

2 months agoMerge branch 'terencehill/wepflags_stuff' into 'master'
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

2 months agoRefactor code to remove WEP_FLAG_SPECIALATTACK checks if WEP_FLAG_HIDDEN is already... 1373/head
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.

2 months agoMerge branch 'k9er/standardize-cvar-descs' into 'master'
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

2 months agoStandardize cvar descriptions
k9er [Sat, 4 Jan 2025 02:07:51 +0000 (02:07 +0000)]
Standardize cvar descriptions

3 months agoFix case of trails not being drawn on CSQC models with unset alpha.
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.

3 months agoMerge branch 'Mario/relay_support' into 'master'
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

3 months agoAdd activation support to some map entities lacking it
Mario [Thu, 2 Jan 2025 23:32:51 +0000 (23:32 +0000)]
Add activation support to some map entities lacking it

3 months agoMerge branch 'drjaska/viewmodel_alpha' into 'master'
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

3 months agoImplement cl_viewmodel_alpha_min cvar
Dr. Jaska [Thu, 2 Jan 2025 23:31:25 +0000 (23:31 +0000)]
Implement cl_viewmodel_alpha_min cvar

3 months agoMerge branch 'Mario/effect_colors' into 'master'
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

3 months agoAdd support for networked effect colors
Mario [Thu, 2 Jan 2025 23:30:18 +0000 (23:30 +0000)]
Add support for networked effect colors

3 months agoMerge branch 'Mario/reticle_minalpha' into 'master'
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

3 months agoMerge branch 'drjaska/df_wp_stackoverflow' into 'master'
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

3 months agoMerge branch 'k9er/random-nade' into 'master'
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

3 months agoAllow selecting a random nade
k9er [Thu, 2 Jan 2025 23:24:44 +0000 (23:24 +0000)]
Allow selecting a random nade

3 months agoMerge branch 'divVerent/alpha_comments' into 'master'
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

3 months agoMerge branch 'k9er/show-vaporizer-dmgtxt' into 'master'
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

3 months agoShow Vaporizer damagetext when not playing InstaGib
k9er [Thu, 2 Jan 2025 12:48:06 +0000 (12:48 +0000)]
Show Vaporizer damagetext when not playing InstaGib

3 months agoGive the zoom reticle a minimum opacity from zooming to make it always visible 1413/head
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

3 months agoMerge branch 'Mario/monster_teamcolor_fix' into 'master'
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

3 months agoFix monsters preferring player colours over team colours
Mario [Thu, 2 Jan 2025 01:37:20 +0000 (01:37 +0000)]
Fix monsters preferring player colours over team colours

3 months agoMerge branch 'k9er/update-player-ready-icon' into 'master'
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

3 months agoMerge branch 'k9er/optimize-bitset-ops' into 'master'
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

3 months agoOptimize bitset operations
k9er [Thu, 2 Jan 2025 00:25:24 +0000 (00:25 +0000)]
Optimize bitset operations

3 months agoSkip projectile alpha math if it'd be a NOP. 1410/head
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.

3 months agoFix time of the dropped Invisibility being read from autocvar_g_balance_powerup_invin...
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

3 months agoMerge branch 'Mario/spawn_color_fix' into 'master'
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

3 months agoMove client-side spawn point code to its own file 1408/head
Mario [Mon, 30 Dec 2024 12:46:14 +0000 (22:46 +1000)]
Move client-side spawn point code to its own file

3 months agoSend the team number with the spawn event to ensure an accurate team colour
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

3 months agoTransifex autosync
Rudolf Polzer [Mon, 30 Dec 2024 06:23:12 +0000 (07:23 +0100)]
Transifex autosync

3 months agoRefactor and reformat weapons hud code a bit
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.

3 months agoTransifex autosync
Rudolf Polzer [Sun, 22 Dec 2024 06:23:15 +0000 (07:23 +0100)]
Transifex autosync

3 months agoUpdate the player_ready scoreboard icon 1395/head
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.