]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
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 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 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 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 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

4 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

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

4 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

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

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

4 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

4 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

4 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

4 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

4 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

4 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

4 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

4 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

4 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

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

4 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

4 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

4 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

4 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

4 months agoUse me instead of this in guide menu dialogs
otta8634 [Thu, 2 Jan 2025 06:33:01 +0000 (14:33 +0800)]
Use me instead of this in guide menu dialogs

Makes it more consistent with (almost) the rest of the menu dialogs.

4 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

4 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

4 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

4 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

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

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

4 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

4 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

4 months agoAdd turrets to the guide
otta8634 [Wed, 1 Jan 2025 05:41:56 +0000 (13:41 +0800)]
Add turrets to the guide

Descriptions were somewhat based on scripts/entities.ent from xonotic/xonotic-maps.pk3dir.
Also renamed .turret_name -> .m_name, so the COLORED_NAME macros could work on turrets.

4 months agoAdd horizontal padding to guide descriptions
otta8634 [Tue, 31 Dec 2024 16:45:22 +0000 (00:45 +0800)]
Add horizontal padding to guide descriptions

Looked crammed beforehand.
Used `1 - 2 * this.realFontSize.x`, which seems to be used in several other places in the code.

4 months agoRemove Maps from the guide
otta8634 [Mon, 30 Dec 2024 17:23:08 +0000 (01:23 +0800)]
Remove Maps from the guide

For now it's commented out not removed (as well as DebugSource), in case people think it's worthwhile keeping.

4 months agoFlesh out Guide topic code
otta8634 [Mon, 30 Dec 2024 17:17:26 +0000 (01:17 +0800)]
Flesh out Guide topic code

Also properly commented out DebugSource.

4 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

4 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

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

4 months agoRemove lib/color.qh includes
otta8634 [Sun, 29 Dec 2024 14:57:49 +0000 (22:57 +0800)]
Remove lib/color.qh includes

Unnecessary

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

4 months agoRevert most of f498671b
otta8634 [Wed, 25 Dec 2024 17:11:39 +0000 (01:11 +0800)]
Revert most of f498671b

See https://gitlab.com/xonotic/xonotic-data.pk3dir/-/merge_requests/181#note_2269460280.

4 months agoUse REGISTRY_MAX macro in guide.qh
otta8634 [Mon, 23 Dec 2024 08:22:49 +0000 (16:22 +0800)]
Use REGISTRY_MAX macro in guide.qh

4 months agoImprove Ammo guide description code
otta8634 [Mon, 23 Dec 2024 03:10:43 +0000 (11:10 +0800)]
Improve Ammo guide description code

Also relocated some functions declarations in a header that were properly misplaced.

4 months agoRelocate includes to prevent pipeline failure
otta8634 [Sun, 22 Dec 2024 17:26:01 +0000 (01:26 +0800)]
Relocate includes to prevent pipeline failure

Not sure why these includes are located here anyway.

4 months agoSeparate powerups from items in the guide
otta8634 [Sun, 22 Dec 2024 17:08:07 +0000 (01:08 +0800)]
Separate powerups from items in the guide

Since both the Powerups and Items sections use the ITEM registry, the REGISTRY_SOURCE macro had to be updated, so some minor refactoring is included.
Choose to use the ka icon for Buffs since it's more circular (like the buffs simpleitems), and dom for Powerups since it's more triangular (like most powerups simpleitems).

4 months agoRelocate descriptions of powerups from statuseffects to items
otta8634 [Sun, 22 Dec 2024 16:58:25 +0000 (00:58 +0800)]
Relocate descriptions of powerups from statuseffects to items

Due to 89ad1fa8 the descriptions need to be shifted to the ITEM_ powerup not the STATUSEFFECT_ powerup.
Also made the distinction between the two clear for the main 4 powerups.

4 months agoGuide: remove Powerups from Buffs list
terencehill [Sun, 22 Dec 2024 15:10:42 +0000 (16:10 +0100)]
Guide: remove Powerups from Buffs list

4 months agoDynamically generate ammo guide descriptions
otta8634 [Sun, 22 Dec 2024 11:50:02 +0000 (19:50 +0800)]
Dynamically generate ammo guide descriptions

Suggestion by @terencehill.

4 months agoChange color constants to macros rather than const vectors
otta8634 [Sun, 22 Dec 2024 11:44:20 +0000 (19:44 +0800)]
Change color constants to macros rather than const vectors

Not much reason to use the latter.

4 months agoAdd some documentation showing the location of guide descriptions
otta8634 [Sun, 22 Dec 2024 10:19:07 +0000 (18:19 +0800)]
Add some documentation showing the location of guide descriptions

This will hopefully make them a bit easier to find if someone inexperienced with the codebase wants to try to edit the guide. I think still they're require someone to point them in the right place though, but this is better than nothing.

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 agoRename "dropweapon" -> "drop weapon" in the guide
otta8634 [Sun, 22 Dec 2024 09:52:06 +0000 (17:52 +0800)]
Rename "dropweapon" -> "drop weapon" in the guide

Seems that other transifex strings use "drop weapon".

4 months agoRemove "Debug" topic in the guide
otta8634 [Sun, 22 Dec 2024 09:50:44 +0000 (17:50 +0800)]
Remove "Debug" topic in the guide

Seems to be unused, aside from causing a menu VM crash every time you click on it.
Not sure that it serves much purpose anyway.

4 months agoFinish relocating guide includes to QC files, fix COLORED_NAME macros
otta8634 [Sun, 22 Dec 2024 09:46:05 +0000 (17:46 +0800)]
Finish relocating guide includes to QC files, fix COLORED_NAME macros

