]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
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.
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.
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).
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.
terencehill [Sun, 22 Dec 2024 15:10:42 +0000 (16:10 +0100)]
Guide: remove Powerups from Buffs list
otta8634 [Sun, 22 Dec 2024 11:50:02 +0000 (19:50 +0800)]
Dynamically generate ammo guide descriptions
Suggestion by @terencehill.
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.
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.
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 [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".
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.
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.
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.
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.
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].
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.
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
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.
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.
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.
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.
otta8634 [Thu, 19 Dec 2024 14:50:47 +0000 (22:50 +0800)]
Put the entity num in a separate paragraph in 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.
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.
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.
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.
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.
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.
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".
otta8634 [Mon, 16 Dec 2024 13:50:56 +0000 (21:50 +0800)]
Remove .gametype_description, instead use .describe method
This method was added for a reason.
otta8634 [Mon, 16 Dec 2024 10:53:31 +0000 (18:53 +0800)]
Relocate methods to .qc files from .qh
Also replaced cvar("developer").
otta8634 [Mon, 16 Dec 2024 09:58:22 +0000 (17:58 +0800)]
Reformat code
It looked too crammed before.
Used mostly Allman style as per CONTRIBUTING.md.
otta8634 [Mon, 16 Dec 2024 09:30:16 +0000 (17:30 +0800)]
Improve formatting consistency
Changed spaces to tabs in menu files.
Moved menu/xonotic/guide/tab.qc and .qh to menu/xonotic/dialog_multiplayer_guide.qc and .qh to make it more consistent with every other dialog.
Added empty .qc files for .qh files which were missing one.
Slightly improved some code formatting.
otta8634 [Sat, 14 Dec 2024 11:01:39 +0000 (19:01 +0800)]
Fix Screenshots overlapping Music Player in Media dialog
columns wasn't updated from 3 to 4.
otta8634 [Sat, 14 Dec 2024 10:51:38 +0000 (18:51 +0800)]
Merge remote-tracking branch 'origin/master' into TimePath/guide
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
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
terencehill [Fri, 1 Nov 2024 21:11:45 +0000 (21:11 +0000)]
Merge branch 'drjaska/credits-update' into 'master'
Update credits
See merge request xonotic/xonotic-data.pk3dir!1379
Dr. Jaska [Fri, 1 Nov 2024 21:11:45 +0000 (21:11 +0000)]
Update credits
terencehill [Fri, 1 Nov 2024 21:11:06 +0000 (21:11 +0000)]
Merge branch 'terencehill/stats_fix' into 'master'
Fix int and bool STATs working as float STATs
See merge request xonotic/xonotic-data.pk3dir!1352
terencehill [Thu, 31 Oct 2024 22:01:05 +0000 (23:01 +0100)]
Reduce code duplication in REGISTER_STAT
This change slightly improves compilation performance since it avoids generating about 120KB of completely useless qc code both from server and client code
terencehill [Thu, 31 Oct 2024 21:56:44 +0000 (22:56 +0100)]
Fix int and bool STATs working as float STATs
Dr. Jaska [Thu, 31 Oct 2024 13:34:16 +0000 (13:34 +0000)]
Merge branch 'Mario/plasma_removal' into 'master'
Remove the unused Plasma ammo type
Closes #2936
See merge request xonotic/xonotic-data.pk3dir!1372
terencehill [Thu, 31 Oct 2024 13:28:40 +0000 (14:28 +0100)]
Hook code: minor optimizations and cleanups
Optimizations:
- calculate dir without using normalize
- reduce scope of some variables
Cleanups:
- remove useless and outdated installation instructions
- fix mixed indentation in 2 functions (now hook.qc is fully indented with tabs)
- don't mention cvar values next to autocvars
terencehill [Thu, 31 Oct 2024 12:02:08 +0000 (13:02 +0100)]
Indent with tabs the only 2 functions indented with spaces in chat.qc; while at it shorten a few lines
terencehill [Thu, 31 Oct 2024 11:47:40 +0000 (12:47 +0100)]
havocbot_chooseweapon: minor optimizations and cleanups
Optimizations:
- Simplify combo_time calculation
- Calculate distance only when needed
Rudolf Polzer [Wed, 30 Oct 2024 16:57:24 +0000 (12:57 -0400)]
Fix the bounds check issue for real.
No idea _why_ we get here with a null weaponentity though.
Rudolf Polzer [Wed, 30 Oct 2024 16:50:40 +0000 (12:50 -0400)]
Fix another invalid array access.
Rudolf Polzer [Wed, 30 Oct 2024 16:41:51 +0000 (12:41 -0400)]
Fix an out of bounds array access.
Rudolf Polzer [Wed, 30 Oct 2024 06:23:16 +0000 (07:23 +0100)]
Transifex autosync
Rudolf Polzer [Tue, 29 Oct 2024 06:23:16 +0000 (07:23 +0100)]
Transifex autosync
Dr. Jaska [Fri, 25 Oct 2024 22:43:18 +0000 (22:43 +0000)]
Merge branch 'drjaska/mgdamageaccumulation' into 'master'
Machinegun cold/heat damage multipliers based on accumulated spread
See merge request xonotic/xonotic-data.pk3dir!930
drjaska [Thu, 5 Sep 2024 05:50:38 +0000 (08:50 +0300)]
Implement damage scaling based on accumulated spread
terencehill [Thu, 24 Oct 2024 19:49:04 +0000 (19:49 +0000)]
Merge branch 'terencehill/menu_textbox_fixes' into 'master'
Menu: fix some issues with text boxes
See merge request xonotic/xonotic-data.pk3dir!1378
terencehill [Thu, 24 Oct 2024 16:04:03 +0000 (16:04 +0000)]
Merge branch 'terencehill/arc-beam_more_fixes' into 'master'
Fix and optimize Arc beam code
See merge request xonotic/xonotic-data.pk3dir!1304
terencehill [Thu, 24 Oct 2024 15:59:22 +0000 (17:59 +0200)]
Update hash
terencehill [Thu, 24 Oct 2024 15:56:15 +0000 (17:56 +0200)]
Merge branch 'master' into terencehill/arc-beam_more_fixes
terencehill [Thu, 24 Oct 2024 15:53:49 +0000 (15:53 +0000)]
Merge branch 'terencehill/corpse_size_fix' into 'master'
Fix #2922 "Player corpse not resized when suiciding with a weapon"
Closes #2922
See merge request xonotic/xonotic-data.pk3dir!1376
terencehill [Thu, 24 Oct 2024 15:44:46 +0000 (17:44 +0200)]
Fix #2922 "Player corpse not resized when suiciding with a weapon"
Fixed by moving code that resizes player bbox from PlayerPostThink to EndFrame, which is executed later.
Also update hash
terencehill [Thu, 24 Oct 2024 15:42:50 +0000 (15:42 +0000)]
Merge branch 'drjaska/mgspreaddecay' into 'master'
Machinegun time based spread decay, support for inverse spread
Closes #2560
See merge request xonotic/xonotic-data.pk3dir!889