]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
18 months agoBanning system: prevent a bug where any redundant space in a ban list bans all player...
terencehill [Fri, 9 Jun 2023 14:53:59 +0000 (16:53 +0200)]
Banning system: prevent a bug where any redundant space in a ban list bans all players; also optimize PlayerInList

18 months agoFix #2840, now Invisible and Speed 2d icon powerups are visible when aren't available...
LegendaryGuard [Wed, 7 Jun 2023 11:08:15 +0000 (11:08 +0000)]
Fix #2840, now Invisible and Speed 2d icon powerups are visible when aren't available to pick up

18 months agoMerge branch 'drjaska/muteban-to-chatban' into 'master'
LegendaryGuard [Tue, 6 Jun 2023 19:44:56 +0000 (19:44 +0000)]
Merge branch 'drjaska/muteban-to-chatban' into 'master'

Rename muteban to chatban, left muteban aliases for chatban

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

18 months agoRename muteban to chatban, left muteban aliases for chatban
Dr. Jaska [Tue, 6 Jun 2023 19:44:56 +0000 (19:44 +0000)]
Rename muteban to chatban, left muteban aliases for chatban

18 months agoMerge branch 'Juhu/bot_weapcomplain' into 'master'
terencehill [Tue, 6 Jun 2023 17:46:04 +0000 (17:46 +0000)]
Merge branch 'Juhu/bot_weapcomplain' into 'master'

Fix bots selecting invalid weapons

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

18 months agotry initial bot weapon selection only at join/reset instead of repeatedly in think...
Juhu [Sun, 4 Jun 2023 03:00:18 +0000 (05:00 +0200)]
try initial bot weapon selection only at join/reset instead of repeatedly in think, prevents spammed weapon switching attempts if the bot has no weapons

18 months agoRevert "Give bots a weapon on map reset"
Juhu [Mon, 5 Jun 2023 19:47:24 +0000 (21:47 +0200)]
Revert "Give bots a weapon on map reset"

This reverts commit 4f7fbf82a607dbab329b793c527f59229acfd113.

18 months agoRevert "Campaign: give bots a weapon on map start"
Juhu [Mon, 5 Jun 2023 19:47:15 +0000 (21:47 +0200)]
Revert "Campaign: give bots a weapon on map start"

This reverts commit c2858527e0fd55a4a9b033af062aa505ee26e0f2.

18 months agoadd missing bot check in weapon complain code
Juhu [Sun, 4 Jun 2023 00:45:24 +0000 (02:45 +0200)]
add missing bot check in weapon complain code

18 months agoMerge branch 'drjaska/invalid-sv_vote_gametype_options' into 'master'
terencehill [Mon, 5 Jun 2023 17:09:40 +0000 (17:09 +0000)]
Merge branch 'drjaska/invalid-sv_vote_gametype_options' into 'master'

Fixed `sv_vote_gametype_options` so that it defaults to the current gametype if it has no valid gametypes.

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

18 months agoMerge branch 'terencehill/mapvote_fix' into 'master'
Dr. Jaska [Sun, 4 Jun 2023 19:30:42 +0000 (19:30 +0000)]
Merge branch 'terencehill/mapvote_fix' into 'master'

Fixed many crashes in map voting screen related to gametypes with low amount of supported maps.

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

18 months agoFixed many crashes in map voting screen related to gametypes with low amount of suppo...
terencehill [Sun, 4 Jun 2023 19:30:40 +0000 (19:30 +0000)]
Fixed many crashes in map voting screen related to gametypes with low amount of supported maps.

18 months agoif sv_vote_gametype_options has no valid gametypes, default to current one
drjaska [Sun, 4 Jun 2023 14:11:32 +0000 (17:11 +0300)]
if sv_vote_gametype_options has no valid gametypes, default to current one

18 months agoFix powerup waypoint stuck at '0 0 0' when a powerup is dropped inside a NODROP zone...
terencehill [Sun, 4 Jun 2023 12:19:43 +0000 (14:19 +0200)]
Fix powerup waypoint stuck at '0 0 0' when a powerup is dropped inside a NODROP zone (e.g. the pit below the Shield of arcanecitadel)

18 months agoFix trigger_push and trigger_impulse prediction
bones_was_here [Sat, 3 Jun 2023 18:01:22 +0000 (04:01 +1000)]
Fix trigger_push and trigger_impulse prediction

