]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
otta8634 [Wed, 25 Dec 2024 16:04:23 +0000 (00:04 +0800)]
Make luma weapon colors unique
Previously there were a few weapons which had an identical _luma simpleitems color:
- Electro and Porto-O-Launch
- Arc was very similar to the above two
- Mine Layer and Mortar
- Blaster and T.A.G. Seeker (these were also very similar to the above two)
- (New) HLAC and Grappling Hook
- Hagar and Rifle
- (New) MachineGun was very similar to the above two
- Devastator and Tuba
(I've excluded listing overkill weapons above since players shouldn't have those & others at once).
To address this, some duplicate colors were *slightly* modified:
1. Rifle is now more yellow. Chose to shift it in this direction since rifle bullet casings are often more yellow than orange
2. Hagar is now a more saturated orange. This may help distinguish it from (new) MachineGun a bit
3. Port-O-Launch (and thus Ball Stealer) are now a more saturated blue, to distinguish it from Electro
4. Arc is now a paler (whiter) blue to distinguish it from Electro. They have similar secondaries, but the Arc primary fire is quite white, so shifting the color in this direction made the most sense
5. Grappling Hook is now a bit more blue, to distinguish it from the green (new) HLAC
6. Mortar is now more red and a bit more saturated
7. Mine Layer is now a bit more orange
8. T.A.G. Seeker is now more pink to distinguish it from the Blaster and other similarly colored weapons
9. Tuba is now a brighter (whiter) yellow, to distinguish it from the Devastator
otta8634 [Thu, 12 Dec 2024 11:04:08 +0000 (19:04 +0800)]
Swap hlac colors with mg+okmg colors
Once again there are many reasons to make this change:
- All those listed in
d12dc1c164 (better that only one of the two weapons uses an identical color rather than both),
- Hlac now shoots green bullets due to
d12dc1c164 ,
- Machinegun bullet trails are yellow-orange,
- Machinegun bullet casings are yellow-ish,
- The wpcolor of Machinegun is already yellow,
- ... meaning the crosshair with `crosshair_color_special 1` is already yellow,
- The _simple simpleitems color for machinegun is already yellow,
- Making Overkill Machinegun orangey brings it closer to the Overkill Heavy Machinegun's color,
- Etc.
This will have to be followed up with a mediasource MR.
otta8634 [Wed, 11 Dec 2024 16:31:33 +0000 (00:31 +0800)]
Use _luma rather than _simple simple item colors for wpcolor
_simple colors seem to be used far less, and some of the colors are
quite dark, like the shotgun's "Cinnamon brown". This can make aiming
with it very difficult on some maps. _luma colors are used by more
people, are generally brighter, and better reflect the weapon's "true
color", so are the better option to use for wpcolor.
otta8634 [Wed, 11 Dec 2024 10:28:54 +0000 (18:28 +0800)]
Separate hlac bullets from blaster's, and make them green
All effect-stuff was copy pasted, red and green RGB components of colors were switched.
Added a fallback to use the blaster bullet effects if the hlac ones aren't available to the client.
There's many reasons to make hlac's bullets green, including:
- The wpcolor of hlac is already green, despite its bullets being red,
- ... meaning the crosshair with `crosshair_color_special 1` is already green,
- The _simple simpleitems color for hlac is already green,
- Bullets shot by a hlac aren't easily differentiable to those shot by a blaster if both are red,
- Hlac and blaster are different guns so should shoot different bullets, I know some servers make hlac bullets do different damage to blaster bullets,
- Etc.
This change will also allow for someone to make the hlac_impact effects smaller in size in future, since they can easily obstruct the victim's view due to how spammy the gun is.
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
drjaska [Thu, 24 Oct 2024 05:32:00 +0000 (08:32 +0300)]
Allow for reversed spread, inaccurate to accurate
drjaska [Wed, 4 Sep 2024 18:03:25 +0000 (21:03 +0300)]
Rework Machinegun's spread to be time-based
Rudolf Polzer [Tue, 22 Oct 2024 05:23:18 +0000 (07:23 +0200)]
Transifex autosync
Dr. Jaska [Mon, 21 Oct 2024 20:04:58 +0000 (20:04 +0000)]
Merge branch 'Mario/spawn_unique' into 'master'
Add Spawn Unique mutator to prevent spawning at the same spawn point twice in a row
See merge request xonotic/xonotic-data.pk3dir!1335
Mario [Mon, 21 Oct 2024 20:04:57 +0000 (20:04 +0000)]
Add Spawn Unique mutator to prevent spawning at the same spawn point twice in a row
terencehill [Mon, 21 Oct 2024 10:41:07 +0000 (10:41 +0000)]
Merge branch 'Mario/chase_reticle' into 'master'
Hide the zoom scope while in third person mode
Closes #2870
See merge request xonotic/xonotic-data.pk3dir!1377
Mario [Mon, 21 Oct 2024 10:41:06 +0000 (10:41 +0000)]
Hide the zoom scope while in third person mode
terencehill [Mon, 21 Oct 2024 10:41:01 +0000 (10:41 +0000)]
Merge branch 'drjaska/genmod' into 'master'
Reformat genmod.sh
See merge request xonotic/xonotic-data.pk3dir!1337
Dr. Jaska [Mon, 21 Oct 2024 10:41:01 +0000 (10:41 +0000)]
Reformat genmod.sh
Dr. Jaska [Sun, 20 Oct 2024 02:50:32 +0000 (02:50 +0000)]
Merge branch 'drjaska/race-respawn-impulse-141' into 'master'
Remove "tried to use cheat 'impulse 141'" console spam from Race/CTS
Closes #2862
See merge request xonotic/xonotic-data.pk3dir!1347
drjaska [Wed, 4 Sep 2024 09:51:54 +0000 (12:51 +0300)]
Fix #2862 "Remove "tried to use cheat 'impulse 141'" console spam from Race/CTS"
https://gitlab.com/xonotic/xonotic-data.pk3dir/-/issues/2862
terencehill [Fri, 18 Oct 2024 16:12:21 +0000 (18:12 +0200)]
Menu text boxes: don't allow drawing text over the scrollbar
terencehill [Fri, 18 Oct 2024 16:03:31 +0000 (18:03 +0200)]
Menu text boxes: fix a couple issues after screen resolution change:
1. Text wasn't rewrapped correctly for all text boxes
2. campaign and welcome text boxes displayed line feeds as unprintable characters
Also remove TOS dialogs' .text attribute since it's redundant now
terencehill [Thu, 17 Oct 2024 17:58:58 +0000 (17:58 +0000)]
Merge branch 'Mario/monster_kill_credit' into 'master'
Count frags by spawned monsters as murders
Closes #2750
See merge request xonotic/xonotic-data.pk3dir!1348
Rudolf Polzer [Wed, 16 Oct 2024 05:23:16 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Mon, 14 Oct 2024 11:15:43 +0000 (13:15 +0200)]
Replace # with attacker name in trigger_hurt entity murder message
terencehill [Fri, 11 Oct 2024 16:31:31 +0000 (18:31 +0200)]
Show trigger_hurt entity messages if present on trigger_hurt kill. FIXME: # should be replaced with attacker name in murder message
Rudolf Polzer [Sat, 12 Oct 2024 05:23:14 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Fri, 11 Oct 2024 10:49:27 +0000 (12:49 +0200)]
Show a translatable message when player is killed by trigger_hurt even if they weren't pushed by another player
terencehill [Fri, 11 Oct 2024 00:07:02 +0000 (02:07 +0200)]
Fix #2937 "Division by 0 error if starting the match while zoomed in"
Des [Thu, 10 Oct 2024 13:44:45 +0000 (10:44 -0300)]
target_checkpoints with duplicate targetname get same cp number(order) to be tolerant of bugged maps
terencehill [Thu, 10 Oct 2024 10:56:30 +0000 (12:56 +0200)]
Fix #2939 "New Toys showing up as an active modification"
Client code was wrongly building the active mutator list from local cvars when no mutator is active on the server
Rudolf Polzer [Thu, 10 Oct 2024 05:23:13 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Wed, 9 Oct 2024 18:05:07 +0000 (20:05 +0200)]
Merge branch 'master' into terencehill/arc-beam_more_fixes
# Conflicts:
# qcsrc/common/weapons/weapon/arc.qc
terencehill [Wed, 9 Oct 2024 16:27:20 +0000 (16:27 +0000)]
Merge branch 'des/race_cp_net_speed' into 'master'
Network player speed on checkpoints messages and use it for strafehud start speed
Closes #2863
See merge request xonotic/xonotic-data.pk3dir!1364
Des - [Wed, 9 Oct 2024 16:27:20 +0000 (16:27 +0000)]
Network player speed on checkpoints messages and use it for strafehud start speed
Rudolf Polzer [Wed, 9 Oct 2024 05:23:16 +0000 (07:23 +0200)]
Transifex autosync
Mario [Wed, 9 Oct 2024 01:28:10 +0000 (11:28 +1000)]
Remove the unused Plasma ammo type
terencehill [Tue, 8 Oct 2024 18:12:57 +0000 (18:12 +0000)]
Merge branch 'k9er/autodemo-keep-matches' into 'master'
Add cl_autodemo_delete_keepmatches cvar
See merge request xonotic/xonotic-data.pk3dir!1366
k9er [Tue, 8 Oct 2024 18:12:57 +0000 (18:12 +0000)]
Add cl_autodemo_delete_keepmatches cvar
Similar to `cl_autodemo_delete_keeprecords`, doesn't delete any demos where the player joined the match. Useful for non-race non-cts gamemodes.
Rudolf Polzer [Tue, 8 Oct 2024 05:23:18 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Mon, 7 Oct 2024 22:22:15 +0000 (00:22 +0200)]
Run qcsrc/tools/genmod.sh
terencehill [Mon, 7 Oct 2024 22:21:31 +0000 (22:21 +0000)]
Merge branch 'k9er/rename-intermediate' into 'master'
Rename "Intermediate %d" to "Checkpoint %d"
See merge request xonotic/xonotic-data.pk3dir!1368
k9er [Mon, 7 Oct 2024 22:21:31 +0000 (22:21 +0000)]
Rename "Intermediate %d" to "Checkpoint %d"
terencehill [Mon, 7 Oct 2024 18:05:46 +0000 (18:05 +0000)]
Merge branch 'des/remove_many_backslashes' into 'master'
Chat: Remove support for \ as escape character for everything but "\\", "\n" and "\%".
Closes #2529
See merge request xonotic/xonotic-data.pk3dir!1369