]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
3 months agoMerge remote-tracking branch 'origin/Juhu/strafehud-next_cvarsave' into morosophos...
Nikolay S [Tue, 14 Jan 2025 18:59:59 +0000 (19:59 +0100)]
Merge remote-tracking branch 'origin/Juhu/strafehud-next_cvarsave' into morosophos/server-current4

3 months agoFix double quotes in strafehud.qh description strings
Juhu [Tue, 14 Jan 2025 17:53:39 +0000 (18:53 +0100)]
Fix double quotes in strafehud.qh description strings

3 months agoMerge remote-tracking branch 'origin/master' into morosophos/server-current4
Nikolay S [Tue, 14 Jan 2025 12:01:57 +0000 (13:01 +0100)]
Merge remote-tracking branch 'origin/master' into morosophos/server-current4

3 months agoMerge remote-tracking branch 'origin/Juhu/strafehud-next_cvarsave' into morosophos...
Nikolay S [Tue, 14 Jan 2025 12:01:13 +0000 (13:01 +0100)]
Merge remote-tracking branch 'origin/Juhu/strafehud-next_cvarsave' into morosophos/server-current4

3 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

3 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

3 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

3 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

3 months agoMerge branch 'Juhu/strafehud-next' into Juhu/strafehud-next_cvarsave
Juhu [Mon, 13 Jan 2025 20:01:49 +0000 (21:01 +0100)]
Merge branch 'Juhu/strafehud-next' into Juhu/strafehud-next_cvarsave

3 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

3 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

3 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

3 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

3 months agostrafehud: misc cosmetic code changes
Juhu [Sun, 12 Jan 2025 14:49:05 +0000 (15:49 +0100)]
strafehud: misc cosmetic code changes

3 months agostrafehud: the correct friction value is now used if you are on a non-slick surface...
Juhu [Sun, 12 Jan 2025 13:58:43 +0000 (14:58 +0100)]
strafehud: the correct friction value is now used if you are on a non-slick surface while PHYS_FRICTION is zero, reported by k9er

3 months agostrafehud: applied review changes by k9er
Juhu [Sun, 12 Jan 2025 12:48:28 +0000 (13:48 +0100)]
strafehud: applied review changes by k9er

3 months agoMerge branch 'master' into Juhu/strafehud-next
Juhu [Sun, 12 Jan 2025 02:48:35 +0000 (03:48 +0100)]
Merge branch 'master' into Juhu/strafehud-next

Fixed merge conflicts caused by CVAR description and strafehud logic changes

3 months agostrafehud: simplify some gradient related code and remove obsolete project_width...
Juhu [Sun, 12 Jan 2025 01:12:43 +0000 (02:12 +0100)]
strafehud: simplify some gradient related code and remove obsolete project_width parameter

3 months agostrafehud: changed terminology surrounding the two gradient rendering methods
Juhu [Sun, 12 Jan 2025 00:44:02 +0000 (01:44 +0100)]
strafehud: changed terminology surrounding the two gradient rendering methods

the cvar values are now swapped putting the faster renderer first

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

3 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

3 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

3 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

3 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

3 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

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

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

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

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

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

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

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

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

3 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

3 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

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

3 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

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

3 months agoFix case of trails not being drawn on CSQC models with unset alpha.
Rudolf Polzer [Thu, 2 Jan 2025 23:58:19 +0000 (18:58 -0500)]
Fix case of trails not being drawn on CSQC models with unset alpha.

That bug was found by Mario in
https://gitlab.com/xonotic/xonotic-data.pk3dir/-/merge_requests/1410#note_2279399941
and was actually pre-existing even before the change, as it was passing
0 to both alpha and count modifiers.

3 months agoMerge branch 'Mario/relay_support' into 'master'
Dr. Jaska [Thu, 2 Jan 2025 23:32:52 +0000 (23:32 +0000)]
Merge branch 'Mario/relay_support' into 'master'

Add activation support to some map entities lacking it

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

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

3 months agoMerge branch 'drjaska/viewmodel_alpha' into 'master'
Dr. Jaska [Thu, 2 Jan 2025 23:31:25 +0000 (23:31 +0000)]
Merge branch 'drjaska/viewmodel_alpha' into 'master'

Implement cl_viewmodel_alpha_min cvar

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

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

3 months agoMerge branch 'Mario/effect_colors' into 'master'
Dr. Jaska [Thu, 2 Jan 2025 23:30:18 +0000 (23:30 +0000)]
Merge branch 'Mario/effect_colors' into 'master'

Add support for networked effect colors

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

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

3 months agoMerge branch 'Mario/reticle_minalpha' into 'master'
Dr. Jaska [Thu, 2 Jan 2025 23:29:56 +0000 (23:29 +0000)]
Merge branch 'Mario/reticle_minalpha' into 'master'

Give the zoom reticle a minimum opacity from zooming to make it always visible

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

3 months agoMerge branch 'drjaska/df_wp_stackoverflow' into 'master'
terencehill [Thu, 2 Jan 2025 23:27:53 +0000 (23:27 +0000)]
Merge branch 'drjaska/df_wp_stackoverflow' into 'master'