It's a bit awkward that some triggers require the model field unset and
others require it unchanged, so rather than having duplicated code that
restores it after it was unset, an argument is added to control that
behaviour.

This should have been included in 2b46f62db61e8ca869fc591d9ebe4053c3e876d7
and/or 0f843f8c9e7891ba3029ac5a18c6ebebde3a30da

See also: https://gitlab.com/xonotic/xonotic-data.pk3dir/-/issues/2838

18 months agowhitelist g_ca_prevent_stalemate based on unanimous council poll
drjaska [Sat, 3 Jun 2023 12:11:28 +0000 (15:11 +0300)]
whitelist g_ca_prevent_stalemate based on unanimous council poll

18 months agoFix indenting in qcsrc/client/items/items.qc
bones_was_here [Sat, 3 Jun 2023 07:57:02 +0000 (17:57 +1000)]
Fix indenting in qcsrc/client/items/items.qc

18 months agoTransifex autosync
Rudolf Polzer [Sat, 3 Jun 2023 05:23:08 +0000 (07:23 +0200)]
Transifex autosync

18 months agoMap vote screen: fix abstain vote shown over the winner map
terencehill [Fri, 2 Jun 2023 23:00:57 +0000 (01:00 +0200)]
Map vote screen: fix abstain vote shown over the winner map

18 months agoOptimize maplist shuffle algorithm by reducing the number of strcats
terencehill [Fri, 2 Jun 2023 21:31:37 +0000 (23:31 +0200)]
Optimize maplist shuffle algorithm by reducing the number of strcats

18 months agoMerge branch 'Juhu/strafehud-centerline' into 'master'
terencehill [Fri, 2 Jun 2023 07:40:48 +0000 (07:40 +0000)]
Merge branch 'Juhu/strafehud-centerline' into 'master'

Remove the center panel button in the strafehud hud editor dialog

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

18 months agoTransifex autosync
Rudolf Polzer [Thu, 1 Jun 2023 05:23:10 +0000 (07:23 +0200)]
Transifex autosync

18 months agoMerge branch 'z411/double_announcer_fix' into 'master'
bones_was_here [Thu, 1 Jun 2023 03:43:35 +0000 (03:43 +0000)]
Merge branch 'z411/double_announcer_fix' into 'master'

Fix "prepare for battle" playing twice on round-based modes

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

18 months agoFix "prepare for battle" playing twice on round-based modes
z411 [Thu, 1 Jun 2023 03:43:34 +0000 (03:43 +0000)]
Fix "prepare for battle" playing twice on round-based modes

18 months agoMerge branch 'terencehill/misc_stuff' into 'master'
z411 [Wed, 31 May 2023 23:34:48 +0000 (23:34 +0000)]
Merge branch 'terencehill/misc_stuff' into 'master'

Useful tools for debugging

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

18 months agoUseful tools for debugging
terencehill [Wed, 31 May 2023 23:34:47 +0000 (23:34 +0000)]
Useful tools for debugging

18 months agostrafehud: use makeXonoticCheckBox instead of makeXonoticCheckBoxString
Juhu [Wed, 31 May 2023 17:42:18 +0000 (19:42 +0200)]
strafehud: use makeXonoticCheckBox instead of makeXonoticCheckBoxString

18 months agomake return values of int havocbot_checkdanger unique
drjaska [Wed, 31 May 2023 16:19:26 +0000 (19:19 +0300)]
make return values of int havocbot_checkdanger unique

18 months agoTransifex autosync
Rudolf Polzer [Wed, 31 May 2023 05:23:14 +0000 (07:23 +0200)]
Transifex autosync

18 months agoMerge branch 'Juhu/onslaught_solidnot_fix' into 'master'
bones_was_here [Wed, 31 May 2023 02:50:58 +0000 (02:50 +0000)]
Merge branch 'Juhu/onslaught_solidnot_fix' into 'master'

Area grid linking fixes for DP master

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

18 months agoArea grid linking fixes for DP master
Juhu [Wed, 31 May 2023 02:50:58 +0000 (02:50 +0000)]
Area grid linking fixes for DP master

18 months agoMerge branch 'drjaska/sync-bal-wep-mario' into 'master'
bones_was_here [Wed, 31 May 2023 02:48:42 +0000 (02:48 +0000)]
Merge branch 'drjaska/sync-bal-wep-mario' into 'master'

sync 2 vanilla changes to Mario's balance as per their preference

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

