]>
git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/log
terencehill [Thu, 25 May 2023 15:12:25 +0000 (15:12 +0000)]
Merge branch 'drjaska/2809-splashdmgforcecalcfix' into 'master'
Resolve "Setting a weapon's primary damage to 1 causes extremely overpowered push"
Closes #2809
See merge request xonotic/xonotic-data.pk3dir!1145
Dr. Jaska [Thu, 25 May 2023 15:12:25 +0000 (15:12 +0000)]
Resolve "Setting a weapon's primary damage to 1 causes extremely overpowered push"
LegendaryGuard [Thu, 25 May 2023 10:09:06 +0000 (10:09 +0000)]
Increase IGNORE_MAXPLAYERS to 16
LegendaryGuard [Thu, 25 May 2023 10:04:18 +0000 (10:04 +0000)]
Merge branch 'LegendaryGuard/avoid_spam_map_custom_fields' into 'master'
Add SPAWNFUNC_CHECK_FIELDS macro to enable/disable map entity whitelist checks
See merge request xonotic/xonotic-data.pk3dir!1163
LegendaryGuard [Thu, 25 May 2023 10:04:18 +0000 (10:04 +0000)]
Add SPAWNFUNC_CHECK_FIELDS macro to enable/disable map entity whitelist checks
bones_was_here [Thu, 25 May 2023 07:53:22 +0000 (07:53 +0000)]
Merge branch 'LegendaryGuard/banningsystems' into 'master'
New banning systems (ignore, muteban, voteban and playban) and new features for moderation purposes
Closes #1675 and #1424
See merge request xonotic/xonotic-data.pk3dir!945
LegendaryGuard [Thu, 25 May 2023 07:53:21 +0000 (07:53 +0000)]
New banning systems (ignore, muteban, voteban and playban) and new features for moderation purposes
bones_was_here [Thu, 25 May 2023 07:39:04 +0000 (07:39 +0000)]
Merge branch 'bones_was_here/ka_fixes' into 'master'
Keepaway fixes
See merge request xonotic/xonotic-data.pk3dir!1175
bones_was_here [Tue, 23 May 2023 10:22:57 +0000 (20:22 +1000)]
keepaway: make warning punchier and more suitable for teamplay
bones_was_here [Tue, 23 May 2023 02:10:11 +0000 (12:10 +1000)]
keepaway: reduce ball force scaling
It was too super bouncy ball and annoying to chase in more complex maps
because usually everyone is shooting near it.
For reference CTF flags use 2, but CTF is typically played in more
spacious maps than KA.
bones_was_here [Sat, 20 May 2023 04:06:24 +0000 (14:06 +1000)]
keepaway: make dropped ball cast light, same as a player carrying it
Looked weird having a bright energy ball that emits no light, and it was
inconsistent.
bones_was_here [Tue, 23 May 2023 01:59:18 +0000 (11:59 +1000)]
Minor cleanups in keepaway
bones_was_here [Mon, 22 May 2023 14:05:10 +0000 (00:05 +1000)]
keepaway: fix bug where on certain maps the ball had no proper bbox
This made it annoyingly hard to pick up on eg tuhma, and it would land
in places it shouldn't fit.
bones_was_here [Thu, 25 May 2023 07:05:59 +0000 (17:05 +1000)]
Revert "Update hash for revert of business parts of !1131"
This reverts commit
87ff29a4e31209d48ffd33b32b7e4a55651af0f6 .
bones_was_here [Thu, 25 May 2023 06:58:42 +0000 (16:58 +1000)]
Update hash for revert of business parts of !1131
bones_was_here [Thu, 25 May 2023 06:57:02 +0000 (16:57 +1000)]
Revert "Remove legacy Quake bbox expansion: map entities"
This reverts commit
5f32ac7b184434178f0b2c501ade8c86574e6c48 .
bones_was_here [Thu, 25 May 2023 06:56:59 +0000 (16:56 +1000)]
Revert "Use correct pickup item bboxes on clients"
This reverts commit
2c5fb2544a77f2cf5fb786aca0d3e8b6e8aaf0cb .
bones_was_here [Thu, 25 May 2023 06:56:54 +0000 (16:56 +1000)]
Revert "Remove legacy Quake bbox expansion: projectiles"
This reverts commit
bf1d64ebc5c2867b079a0bfa09f448f076d6be01 .
bones_was_here [Thu, 25 May 2023 06:54:40 +0000 (16:54 +1000)]
Revert "Fix thrown/dropped loot items getting stuck in solid"
This reverts commit
eff0369f298449514619f34ce0c793bdb960b2b3 .
bones_was_here [Thu, 25 May 2023 06:54:28 +0000 (16:54 +1000)]
Revert "Fix thrown/dropped gametype objectives getting stuck in solid"
This reverts commit
858e9781f39d5dafa93eabbfd873858f592d3b0e .
Rudolf Polzer [Thu, 25 May 2023 05:23:12 +0000 (07:23 +0200)]
Transifex autosync
bones_was_here [Thu, 25 May 2023 02:47:41 +0000 (12:47 +1000)]
Fix thrown/dropped gametype objectives getting stuck in solid
This should have been included in
https://gitlab.com/xonotic/xonotic-data.pk3dir/-/merge_requests/1131
bones_was_here [Thu, 25 May 2023 02:47:25 +0000 (12:47 +1000)]
Fix thrown/dropped loot items getting stuck in solid
And some nearby cleanup in _StartItem().
This should have been included in
https://gitlab.com/xonotic/xonotic-data.pk3dir/-/merge_requests/1131
Rudolf Polzer [Wed, 24 May 2023 05:23:11 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Tue, 23 May 2023 14:13:21 +0000 (14:13 +0000)]
Merge branch 'drjaska/wep-reload-fixes' into 'master'
Fix crylink and vaporizer being able to fire with empty magazines
See merge request xonotic/xonotic-data.pk3dir!1147
Dr. Jaska [Tue, 23 May 2023 14:13:19 +0000 (14:13 +0000)]
Fix crylink and vaporizer being able to fire with empty magazines
terencehill [Tue, 23 May 2023 14:11:01 +0000 (14:11 +0000)]
Merge branch 'drjaska/crylink-waitrelease' into 'master'
Crylink: require 2 or more pellets for waitrelease
See merge request xonotic/xonotic-data.pk3dir!1153
Dr. Jaska [Tue, 23 May 2023 14:11:00 +0000 (14:11 +0000)]
Crylink: require 2 or more pellets for waitrelease
terencehill [Tue, 23 May 2023 14:10:11 +0000 (14:10 +0000)]
Merge branch 'terencehill/democamera_fix' into 'master'
Demo camera: fix jerky mouse movement in all directions
See merge request xonotic/xonotic-data.pk3dir!1151
bones_was_here [Tue, 23 May 2023 11:51:18 +0000 (21:51 +1000)]
sv_q3compat_changehitbox: use correct model scale and offset
This reverts
ead859bab7cbd97dea819ac023599c10a3bb017c
forgot to check model offset, oops
and better documents the config.
Player's head no longer sticks out of the bbox, offset and scaling are
equivalent to default settings.
Rudolf Polzer [Tue, 23 May 2023 05:23:11 +0000 (07:23 +0200)]
Transifex autosync
Dr. Jaska [Mon, 22 May 2023 13:52:50 +0000 (13:52 +0000)]
Merge branch 'Spike29/translators_credits_update' into 'master'
Update the list of translators in the credits
See merge request xonotic/xonotic-data.pk3dir!1176
drjaska [Mon, 22 May 2023 13:17:39 +0000 (16:17 +0300)]
hash fix
Rudolf Polzer [Mon, 22 May 2023 05:23:13 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Sun, 21 May 2023 12:19:34 +0000 (14:19 +0200)]
Add Survival strings before the merge of Survival to give translators time to translate them
terencehill [Sun, 21 May 2023 17:04:57 +0000 (17:04 +0000)]
Merge branch 'bones_was_here/sv_legacy_bbox_expand' into 'master'
Remove legacy Quake bbox expansion, give QC full control of bboxes
See merge request xonotic/xonotic-data.pk3dir!1131
bones_was_here [Thu, 18 May 2023 13:25:23 +0000 (23:25 +1000)]
Remove legacy Quake bbox expansion: projectiles
All the "zero size" projectiles now need a size so they can
trigger a warpzone's touch func. Prevously DP gave most of them
mins '-1 -1 -1' maxs '1 1 1' for the purpose of those tests
(but not all tests).
Because of that these projectiles now need a different way to avoid
colliding with each other. Comparison of the `clipgroup` field is used
as DP_RM_CLIPGROUP will make this more optimal for performance and is
also implemented in QC here for compatibility with old DP versions.
bones_was_here [Thu, 18 May 2023 12:34:27 +0000 (22:34 +1000)]
Use correct pickup item bboxes on clients
CSQC items currently don't use the item registry so properties including
model and size must be networked.
bones_was_here [Thu, 18 May 2023 13:13:20 +0000 (23:13 +1000)]
Remove legacy Quake bbox expansion: map entities
This gives QC full control of bboxes
and makes SVQC and CSQC behaviour consistent.
Adds a Small item bbox which is the size most items had previously
if expansion wasn't counted.
Changes powerup, buff and mega pickups to have the same height.
This will make it cheaper to network that information to clients.
Groups all the sv_gameplayfix cvars together in xonotic-server.cfg.
Removes duplication of the item mins/maxs definition
and box + '1 1 1' code.
bones_was_here [Fri, 3 Feb 2023 04:40:07 +0000 (14:40 +1000)]
Include boxesoverlap() in WarpZoneLib_ExactTrigger_Touch() for convenient efficiency and less code duplication
bones_was_here [Fri, 3 Feb 2023 03:38:44 +0000 (13:38 +1000)]
Invert bool WarpZoneLib_ExactTrigger_Touch() so it's easier to use
bones_was_here [Fri, 3 Feb 2023 03:00:05 +0000 (13:00 +1000)]
Remove trigger_init(), it's in the way and is mostly duplicating WarpZoneLib_ExactTrigger_Init() code
Spike29 [Sun, 21 May 2023 14:18:22 +0000 (16:18 +0200)]
Update the list of translators:
Add Chinese (Hong Kong), Indonesian and Latin sections.
Remove the Cornish and Scottish Gaelic sections, as these languages aren't complete enough to be listed in the menu.
bones_was_here [Sun, 21 May 2023 14:06:38 +0000 (00:06 +1000)]
pipeline: don't enable engine timestamps and then filter them out of the hash
This is annoying when using `diff` to compare pipeline logs.
Rudolf Polzer [Sun, 21 May 2023 05:23:08 +0000 (07:23 +0200)]
Transifex autosync
bones_was_here [Sun, 21 May 2023 01:53:50 +0000 (01:53 +0000)]
Merge branch 'terencehill/instagib_powerup_distribution' into 'master'
Improve instagib powerup replacement algorithm + Extralife pickup sound fix
See merge request xonotic/xonotic-data.pk3dir!1174
terencehill [Sat, 20 May 2023 12:27:22 +0000 (14:27 +0200)]
Show the correct key to join a team in the team selection interface; it fixes #2836
terencehill [Fri, 19 May 2023 22:19:33 +0000 (00:19 +0200)]
Instagib: select a random powerup to replace an item among the less spawned ones so that there can't be many powerups of one type and few of another type
terencehill [Fri, 19 May 2023 21:58:35 +0000 (23:58 +0200)]
Fix Extralife pickup sound stopping long powerup sounds
terencehill [Fri, 19 May 2023 15:20:39 +0000 (15:20 +0000)]
Merge branch 'bones_was_here/BoxTouchesBrush' into 'master'
WarpZoneLib_BoxTouchesBrush() fixes
See merge request xonotic/xonotic-data.pk3dir!1142
terencehill [Fri, 19 May 2023 14:46:53 +0000 (16:46 +0200)]
hud_panel_scoreboard_ping_* cvars: fix typos in 2 cvar names, remove the redundant _milliseconds suffix and improve descriptions
terencehill [Fri, 19 May 2023 14:14:42 +0000 (16:14 +0200)]
Consistent description style for a couple Instagib cvars
terencehill [Fri, 19 May 2023 14:12:46 +0000 (16:12 +0200)]
Implement the gametypevote global as bool both in server and client code
LegendaryGuard [Fri, 19 May 2023 14:04:52 +0000 (14:04 +0000)]
Merge branch 'z411/green_ping' into 'master'
Make best pings green, good pings yellow, medium pings orange and worst pings red in scoreboard
See merge request xonotic/xonotic-data.pk3dir!968
z411 [Fri, 19 May 2023 14:04:52 +0000 (14:04 +0000)]
Make best pings green, good pings yellow, medium pings orange and worst pings red in scoreboard
bones_was_here [Fri, 19 May 2023 13:09:26 +0000 (23:09 +1000)]
Fix visual glitch when traversing warpzones with sv_areagrid_link_SOLID_NOT 0
At a specific position the black texture with green lines was visible.
terencehill [Fri, 19 May 2023 12:50:30 +0000 (12:50 +0000)]
Merge branch 'drjaska/mapvote-all-abstain' into 'master'
100% abstain votes in map voting now chooses a random map
Closes #2443
See merge request xonotic/xonotic-data.pk3dir!1172
Dr. Jaska [Fri, 19 May 2023 12:50:30 +0000 (12:50 +0000)]
Fix #2443 "Map voting countdown continues even when all players have selected 'don't care'" and the first votable option always being picked when `sv_vote_gametype_default_current` == 1 instead of a random map even though someone voted for abstain.
bones_was_here [Fri, 19 May 2023 10:19:33 +0000 (20:19 +1000)]
Update dpdefs/upstream
bones_was_here [Fri, 19 May 2023 09:55:16 +0000 (19:55 +1000)]
Change update logic from missing-file-specific to version-specific
bones_was_here [Fri, 24 Feb 2023 01:01:57 +0000 (11:01 +1000)]
Work around trigger_hurt not being detected by tracebox on geit3ctf1
bones_was_here [Thu, 23 Feb 2023 23:29:36 +0000 (09:29 +1000)]
WarpZoneLib_BoxTouchesBrush: deglobalise, add TODO
bones_was_here [Thu, 23 Feb 2023 23:08:59 +0000 (09:08 +1000)]
WarpZoneLib_BoxTouchesBrush: fix whitespace
bones_was_here [Mon, 15 May 2023 17:48:54 +0000 (17:48 +0000)]
Merge branch 'Juhu/link_after_solid' into 'master'
Fix some bmodels not being linked/unlinked correctly with sv_areagrid_link_SOLID_NOT 0
Closes #2832
See merge request xonotic/xonotic-data.pk3dir!1168
Juhu [Mon, 15 May 2023 17:48:53 +0000 (17:48 +0000)]
Fix some bmodels not being linked/unlinked correctly with sv_areagrid_link_SOLID_NOT 0
Rudolf Polzer [Sun, 14 May 2023 05:23:11 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Sat, 13 May 2023 21:46:43 +0000 (23:46 +0200)]
Minor cleanups
terencehill [Sat, 13 May 2023 21:39:50 +0000 (23:39 +0200)]
Fix application crash executing cl_cmd debugmodel without model name parameter
bones_was_here [Wed, 10 May 2023 18:25:50 +0000 (04:25 +1000)]
Merge 'add %o and %O to chat formatting for own origin' into 'master'
See merge request https://gitlab.com/xonotic/xonotic-data.pk3dir/-/merge_requests/1166
bones_was_here [Wed, 10 May 2023 17:21:08 +0000 (17:21 +0000)]
Merge branch 'drjaska/monster-loot-offswitch' into 'master'
Monster loot off-switch
See merge request xonotic/xonotic-data.pk3dir!1162
Dr. Jaska [Wed, 10 May 2023 17:21:08 +0000 (17:21 +0000)]
Monster loot off-switch
bones_was_here [Wed, 10 May 2023 16:55:32 +0000 (16:55 +0000)]
Merge branch 'terencehill/scores_per_round' into 'master'
Scoreboard: allow showing average scores per round
See merge request xonotic/xonotic-data.pk3dir!975
terencehill [Wed, 10 May 2023 16:55:31 +0000 (16:55 +0000)]
Scoreboard: allow showing average scores per round
bones_was_here [Wed, 10 May 2023 16:44:18 +0000 (16:44 +0000)]
Merge branch 'drjaska/maplist-remove' into 'master'
fix g_maplist_remove completely breaking due to argv override
Closes #2719
See merge request xonotic/xonotic-data.pk3dir!1156
Dr. Jaska [Wed, 10 May 2023 16:44:18 +0000 (16:44 +0000)]
fix g_maplist_remove completely breaking due to argv override
bones_was_here [Wed, 10 May 2023 08:10:26 +0000 (08:10 +0000)]
Merge branch 'terencehill/instagib_item_fix' into 'master'
Instagib and LMS: fix a few issues with instagib items and in particular extralife
See merge request xonotic/xonotic-data.pk3dir!1164
drjaska [Wed, 10 May 2023 03:06:23 +0000 (06:06 +0300)]
add %o and %O to chat formatting for origin
%O is just for more decimals as an opt-in if %o isn't accurate enough.
terencehill [Tue, 9 May 2023 22:30:22 +0000 (00:30 +0200)]
Merge the instagib_replace_with_* functions into a single function
terencehill [Sun, 7 May 2023 13:28:22 +0000 (15:28 +0200)]
LMS and Instagib: fix extralife not counted in the Itemstats panel and wrongly displayed in the Pickup panel
bones_was_here [Tue, 9 May 2023 09:09:10 +0000 (09:09 +0000)]
Merge branch 'bones_was_here/autopause_dedicated' into 'master'
Autopause for dedicated servers, better autopause for singleplayer/listen
Closes #2670
See merge request xonotic/xonotic-data.pk3dir!1144
bones_was_here [Tue, 9 May 2023 09:04:05 +0000 (09:04 +0000)]
Merge branch 'drjaska/whitelist_weaponarena' into 'master'
whitelist g_*_weaponarena "most" and "most_available"
See merge request xonotic/xonotic-data.pk3dir!1103
Dr. Jaska [Tue, 9 May 2023 09:04:05 +0000 (09:04 +0000)]
whitelist g_*_weaponarena "most" and "most_available"
Rudolf Polzer [Sun, 7 May 2023 05:23:12 +0000 (07:23 +0200)]
Transifex autosync
terencehill [Sat, 6 May 2023 21:53:34 +0000 (23:53 +0200)]
LMS: if normal items are enabled don't convert megahealth to extralife
terencehill [Sat, 6 May 2023 15:06:20 +0000 (17:06 +0200)]
LMS: fix megahealths from other games not getting replaced by extralife
terencehill [Sat, 6 May 2023 13:22:44 +0000 (15:22 +0200)]
Instagib: fix ammo from other games not getting replaced by vaporizer cells (if enabled by the g_instagib_ammo_convert_<ammotype> cvars, disabled by default)
terencehill [Fri, 5 May 2023 16:34:47 +0000 (18:34 +0200)]
Instagib: fix items from other games not getting replaced by instagib powerups
terencehill [Thu, 4 May 2023 17:08:19 +0000 (19:08 +0200)]
Allow bots to be teleported while dead and with their body exploded (invisible) just like other players. This commit basically reverts
b0df2001
terencehill [Thu, 4 May 2023 15:26:22 +0000 (17:26 +0200)]
Damage effects can't be applied on pure entities, ignore them for a small performance gain. In particular 2 pure entities attached to each player are now always ignored: shownames_tag and ENT_CLIENT_ENTCS
terencehill [Thu, 4 May 2023 15:02:09 +0000 (17:02 +0200)]
Properly network negative radius in the damage effects code, it fixes a bug where negative force was applied to gibs and casings as a random positive value
terencehill [Thu, 4 May 2023 13:28:24 +0000 (15:28 +0200)]
Fix wrong bot check in a FOREACH_CLIENT loop
terencehill [Wed, 3 May 2023 22:41:35 +0000 (22:41 +0000)]
Merge branch 'Juhu/q3df_teleporter_flags' into 'master'
q3df teleporter flags
Closes #2574
See merge request xonotic/xonotic-data.pk3dir!1135
Juhu [Wed, 3 May 2023 22:41:34 +0000 (22:41 +0000)]
q3df teleporter flags
terencehill [Tue, 2 May 2023 17:02:48 +0000 (17:02 +0000)]
Merge branch 'terencehill/hud_editor_centerline' into 'master'
Hud editor center line
See merge request xonotic/xonotic-data.pk3dir!1157
terencehill [Tue, 2 May 2023 16:58:01 +0000 (16:58 +0000)]
Merge branch 'LegendaryGuard/electricity_effect' into 'master'
New electricity effect
Closes #2717
See merge request xonotic/xonotic-data.pk3dir!1062
LegendaryGuard [Tue, 2 May 2023 16:58:00 +0000 (16:58 +0000)]
New electricity effect
Rudolf Polzer [Sun, 30 Apr 2023 05:23:12 +0000 (07:23 +0200)]
Transifex autosync
bones_was_here [Fri, 28 Apr 2023 19:44:14 +0000 (19:44 +0000)]
Merge branch 'bones_was_here/areagrid_link_SOLID_NOT' into 'master'
Don't link pure and SOLID_NOT entities to the area grid in DP master
Closes darkplaces#381
See merge request xonotic/xonotic-data.pk3dir!1154
terencehill [Tue, 25 Apr 2023 09:34:21 +0000 (11:34 +0200)]
Remove colors from fireball_glow.tga to avoid applying wrong player's glow color on the fireball
terencehill [Tue, 25 Apr 2023 08:57:13 +0000 (08:57 +0000)]
Merge branch 'LegendaryGuard/fix_fireball_UVs' into 'master'
Optimize g_fireball and fix g_fireball and v_fireball UVs and enhance sight details in the fireball textures
See merge request xonotic/xonotic-data.pk3dir!1123