]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
3 months agoSeparate Movement from Guide in the guide
otta8634 [Thu, 30 Jan 2025 10:03:48 +0000 (18:03 +0800)]
Separate Movement from Guide in the guide

Also renamed Guide to Introduction, and the first entry of it to About this guide.

3 months agoMerge branch 'master' into TimePath/guide
otta8634 [Sat, 25 Jan 2025 19:28:26 +0000 (03:28 +0800)]
Merge branch 'master' into TimePath/guide

3 months agoMake filtering work for gamemodes and mutators
otta8634 [Sat, 25 Jan 2025 15:05:01 +0000 (23:05 +0800)]
Make filtering work for gamemodes and mutators

Did this by applying the same workaround as the COLORED_NAME macros, using .message if it exists, otherwise .m_name.
In future ideally .message would be renamed to .m_name on Mutators and Gametypes.
See https://gitlab.com/xonotic/xonotic-data.pk3dir/-/merge_requests/181#note_2291392189 for more.

3 months agoTransifex autosync
Rudolf Polzer [Sat, 25 Jan 2025 06:23:12 +0000 (07:23 +0100)]
Transifex autosync

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

3 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

3 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:

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

3 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

3 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.

3 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

3 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...

3 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*

3 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

3 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

3 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

3 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

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

3 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

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

3 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

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

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

3 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

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

3 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

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

3 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

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

3 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

3 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

3 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.

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

4 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

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

4 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

4 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

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

4 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

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

4 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

4 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.

4 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").

4 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

4 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

4 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.

4 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

4 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

4 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

4 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

4 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

4 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

4 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

4 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

4 months agoClean up guide/pages.qh a bit
otta8634 [Sat, 11 Jan 2025 14:48:22 +0000 (22:48 +0800)]
Clean up guide/pages.qh a bit

4 months agoImprove Jump buff, Vortex, Mayhem descriptions
otta8634 [Sat, 11 Jan 2025 12:39:06 +0000 (20:39 +0800)]
Improve Jump buff, Vortex, Mayhem descriptions

I discovered the Jump buff added note while looking at the code recently that it also negates any DEATH_FALL damage.
This wasn't documented on the wiki so I missed it initially.

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

4 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

4 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

4 months agoAlmost fix filtering in the guide
otta8634 [Fri, 10 Jan 2025 15:51:30 +0000 (23:51 +0800)]
Almost fix filtering in the guide

Still has an issue: doesn't work properly for Gametypes and Mutators.
- Method used was filtering based on .m_name, however Gametypes and Mutators don't use .m_name (yet), they use .message.
- This can easily be fixed by just changing the macro to use .message for those two, but a better approach should be used, so I'm intentionally pushing slightly-buggy code in hopes a better approach will be found.
Needed a bit of reworking of some functions in menu/guide/entries.qc so that MENUQC would stop crashing, added comments to help clarify code.

4 months agoCleanup guide freetext section code
otta8634 [Fri, 10 Jan 2025 15:14:43 +0000 (23:14 +0800)]
Cleanup guide freetext section code

Relocated describe and display method code to pages.qc.
Made the constructor take an icon string, and renamed m_title to m_name.

4 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

4 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

4 months agoAdd slight indent before lists in the guide
otta8634 [Thu, 9 Jan 2025 07:30:57 +0000 (15:30 +0800)]
Add slight indent before lists in the guide

This just makes it look slightly better.

4 months agoUnhardcode some text in the guide
otta8634 [Thu, 9 Jan 2025 07:29:37 +0000 (15:29 +0800)]
Unhardcode some text in the guide

4 months agoFix bug introduced by fe3d08fb79
otta8634 [Thu, 9 Jan 2025 07:18:51 +0000 (15:18 +0800)]
Fix bug introduced by fe3d08fb79