18 months agoMerge branch 'bones_was_here/ladderfix' into 'master'
bones_was_here [Wed, 31 May 2023 02:46:56 +0000 (02:46 +0000)]
Merge branch 'bones_was_here/ladderfix' into 'master'

func_ladder: restore the model string unset in WarpZoneLib_ExactTrigger_Init()

Closes #2838

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

18 months agopipeline: update hash, it was changed by d6fe1d381e4530b5438c7bd49b41ce2151077901
bones_was_here [Wed, 31 May 2023 02:42:47 +0000 (12:42 +1000)]
pipeline: update hash, it was changed by d6fe1d381e4530b5438c7bd49b41ce2151077901

18 months agoUse the correct team selection command in the keybinder and in other 2 places
terencehill [Tue, 30 May 2023 22:47:11 +0000 (00:47 +0200)]
Use the correct team selection command in the keybinder and in other 2 places

18 months agoSeparate alternative ban aliases from the ones automatically generated by sv_cmd...
terencehill [Tue, 30 May 2023 22:37:41 +0000 (00:37 +0200)]
Separate alternative ban aliases from the ones automatically generated by sv_cmd dumpcommands

18 months agoFix regression introduced by superbots code that broke ability to climb ladders
terencehill [Tue, 30 May 2023 21:20:16 +0000 (23:20 +0200)]
Fix regression introduced by superbots code that broke ability to climb ladders

18 months agoAdd 'muteban' alias for 'mute' command and indent code block in BAN_COMMAND for bette...
LegendaryGuard [Tue, 30 May 2023 21:08:01 +0000 (21:08 +0000)]
Add 'muteban' alias for 'mute' command and indent code block in BAN_COMMAND for better readability

18 months agoAdd columns for Team Keepaway, Mayhem and Team Mayhem
Mirio [Tue, 30 May 2023 17:58:16 +0000 (17:58 +0000)]
Add columns for Team Keepaway, Mayhem and Team Mayhem

18 months agoTransifex autosync
Rudolf Polzer [Tue, 30 May 2023 05:23:09 +0000 (07:23 +0200)]
Transifex autosync

18 months agofunc_ladder: restore the model string unset in WarpZoneLib_ExactTrigger_Init()
bones_was_here [Mon, 29 May 2023 17:15:42 +0000 (03:15 +1000)]
func_ladder: restore the model string unset in WarpZoneLib_ExactTrigger_Init()

This was previously done by trigger_init() and
should have been included in 2b46f62db61e8ca869fc591d9ebe4053c3e876d7

The only other entities using trigger_init() were trigger_impulse and
trigger_push, but those use touch funcs whereas func_ladder uses a think
func to search.

18 months agoTransifex autosync
Rudolf Polzer [Mon, 29 May 2023 05:23:11 +0000 (07:23 +0200)]
Transifex autosync

19 months agorun dos2unix on .gitlab-ci.yml
drjaska [Sun, 28 May 2023 18:14:58 +0000 (21:14 +0300)]
run dos2unix on .gitlab-ci.yml

19 months agostrafehud: replace spaces with tabs in strafehud menu code
Juhu [Sun, 28 May 2023 06:21:34 +0000 (08:21 +0200)]
strafehud: replace spaces with tabs in strafehud menu code

19 months agostrafehud: remove center panel button which is deprecated by the center line of the...
Juhu [Sun, 28 May 2023 06:19:08 +0000 (08:19 +0200)]
strafehud: remove center panel button which is deprecated by the center line of the hud editor

19 months agoIncrease Xonotic version to 0.8.6
bones_was_here [Sun, 28 May 2023 05:41:18 +0000 (15:41 +1000)]
Increase Xonotic version to 0.8.6

See also: https://gitlab.com/xonotic/xonotic-data.pk3dir/-/merge_requests/1034

19 months agoMerge branch 'pending-release' into 'master'
bones_was_here [Sun, 28 May 2023 05:36:53 +0000 (05:36 +0000)]
Merge branch 'pending-release' into 'master'

Breaking changes for 0.8.6

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

19 months agoTransifex autosync
Rudolf Polzer [Sun, 28 May 2023 05:23:11 +0000 (07:23 +0200)]
Transifex autosync

19 months agoMerge branch 'LegendaryGuard/remove_spawnfunc_check_fields' into 'master'
bones_was_here [Sun, 28 May 2023 05:18:47 +0000 (05:18 +0000)]
Merge branch 'LegendaryGuard/remove_spawnfunc_check_fields' into 'master'