COLORED_NAME macro fix suggested by @Mario here https://gitlab.com/xonotic/xonotic-data.pk3dir/-/merge_requests/181#note_2269492232.

4 months agoRelocate guide descriptions to QC files
otta8634 [Sun, 22 Dec 2024 06:25:39 +0000 (14:25 +0800)]
Relocate guide descriptions to QC files

This will allow for addressing the circular includes "issue" from before.

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

4 months agoColorize guide
otta8634 [Fri, 20 Dec 2024 11:35:22 +0000 (19:35 +0800)]
Colorize guide

Added colors to mostly all m_names shown currently except monsters since the plural versions don't have a standalone transifex string (yet).
Some colors are currently white (like for all ammo items and vehicles) but can easily be changed in future.

4 months agoSome changes to color-related functions
otta8634 [Fri, 20 Dec 2024 11:30:19 +0000 (19:30 +0800)]
Some changes to color-related functions

Added a new macro to color extra words after the m_name, in the guide.
Bounded RGB parameters in rgb_to_hexcolor to [0,1].

4 months agoUse m_name for vehicles and monsters
otta8634 [Fri, 20 Dec 2024 09:00:47 +0000 (17:00 +0800)]
Use m_name for vehicles and monsters

Previously monster_name and vehicle_name were used, which were obviously used nowhere else.
Renamed them both to m_name, mostly so that the COLORED_NAME macro can work on them, and also so that there's less unnecessary entity fields.

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
otta8634 [Fri, 20 Dec 2024 08:26:17 +0000 (16:26 +0800)]
Move attributes for items and nades into their classes

This makes it more consistent with weapons, buffers, some powerups, monsters, and vehicles.
Also this makes it possible to use the COLORED_NAME macro on them in the guide.
This could be done for the rest of the powerups too, but they're a bit of a mess currently.

4 months agoAllow colored text to be used in guide descriptions
otta8634 [Thu, 19 Dec 2024 19:09:41 +0000 (03:09 +0800)]
Allow colored text to be used in guide descriptions

Not too sure why it was disabled.
Also added a useful macro to get the colored name of a class.

4 months agoRelocate m_color constants to common/colors.qh
otta8634 [Thu, 19 Dec 2024 18:18:16 +0000 (02:18 +0800)]
Relocate m_color constants to common/colors.qh

This allows for the colors to be used in guide descriptions in future, without causing duplicate code.
This will also make editing multiple colors at once easier.
Also renamed wpcolor attrib (waypointsprite color) used by weapons to m_color, as with all other item-things.

4 months agoMove descriptions to MENUQC
otta8634 [Thu, 19 Dec 2024 15:22:28 +0000 (23:22 +0800)]
Move descriptions to MENUQC

Added ifdef MENUQC checks around describe methods for the currently added: items, monsters, vehicles, weapons, buffs/powerups, and nades.
Skipped gamemodes since they're used elsewhere (I think?), and skipped the free-text guide since that's in qcsrc/menu/.
This change prevents the csprogs from increasing in size unnecessarily, with minimal readability cost.

4 months agoPut the entity num in a separate paragraph in the guide
otta8634 [Thu, 19 Dec 2024 14:50:47 +0000 (22:50 +0800)]
Put the entity num in a separate paragraph in the guide

4 months agoAdd vehicles to the guide
otta8634 [Thu, 19 Dec 2024 14:14:11 +0000 (22:14 +0800)]
Add vehicles to the guide

Descriptions were mostly entirely copied from https://gitlab.com/xonotic/xonotic/-/wikis/Vehicles.

4 months agoRevert to using inst rather than class in REGISTER_* macros
otta8634 [Thu, 19 Dec 2024 09:34:53 +0000 (17:34 +0800)]
Revert to using inst rather than class in REGISTER_* macros

Not sure why I even changed to the latter for REGISTER_ITEM, REGISTER_NADE,
and REGISTER_BUFF.

4 months agoAdd monsters to the guide
otta8634 [Thu, 19 Dec 2024 09:22:10 +0000 (17:22 +0800)]
Add monsters to the guide

Descriptions were mostly entirely copied from https://gitlab.com/xonotic/xonotic/-/wikis/Monsters.

4 months agoAdd buffs, powerups, and items to the guide
otta8634 [Thu, 19 Dec 2024 08:45:08 +0000 (16:45 +0800)]
Add buffs, powerups, and items to the guide

Descriptions of buffs/powerups were somewhat based on https://gitlab.com/xonotic/xonotic/-/wikis/Buffs and https://gitlab.com/xonotic/xonotic/-/wikis/Powerups.

4 months agoAdd grenades to the guide
otta8634 [Thu, 19 Dec 2024 07:30:56 +0000 (15:30 +0800)]
Add grenades to the guide

Descriptions were somewhat based on https://gitlab.com/xonotic/xonotic/-/wikis/Nades and the g_nades_* cvar descriptions.

4 months agoAdd weapons to the guide
otta8634 [Thu, 19 Dec 2024 07:29:57 +0000 (15:29 +0800)]
Add weapons to the guide

Descriptions were somewhat based on https://gitlab.com/xonotic/xonotic/-/wikis/Weapons but since that's in a format not really suitable for a guide, I took some creative liberty.

5 months agoChange the guide Weapons icon to gametype_duel
otta8634 [Tue, 17 Dec 2024 19:40:46 +0000 (03:40 +0800)]
Change the guide Weapons icon to gametype_duel

Previously it was gametype_ka, displaying a ball, I think displaying two swords (katanas?) is better suited for "Weapons".