One example bug introduced is team-based gamemodes being no longer team-based, and some scoreboard funkiness found by @terencehill.
Gametypes also use mutators, seems that this commit (specifically changing .m_name -> .mutatorname) didn't properly account for that somehow.
I couldn't find the .m_name access that needed to be changed, so instead I reverted that change and added .message to Mutator.
In future for consistency's sake .m_name should be renamed to .mutatorname in Mutator, and .message to .m_name in Gametype and Mutator.

4 months agoFix compilation unit failure
otta8634 [Thu, 9 Jan 2025 07:09:53 +0000 (15:09 +0800)]
Fix compilation unit failure

Introduced by c0a5cc3e57.

4 months agoFinish updating documentation of description location
otta8634 [Thu, 9 Jan 2025 05:57:05 +0000 (13:57 +0800)]
Finish updating documentation of description location

Added it for freetext, mutators, and updated it for weapons.

4 months agoFix an indentation issue
otta8634 [Thu, 9 Jan 2025 05:49:59 +0000 (13:49 +0800)]
Fix an indentation issue

4 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

4 months agoStandardize display and describe methods
otta8634 [Thu, 9 Jan 2025 05:00:10 +0000 (13:00 +0800)]
Standardize display and describe methods

Previously they were implemented a bit differently for each class, for some reason.

4 months agoCleanup new mutator includes
otta8634 [Wed, 8 Jan 2025 16:45:47 +0000 (00:45 +0800)]
Cleanup new mutator includes

Changed `<common/mutators/mutator/` -> `"../`.
This was done in other parts of the mutator code, and is cleaner.

4 months agoFix compilationunit failure
otta8634 [Wed, 8 Jan 2025 16:41:11 +0000 (00:41 +0800)]
Fix compilationunit failure

Not entirely sure why but this one wanted the Mutator class defined for it.

4 months agoAdd Mutators to the guide
otta8634 [Wed, 8 Jan 2025 16:19:56 +0000 (00:19 +0800)]
Add Mutators to the guide

Descriptions were based on https://gitlab.com/xonotic/xonotic/-/wikis/home for those which had an entry there.
There are some "mutators" which would be nice to include in the guide like weaponarena and weaponstay, except they aren't actually implemented as Mutators in the code.
Descriptions were added in mutatorname.qc under MENUQC, with the MENUQC-Mutator added in mutatorname.qh.
It may be worthwhile considering renaming the MENUQC-Mutator to menu_mutatorname for clarity's sake, like how there's cl_mutatorname sometimes.
The only refactoring included was in common/mutators/mutator/new_toys, relocating nt_IsNewToy from sv_new_toys.qc to new_toys.qc.

4 months agoRemove mutators constructor
otta8634 [Wed, 8 Jan 2025 16:18:36 +0000 (00:18 +0800)]
Remove mutators constructor

This allows for classes to inherit Mutator without having to copy paste the CONSTRUCTOR, since CONSTRUCTOR inheritance doesn't work currently for some reason.
This can be reverted easily in future when CONSTRUCTOR inheritance is fixed.

4 months agoSingleplayer window: let's keep "Singleplayer" as title for now
terencehill [Wed, 8 Jan 2025 14:57:12 +0000 (15:57 +0100)]
Singleplayer window: let's keep "Singleplayer" as title for now

4 months agoGuide: sort Items by item type too
terencehill [Wed, 8 Jan 2025 14:24:16 +0000 (15:24 +0100)]
Guide: sort Items by item type too

4 months agoSlightly refactor mutators code
otta8634 [Wed, 8 Jan 2025 10:13:39 +0000 (18:13 +0800)]
Slightly refactor mutators code

These changes allow mutators to be properly shown in the guide.
Renamed .m_name to .mutatorname, and added (new) .m_name which would be displayed in the guide.
Allowed use of classes other than Mutator in the Mutators registry, so that m_name, m_icon, and m_color can be stored in such class and then displayed in the guide.
Also removed itemstime and waypointsprites mutators from the guide.

4 months agoUpdate guide description location documentation
otta8634 [Wed, 8 Jan 2025 07:11:34 +0000 (15:11 +0800)]
Update guide description location documentation