Remove map entity whitelist checks

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

19 months agoRemove temporary (for translators) survival strings
bones_was_here [Sun, 28 May 2023 04:41:22 +0000 (14:41 +1000)]
Remove temporary (for translators) survival strings

19 months agoMerge remote-tracking branch 'origin/master' into pending-release
bones_was_here [Sun, 28 May 2023 04:38:13 +0000 (14:38 +1000)]
Merge remote-tracking branch 'origin/master' into pending-release

19 months agoMerge branch 'terencehill/vote_canceled' into 'master'
bones_was_here [Sun, 28 May 2023 04:09:11 +0000 (04:09 +0000)]
Merge branch 'terencehill/vote_canceled' into 'master'

When the match is over notify that the vote in progress is canceled

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

19 months agoAdd a cvar to make it easy to debug votes
terencehill [Sat, 27 May 2023 22:33:41 +0000 (00:33 +0200)]
Add a cvar to make it easy to debug votes

19 months agoSort g_ban_* cvars in xonotic-server.cfg
LegendaryGuard [Sat, 27 May 2023 22:21:51 +0000 (00:21 +0200)]
Sort g_ban_* cvars in xonotic-server.cfg

19 months agoWhen the match is over notify that the vote in progress is canceled
terencehill [Thu, 21 Jul 2022 20:18:44 +0000 (22:18 +0200)]
When the match is over notify that the vote in progress is canceled

19 months agoAdd info in g_muteban_list, g_playban_list, and g_voteban_list cvars
LegendaryGuard [Sat, 27 May 2023 22:15:33 +0000 (22:15 +0000)]
Add info in g_muteban_list, g_playban_list, and g_voteban_list cvars

19 months agoMerge branch 'terencehill/ft_froze_by_space_fix' into 'master'
terencehill [Sat, 27 May 2023 19:27:22 +0000 (19:27 +0000)]
Merge branch 'terencehill/ft_froze_by_space_fix' into 'master'

Freezetag: don't reset armor/ammo/weapons of players falling into space

Closes #2837

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

19 months agoMerge branch 'drjaska/superbots' into 'master'
Dr. Jaska [Sat, 27 May 2023 18:21:01 +0000 (18:21 +0000)]
Merge branch 'drjaska/superbots' into 'master'

Add a new bot skill level for extremely tough bots

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

19 months agoAdd a new bot skill level for extremely tough bots
Dr. Jaska [Sat, 27 May 2023 18:21:00 +0000 (18:21 +0000)]
Add a new bot skill level for extremely tough bots

19 months agoImprove a comment
terencehill [Sat, 27 May 2023 14:30:33 +0000 (16:30 +0200)]
Improve a comment

19 months agoRemove map entity whitelist checks
LegendaryGuard [Sat, 27 May 2023 10:32:22 +0000 (10:32 +0000)]
Remove map entity whitelist checks

19 months agoTransifex autosync
Rudolf Polzer [Sat, 27 May 2023 05:23:08 +0000 (07:23 +0200)]
Transifex autosync

19 months agoApply SPAWNFUNC_CHECK_FIELDS in the Makefile for customization reasons
LegendaryGuard [Fri, 26 May 2023 16:50:37 +0000 (16:50 +0000)]
Apply SPAWNFUNC_CHECK_FIELDS in the Makefile for customization reasons

19 months agoTransifex autosync
Rudolf Polzer [Fri, 26 May 2023 05:23:16 +0000 (07:23 +0200)]
Transifex autosync

19 months agoMerge branch 'terencehill/lms_spec' into 'master'
terencehill [Thu, 25 May 2023 16:35:55 +0000 (16:35 +0000)]
Merge branch 'terencehill/lms_spec' into 'master'

LMS: allow players to get back into the game if they spectated

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

19 months agoMerge branch 'drjaska/2809-splashdmgforcecalcfix' into 'master'
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

19 months agoResolve "Setting a weapon's primary damage to 1 causes extremely overpowered push"
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"

19 months agoIncrease IGNORE_MAXPLAYERS to 16
LegendaryGuard [Thu, 25 May 2023 10:09:06 +0000 (10:09 +0000)]
Increase IGNORE_MAXPLAYERS to 16

19 months agoMerge branch 'LegendaryGuard/avoid_spam_map_custom_fields' into 'master'
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