Add stack overflow safeguard to defrag_waypointsprites

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

3 months agoMerge branch 'k9er/random-nade' into 'master'
terencehill [Thu, 2 Jan 2025 23:24:44 +0000 (23:24 +0000)]
Merge branch 'k9er/random-nade' into 'master'

Allow selecting a random nade

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

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

3 months agoMerge branch 'divVerent/alpha_comments' into 'master'
terencehill [Thu, 2 Jan 2025 16:59:11 +0000 (16:59 +0000)]
Merge branch 'divVerent/alpha_comments' into 'master'

Skip projectile alpha math if it'd be a NOP.

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

3 months agoMerge branch 'k9er/show-vaporizer-dmgtxt' into 'master'
terencehill [Thu, 2 Jan 2025 12:48:06 +0000 (12:48 +0000)]
Merge branch 'k9er/show-vaporizer-dmgtxt' into 'master'

Show Vaporizer damagetext when not playing InstaGib

Closes #1879

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

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

3 months agoGive the zoom reticle a minimum opacity from zooming to make it always visible 1413/head
Mario [Thu, 2 Jan 2025 06:40:02 +0000 (16:40 +1000)]
Give the zoom reticle a minimum opacity from zooming to make it always visible

3 months agoMerge branch 'Mario/monster_teamcolor_fix' into 'master'
Dr. Jaska [Thu, 2 Jan 2025 01:37:20 +0000 (01:37 +0000)]
Merge branch 'Mario/monster_teamcolor_fix' into 'master'

Fix monsters preferring player colours over team colours

Closes #2953

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

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

3 months agoMerge branch 'k9er/update-player-ready-icon' into 'master'
Dr. Jaska [Thu, 2 Jan 2025 00:59:27 +0000 (00:59 +0000)]
Merge branch 'k9er/update-player-ready-icon' into 'master'

Update the player_ready scoreboard icon

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

3 months agoMerge branch 'k9er/optimize-bitset-ops' into 'master'
terencehill [Thu, 2 Jan 2025 00:25:24 +0000 (00:25 +0000)]
Merge branch 'k9er/optimize-bitset-ops' into 'master'

Optimize bitset operations

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

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

3 months agoSkip projectile alpha math if it'd be a NOP. 1410/head
Rudolf Polzer [Mon, 30 Dec 2024 18:06:29 +0000 (13:06 -0500)]
Skip projectile alpha math if it'd be a NOP.

Also, comment why it works the way it is, and what it'd take to possibly
remove it.

3 months agoFix time of the dropped Invisibility being read from autocvar_g_balance_powerup_invin...
terencehill [Wed, 1 Jan 2025 23:48:07 +0000 (00:48 +0100)]
Fix time of the dropped Invisibility being read from autocvar_g_balance_powerup_invincible_time

3 months agoMerge branch 'Mario/spawn_color_fix' into 'master'
terencehill [Wed, 1 Jan 2025 23:41:31 +0000 (23:41 +0000)]
Merge branch 'Mario/spawn_color_fix' into 'master'

Fix spawn particles sometimes showing the wrong color

Closes #2955

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

3 months agoMerge remote-tracking branch 'origin/master' into morosophos/server-current4
Nikolay S [Tue, 31 Dec 2024 18:33:42 +0000 (19:33 +0100)]
Merge remote-tracking branch 'origin/master' into morosophos/server-current4

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

3 months agoSend the team number with the spawn event to ensure an accurate team colour
Mario [Mon, 30 Dec 2024 12:35:53 +0000 (22:35 +1000)]
Send the team number with the spawn event to ensure an accurate team colour

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

3 months agoRefactor and reformat weapons hud code a bit
otta8634 [Mon, 23 Dec 2024 11:19:07 +0000 (19:19 +0800)]
Refactor and reformat weapons hud code a bit

Having almost all code in the one function made it a bit difficult to understand.

3 months agostrafehud: added missing include for race_timespeed
Juhu [Tue, 24 Dec 2024 17:42:21 +0000 (18:42 +0100)]
strafehud: added missing include for race_timespeed

3 months agostrafehud: reran genmod.sh, script has been updated
Juhu [Tue, 24 Dec 2024 17:32:45 +0000 (18:32 +0100)]
strafehud: reran genmod.sh, script has been updated

3 months agostrafehud: refactored the fast gradient and added fast gradient support for non-linea...
Juhu [Tue, 24 Dec 2024 16:48:43 +0000 (17:48 +0100)]
strafehud: refactored the fast gradient and added fast gradient support for non-linear projection, this gradient is now the default

3 months agostrafehud: fix naming scheme of variables
Juhu [Tue, 24 Dec 2024 15:06:32 +0000 (16:06 +0100)]
strafehud: fix naming scheme of variables

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

3 months agoMerge remote-tracking branch 'origin/master' into morosophos/server-current4
Nikolay S [Sat, 21 Dec 2024 15:21:45 +0000 (16:21 +0100)]
Merge remote-tracking branch 'origin/master' into morosophos/server-current4