Forgot to update it when I added turret and gametype descriptions.

4 months agoRename dialog_multiplayer_media_guide.* to dialog_singleplayer_guide.*
otta8634 [Tue, 7 Jan 2025 17:18:28 +0000 (01:18 +0800)]
Rename dialog_multiplayer_media_guide.* to dialog_singleplayer_guide.*

4 months agoRelocate the guide to Singleplayer
otta8634 [Tue, 7 Jan 2025 17:07:11 +0000 (01:07 +0800)]
Relocate the guide to Singleplayer

Added a button for it alongside the 'Instant action' button.
Converted it to a XonoticDialog from a XonoticTab, renamed the class to XonoticGuideDialog.
Renamed the Singleplayer menu to Singleplayer / Guide.
Slightly changed some Singleplayer menu strings.

4 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.

4 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.

4 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.

4 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.

4 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.

4 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.

4 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.

4 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.

4 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

4 months agoMerge remote-tracking branch 'origin/master' into TimePath/guide
otta8634 [Tue, 7 Jan 2025 11:52:56 +0000 (19:52 +0800)]
Merge remote-tracking branch 'origin/master' into TimePath/guide

4 months agoAllow use of ctrl+F and ctrl+U in guide filter
otta8634 [Tue, 7 Jan 2025 11:51:53 +0000 (19:51 +0800)]
Allow use of ctrl+F and ctrl+U in guide filter

The filtering still doesn't work yet.
Also cleaned up guide tab fill function, and some other code.
Made the guide XonoticEntryList not have to refer to XonoticMapList.

4 months agoPatch up some gametype descriptions
otta8634 [Tue, 7 Jan 2025 08:08:13 +0000 (16:08 +0800)]
Patch up some gametype descriptions

Fix typo and simplify "damage triggers" -> "hazards".

4 months agoRemove note about rifle in ammo buff to prevent pipeline failure
otta8634 [Mon, 6 Jan 2025 17:28:37 +0000 (01:28 +0800)]
Remove note about rifle in ammo buff to prevent pipeline failure

I'm not sure how to properly include within .inc files, evidently what I tried didn't work.

4 months agoAdd Gametypes to the guide
otta8634 [Mon, 6 Jan 2025 16:51:34 +0000 (00:51 +0800)]
Add Gametypes to the guide

Descriptions were based on https://gitlab.com/xonotic/xonotic/-/wikis/home, although some gamemodes don't have a description there.
Added back .gametype_description (now called .m_description) so that the shorter gamemode descriptions can still be used.
Added .m_name to the gamemode class, copied with the initial value of .message, so that the COLORED_NAME macros can be used. Ideally .message wouldn't be necessary since it's not very descriptive, I just didn't bother going through all instances of .message being used to make sure nothing would break.

4 months agoUpdate Ammo Buff note
otta8634 [Sun, 5 Jan 2025 11:54:11 +0000 (19:54 +0800)]
Update Ammo Buff note

Forgot to mention that it removes the need to reload.

4 months agoFix Resistance Buff color
otta8634 [Sun, 5 Jan 2025 11:51:25 +0000 (19:51 +0800)]
Fix Resistance Buff color

Accidentally copied it over incorrectly.

4 months agoFix a minor typo in the devastator description (American syntax is weird)
Spike29 [Sun, 5 Jan 2025 11:18:08 +0000 (12:18 +0100)]
Fix a minor typo in the devastator description (American syntax is weird)

4 months agoRevert "Fix minor typos"
Spike29 [Sun, 5 Jan 2025 11:09:37 +0000 (12:09 +0100)]
Revert "Fix minor typos"

This reverts commit a6ee19b01deacc9dd815ad481da0b0fafc6c50a3.

4 months agoFix minor typos
Spike29 [Sun, 5 Jan 2025 10:22:06 +0000 (11:22 +0100)]
Fix minor typos