19 months agoAdd SPAWNFUNC_CHECK_FIELDS macro to enable/disable map entity whitelist checks
LegendaryGuard [Thu, 25 May 2023 10:04:18 +0000 (10:04 +0000)]
Add SPAWNFUNC_CHECK_FIELDS macro to enable/disable map entity whitelist checks

19 months agoPort !1175 (keepaway fixes) to team keepaway
bones_was_here [Thu, 25 May 2023 09:22:27 +0000 (19:22 +1000)]
Port !1175 (keepaway fixes) to team keepaway

19 months agoMerge remote-tracking branch 'origin/master' into pending-release
bones_was_here [Thu, 25 May 2023 07:59:22 +0000 (17:59 +1000)]
Merge remote-tracking branch 'origin/master' into pending-release

19 months agoMerge branch 'LegendaryGuard/banningsystems' into 'master'
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

19 months agoNew banning systems (ignore, muteban, voteban and playban) and new features for moder...
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

19 months agoMerge branch 'bones_was_here/ka_fixes' into 'master'
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

19 months agokeepaway: make warning punchier and more suitable for teamplay
bones_was_here [Tue, 23 May 2023 10:22:57 +0000 (20:22 +1000)]
keepaway: make warning punchier and more suitable for teamplay

19 months agokeepaway: reduce ball force scaling
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.

19 months agokeepaway: make dropped ball cast light, same as a player carrying it
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.

19 months agoMinor cleanups in keepaway
bones_was_here [Tue, 23 May 2023 01:59:18 +0000 (11:59 +1000)]
Minor cleanups in keepaway

19 months agokeepaway: fix bug where on certain maps the ball had no proper bbox
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.

19 months agoRevert "Update hash for revert of business parts of !1131"
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.

19 months agoUpdate hash for revert of business parts of !1131
bones_was_here [Thu, 25 May 2023 06:58:42 +0000 (16:58 +1000)]
Update hash for revert of business parts of !1131

19 months agoRevert "Remove legacy Quake bbox expansion: map entities"
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.

19 months agoRevert "Use correct pickup item bboxes on clients"
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.

19 months agoRevert "Remove legacy Quake bbox expansion: projectiles"
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.

19 months agoRevert "Fix thrown/dropped loot items getting stuck in solid"
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.

19 months agoRevert "Fix thrown/dropped gametype objectives getting stuck in solid"
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.

19 months agoTransifex autosync
Rudolf Polzer [Thu, 25 May 2023 05:23:12 +0000 (07:23 +0200)]
Transifex autosync

19 months agoFix thrown/dropped gametype objectives getting stuck in solid
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

19 months agoFix thrown/dropped loot items getting stuck in solid
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

19 months agoAlso don't increase armor and ammo of non-frozen players falling into space too;...
terencehill [Wed, 24 May 2023 22:52:41 +0000 (00:52 +0200)]
Also don't increase armor and ammo of non-frozen players falling into space too; this commit together with the previous one fixes #2837

19 months agoIf a frozen player falls into space don't increase their armor and ammo; it partially...
terencehill [Wed, 24 May 2023 17:44:56 +0000 (19:44 +0200)]
If a frozen player falls into space don't increase their armor and ammo; it partially fixes #2837

19 months agoTransifex autosync
Rudolf Polzer [Wed, 24 May 2023 05:23:11 +0000 (07:23 +0200)]
Transifex autosync

19 months agoMerge branch 'drjaska/wep-reload-fixes' into 'master'
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

19 months agoFix crylink and vaporizer being able to fire with empty magazines
Dr. Jaska [Tue, 23 May 2023 14:13:19 +0000 (14:13 +0000)]
Fix crylink and vaporizer being able to fire with empty magazines

19 months agoMerge branch 'drjaska/crylink-waitrelease' into 'master'
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

19 months agoCrylink: require 2 or more pellets for waitrelease
Dr. Jaska [Tue, 23 May 2023 14:11:00 +0000 (14:11 +0000)]
Crylink: require 2 or more pellets for waitrelease

19 months agoMerge branch 'terencehill/democamera_fix' into 'master'
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

19 months agosv_q3compat_changehitbox: use correct model scale and offset
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.

19 months agoMerge branch 'Mario/team_keepaway' into 'pending-release'
bones_was_here [Tue, 23 May 2023 08:49:45 +0000 (08:49 +0000)]
Merge branch 'Mario/team_keepaway' into 'pending-release'

Add Team Keepaway, a teamplay variant of Keepaway where points are awarded for each frag to the team in possession of the ball

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