4 months agostrafehud: fix incorrect merge, pass the checkpoint speed as parameter (reported...
Juhu [Mon, 16 Dec 2024 01:18:50 +0000 (02:18 +0100)]
strafehud: fix incorrect merge, pass the checkpoint speed as parameter (reported by Des)

4 months agoUpdate the player_ready scoreboard icon 1395/head
otta8634 [Sat, 14 Dec 2024 10:28:49 +0000 (18:28 +0800)]
Update the player_ready scoreboard icon

Seems that the TGA is made from some outdated SVG not available on mediasource, the associated SVG in mediasource looks cleaner and is more consistent with the luma styling.
Regenerated the TGA.

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

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

4 months agoDon't play teamshoot sounds for damage dealt with HITTYPE_SPAM
Mario [Thu, 12 Dec 2024 17:18:40 +0000 (17:18 +0000)]
Don't play teamshoot sounds for damage dealt with HITTYPE_SPAM

4 months agoAdd an option to shorten player names in checkpoint messages to reduce overflow
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

4 months agoMerge remote-tracking branch 'origin/master' into morosophos/server-current4
Nikolay S [Wed, 11 Dec 2024 12:10:57 +0000 (13:10 +0100)]
Merge remote-tracking branch 'origin/master' into morosophos/server-current4

4 months agoTransifex autosync
Rudolf Polzer [Tue, 10 Dec 2024 06:23:18 +0000 (07:23 +0100)]
Transifex autosync

4 months agoAdd stack overflow safeguard to defrag_waypointsprites 1389/head
drjaska [Fri, 29 Nov 2024 01:31:58 +0000 (03:31 +0200)]
Add stack overflow safeguard to defrag_waypointsprites

4 months agoMerge branch 'des/racetimer_speed' into 'master'
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

4 months agoAdd support for showing speed in splits to racetimer
Des - [Tue, 3 Dec 2024 10:11:34 +0000 (10:11 +0000)]
Add support for showing speed in splits to racetimer

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

4 months agoMerge remote-tracking branch 'origin/drjaska/morosophos/server-current4' into morosop...
Nikolay S [Mon, 2 Dec 2024 08:04:30 +0000 (09:04 +0100)]
Merge remote-tracking branch 'origin/drjaska/morosophos/server-current4' into morosophos/server-current4

4 months agoPrevent recursively applying waypoints to checkpoints
Mario [Mon, 2 Dec 2024 07:34:35 +0000 (17:34 +1000)]
Prevent recursively applying waypoints to checkpoints

4 months agoMerge remote-tracking branch 'origin/master' into morosophos/server-current4
Nikolay S [Sun, 1 Dec 2024 16:06:46 +0000 (17:06 +0100)]
Merge remote-tracking branch 'origin/master' into morosophos/server-current4

4 months agoUpdate to 62363c0849f4bdfd931041764d78b40b2ddfcea3
drjaska [Sun, 1 Dec 2024 12:36:01 +0000 (14:36 +0200)]
Update to 62363c0849f4bdfd931041764d78b40b2ddfcea3

This reverts commits:
b6cb89e1397f4357e2c358c87812f96796450735
d191b6f033c572758d14b9b2772307317e2956cf

4 months agoOops, forgot to remove debugging code in the previous commit
terencehill [Sat, 30 Nov 2024 10:41:53 +0000 (11:41 +0100)]
Oops, forgot to remove debugging code in the previous commit

4 months agoPhysics code: calculate wishdir without using normalize and apply other minor math...
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

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

4 months agoAdd an option for Electro combos to deal damage over time
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

4 months agostrafehud: fix text position related config entries
Juhu [Thu, 28 Nov 2024 19:17:29 +0000 (20:17 +0100)]
strafehud: fix text position related config entries

4 months agoMerge remote-tracking branch 'origin/Juhu/strafehud-next_cvarsave' into morosophos...
Nikolay S [Thu, 28 Nov 2024 19:11:57 +0000 (20:11 +0100)]
Merge remote-tracking branch 'origin/Juhu/strafehud-next_cvarsave' into morosophos/server-current4

4 months agoMerge branch 'Juhu/strafehud-next' into Juhu/strafehud-next_cvarsave
Juhu [Thu, 28 Nov 2024 19:07:29 +0000 (20:07 +0100)]
Merge branch 'Juhu/strafehud-next' into Juhu/strafehud-next_cvarsave

4 months agoMerge branch 'master' into Juhu/strafehud-next
Juhu [Thu, 28 Nov 2024 19:02:08 +0000 (20:02 +0100)]
Merge branch 'master' into Juhu/strafehud-next

Fixed merge conflict caused by the new networked checkpoint speed

4 months agoMerge branch 'des/defragcp_gen_fix2' into 'master'
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

4 months agoMerge branch 'drjaska/q3df-rl-h-force' into 'master'
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

4 months agoq3compat: New Devastator cvar for mimicking q3df rl's horizontal force 1.2x multiplier
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

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