]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
17 months agotest disabling ka pickup delay bones_was_here/ka_nodel
bones_was_here [Fri, 7 Jul 2023 10:02:41 +0000 (20:02 +1000)]
test disabling ka pickup delay

17 months agoFixed whitespace consistency (spaces -> tabs) in qcsrc/server/main.qc
drjaska [Fri, 7 Jul 2023 08:16:04 +0000 (11:16 +0300)]
Fixed whitespace consistency (spaces -> tabs) in qcsrc/server/main.qc

17 months agoMerge branch 'drjaska/balance/crylink' into 'master'
Dr. Jaska [Mon, 3 Jul 2023 03:26:51 +0000 (03:26 +0000)]
Merge branch 'drjaska/balance/crylink' into 'master'

Crylink balance change as a bandaid fix to remove falloff from splash damage

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

17 months agoCrylink balance change as a bandaid fix to remove falloff from splash damage
Dr. Jaska [Mon, 3 Jul 2023 03:26:51 +0000 (03:26 +0000)]
Crylink balance change as a bandaid fix to remove falloff from splash damage

17 months agoRevert "Revert a change that shouldn't have been merged during release freeze"
drjaska [Sat, 1 Jul 2023 15:27:30 +0000 (18:27 +0300)]
Revert "Revert a change that shouldn't have been merged during release freeze"

This reverts commit 47864db6f1d9b2aa84e9a3abf01f8b7fd46beb15.

17 months agoMerge branch 'bones_was_here/items_svqc' into 'master'
bones_was_here [Sat, 1 Jul 2023 09:33:56 +0000 (09:33 +0000)]
Merge branch 'bones_was_here/items_svqc' into 'master'

Add a more optimised and generic function to initialise items (loot or permanent)

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

17 months agoTransifex autosync
Rudolf Polzer [Sat, 1 Jul 2023 05:23:13 +0000 (07:23 +0200)]
Transifex autosync

17 months agoTransifex autosync
Rudolf Polzer [Fri, 30 Jun 2023 05:23:11 +0000 (07:23 +0200)]
Transifex autosync

17 months agoTransifex autosync
Rudolf Polzer [Wed, 28 Jun 2023 05:23:12 +0000 (07:23 +0200)]
Transifex autosync

18 months agoTransifex autosync
Rudolf Polzer [Tue, 27 Jun 2023 05:23:11 +0000 (07:23 +0200)]
Transifex autosync

18 months agoMerge branch 'Juhu/velocity_pads' into 'master'
z411 [Tue, 27 Jun 2023 03:56:32 +0000 (03:56 +0000)]
Merge branch 'Juhu/velocity_pads' into 'master'

velocity pads

Closes #2105

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

18 months agoVelocity pads
Juhu [Tue, 27 Jun 2023 03:56:31 +0000 (03:56 +0000)]
Velocity pads

18 months agoMerge branch 'darkblue/monsters_team_cvar_default' into 'master'
terencehill [Mon, 26 Jun 2023 18:03:46 +0000 (18:03 +0000)]
Merge branch 'darkblue/monsters_team_cvar_default' into 'master'

Monsters: enable g_monsters_teams by default, preventing monsters from targeting teammates

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

18 months agoTransifex autosync
Rudolf Polzer [Sun, 25 Jun 2023 05:23:12 +0000 (07:23 +0200)]
Transifex autosync

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

18 months agoAdded g_monsters_teams cvar to monsters.cfg
darkblue0 [Thu, 22 Jun 2023 16:53:55 +0000 (19:53 +0300)]
Added g_monsters_teams cvar to monsters.cfg

18 months agoMerge branch 'Spike29/rulesetxpm' into 'master'
z411 [Fri, 23 Jun 2023 01:29:33 +0000 (01:29 +0000)]
Merge branch 'Spike29/rulesetxpm' into 'master'

Small cleanups to the XPM ruleset config

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

18 months agoSmall cleanups to the XPM ruleset config
SpiKe [Fri, 23 Jun 2023 01:29:33 +0000 (01:29 +0000)]
Small cleanups to the XPM ruleset config

18 months agoMerge branch 'LegendaryGuard/fix_playban_notif' into 'master'
LegendaryGuard [Thu, 22 Jun 2023 11:13:41 +0000 (11:13 +0000)]
Merge branch 'LegendaryGuard/fix_playban_notif' into 'master'

Remove unnecessary details in playban notification

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

18 months agoRemove unnecessary details in playban notification
LegendaryGuard [Thu, 22 Jun 2023 11:13:40 +0000 (11:13 +0000)]
Remove unnecessary details in playban notification

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

18 months agoConvert 5 trivial Item_* functions to macros
bones_was_here [Sun, 18 Jun 2023 22:54:03 +0000 (08:54 +1000)]
Convert 5 trivial Item_* functions to macros

18 months agoRemove redundant Item_* functions
bones_was_here [Mon, 19 Jun 2023 01:50:18 +0000 (11:50 +1000)]
Remove redundant Item_* functions

18 months agooverkill: optimise replacement of powerups with superweapons
bones_was_here [Sun, 18 Jun 2023 22:18:23 +0000 (08:18 +1000)]
overkill: optimise replacement of powerups with superweapons

We can use the itemdefs to skip the classname search.

18 months agoRandomItems mutator: simplify item initialisation using new function
bones_was_here [Sun, 18 Jun 2023 22:17:42 +0000 (08:17 +1000)]
RandomItems mutator: simplify item initialisation using new function

18 months agopowerups: optimise loot item spawning
bones_was_here [Mon, 19 Jun 2023 01:46:38 +0000 (11:46 +1000)]
powerups: optimise loot item spawning

We can use the itemdef to skip the classname search, and we don't need
the netname search either since we already have a jump table.

18 months agooverkill: optimise loot item mutator hooks
bones_was_here [Sun, 18 Jun 2023 22:13:58 +0000 (08:13 +1000)]
overkill: optimise loot item mutator hooks

No need to delete an item then spawn it again, and we can use the
itemdef to skip the classname search.

18 months agomonsters: use generic item initialisation when dropping loot
bones_was_here [Sun, 18 Jun 2023 22:12:43 +0000 (08:12 +1000)]
monsters: use generic item initialisation when dropping loot

Fixes monster loot sending no updates to CSQC and lacking despawn
effects.

18 months agoAdd a more optimised and generic function to initialise items (loot or permanent)
bones_was_here [Mon, 19 Jun 2023 01:04:31 +0000 (11:04 +1000)]
Add a more optimised and generic function to initialise items (loot or permanent)

It's faster when an itemdef is provided, which avoids a classname search.

18 months agoUpdate xonotic.org update nagger URLs
bones_was_here [Wed, 21 Jun 2023 10:44:21 +0000 (20:44 +1000)]
Update xonotic.org update nagger URLs

18 months agoMerge branch 'bones_was_here/806' into 'master'
bones_was_here [Tue, 20 Jun 2023 12:20:37 +0000 (22:20 +1000)]
Merge branch 'bones_was_here/806' into 'master'

This was the 0.8.6 stable release branch which needs to be merged to get
the tagged commit into master.

18 months agoUpdate the-big-keybench demo bones_was_here/806 xonotic-v0.8.6
bones_was_here [Mon, 19 Jun 2023 19:14:18 +0000 (05:14 +1000)]
Update the-big-keybench demo

18 months agoRevert a change that shouldn't have been merged during release freeze
bones_was_here [Mon, 19 Jun 2023 19:13:23 +0000 (05:13 +1000)]
Revert a change that shouldn't have been merged during release freeze

18 months agoUndefine SCO_LABEL and remove redundant default case. Also document the inverted...
terencehill [Mon, 19 Jun 2023 09:23:21 +0000 (11:23 +0200)]
Undefine SCO_LABEL and remove redundant default case. Also document the inverted logic of BotShouldAttack

18 months agoSCO_LABEL macro: remove redundant else and strcat
terencehill [Sun, 18 Jun 2023 15:36:12 +0000 (17:36 +0200)]
SCO_LABEL macro: remove redundant else and strcat

18 months agoMerge branch 'LegendaryGuard/scolabel_macro' into 'master'
terencehill [Sun, 18 Jun 2023 13:40:52 +0000 (13:40 +0000)]
Merge branch 'LegendaryGuard/scolabel_macro' into 'master'

Improve readability by replacing label switch with SCO_LABEL macro in scoreboard code

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

18 months agoImprove readability by replacing label switch with SCO_LABEL macro in scoreboard...
LegendaryGuard [Sun, 18 Jun 2023 13:40:52 +0000 (13:40 +0000)]
Improve readability by replacing label switch with SCO_LABEL macro in scoreboard code

18 months agoSort correctly Mayhem and Team Mayhem in the gametype menu list
LegendaryGuard [Sun, 18 Jun 2023 12:58:14 +0000 (12:58 +0000)]
Sort correctly Mayhem and Team Mayhem in the gametype menu list

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

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

18 months agoDisable recoil, the current implementation is unpopular
bones_was_here [Fri, 16 Jun 2023 16:30:12 +0000 (02:30 +1000)]
Disable recoil, the current implementation is unpopular

https://xonotic.org/balancevotes/5/

18 months agoFix resetmatch not deleting loot items
bones_was_here [Fri, 16 Jun 2023 12:38:50 +0000 (22:38 +1000)]
Fix resetmatch not deleting loot items

Accidentally changed the .reset function for loot in !1202

18 months agoMerge branch 'bones_was_here/itemsdesync' into 'master'
terencehill [Thu, 15 Jun 2023 21:56:43 +0000 (21:56 +0000)]
Merge branch 'bones_was_here/itemsdesync' into 'master'

Items overhaul

Closes #2824, #2059, and #1046

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

18 months agoitems: temp kludge to reduce visibility of prediction errors
bones_was_here [Thu, 15 Jun 2023 18:57:18 +0000 (04:57 +1000)]
items: temp kludge to reduce visibility of prediction errors

FIXME PROPERLY: needs moar sv_legacy_bbox_expand 0

18 months agoitems: apply 0.5s spawnshield to all loot drops by default
bones_was_here [Thu, 15 Jun 2023 20:53:25 +0000 (06:53 +1000)]
items: apply 0.5s spawnshield to all loot drops by default

This prevents immediate pickup of the dropped item.

Previously powerups used this mechanism, whereas thrown weapons could be
picked up immediately by everyone except the person who threw them.

It will be consistent for most/all loot items now, and perhaps nicer because
players should see the items in the world before picking them up so it
might feel more deliberate and less random.

18 months agopowerups: use Item_Think() for dropped powerups
bones_was_here [Wed, 14 Jun 2023 13:53:57 +0000 (23:53 +1000)]
powerups: use Item_Think() for dropped powerups

Fixes lack of updates sent to CSQC ItemDraw() for position, velocity, etc.

18 months agoitems: remove override of Item_Think() in Item_InitializeLoot()
bones_was_here [Wed, 14 Jun 2023 11:41:02 +0000 (21:41 +1000)]
items: remove override of Item_Think() in Item_InitializeLoot()

This was preventing any updates being sent to CSQC for items spawned via
this code path (except the final deletion when the item expired).

18 months agoitems: misc cleanup
bones_was_here [Sun, 11 Jun 2023 18:18:54 +0000 (04:18 +1000)]
items: misc cleanup

18 months agoitems: move particle effects to CSQC for bandwidth and consistency
bones_was_here [Sun, 11 Jun 2023 18:42:21 +0000 (04:42 +1000)]
items: move particle effects to CSQC for bandwidth and consistency

If some packets get delayed and/or resent, it should no longer be
possible see the item appear or disappear without the particles, or vice versa.

18 months agoitems: match SVQC .solid behaviour in CSQC
bones_was_here [Sun, 11 Jun 2023 17:53:44 +0000 (03:53 +1000)]
items: match SVQC .solid behaviour in CSQC

18 months agoitems: don't precache 3d models and textures when simple items are enabled
bones_was_here [Sun, 11 Jun 2023 17:09:52 +0000 (03:09 +1000)]
items: don't precache 3d models and textures when simple items are enabled

Precaching is done in CSQC. Doing it in SVQC _StartItem() was unreliable on dedicated servers because clients often connected well after the items spawned in SVQC.
Helps towards #2799

18 months agoitems: support toggling cl_simple_items at any time
bones_was_here [Sun, 11 Jun 2023 20:37:16 +0000 (06:37 +1000)]
items: support toggling cl_simple_items at any time

18 months agoitems: add loot despawn effects
bones_was_here [Sun, 11 Jun 2023 16:59:52 +0000 (02:59 +1000)]
items: add loot despawn effects

Closes #1046

18 months agoitems: use a different CSQC physics code path for smoother motion
bones_was_here [Sun, 11 Jun 2023 20:25:14 +0000 (06:25 +1000)]
items: use a different CSQC physics code path for smoother motion

Previously it ran physics in whole numbers of server frametimes, which
would cause "jumps" when the updates for a thrown item arrived.

18 months agoitems: fix animation interference with physics and reset animation properly if disabled
bones_was_here [Sun, 11 Jun 2023 17:52:25 +0000 (03:52 +1000)]
items: fix animation interference with physics and reset animation properly if disabled

Spawns item at the sine wave midpoint instead of "fading in".

18 months agoitems: alpha calculation rework
bones_was_here [Mon, 12 Jun 2023 18:38:36 +0000 (04:38 +1000)]
items: alpha calculation rework

- more efficient networking
- clients can now customise the range of the fade effect (as well as disable it)
- clients can no longer override server maxdist setting (was unfair)
- replaces vehicle ghost items with a weapon_stay-based effect
Fixes #2059

18 months agoitems: replace broken loot think implementation
bones_was_here [Thu, 15 Jun 2023 20:36:11 +0000 (06:36 +1000)]
items: replace broken loot think implementation

Implements a slow update rate for loot items, just enough to correct occasional prediction errors.
Includes SVQC prerequisites for loot item despawn effects

18 months agoMerge branch 'terencehill/campaign_message_fix' into 'master'
terencehill [Thu, 15 Jun 2023 16:59:55 +0000 (16:59 +0000)]
Merge branch 'terencehill/campaign_message_fix' into 'master'

Allow showing translated campaign level descriptions in game and add Chinese translations of the campaign

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

18 months agoAllow showing translated campaign level descriptions in game and add Chinese translat...
terencehill [Thu, 15 Jun 2023 16:59:55 +0000 (16:59 +0000)]
Allow showing translated campaign level descriptions in game and add Chinese translations of the campaign

18 months agotrigger_viewloc: don't unset model field in spawnfunc
bones_was_here [Wed, 14 Jun 2023 13:03:56 +0000 (23:03 +1000)]
trigger_viewloc: don't unset model field in spawnfunc

Fixes collision detection failure in WarpZoneLib_BoxTouchesBrush()

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

18 months agoFix menu trying to open <campaign_file.txt>.en
terencehill [Wed, 14 Jun 2023 10:40:42 +0000 (12:40 +0200)]
Fix menu trying to open <campaign_file.txt>.en

18 months agoReset ready and eliminated status in the client as soon as a player disconnects,...
terencehill [Mon, 12 Jun 2023 17:50:44 +0000 (19:50 +0200)]
Reset ready and eliminated status in the client as soon as a player disconnects, fixing players occasionally appearing as eliminated (grayed out) as soon as they join the server because they wrongly inherited status of disconnected players

18 months agoMerge branch 'drjaska/terencehill/survival_scoreboard_colors_fix' into 'master'
terencehill [Mon, 12 Jun 2023 17:35:53 +0000 (17:35 +0000)]
Merge branch 'drjaska/terencehill/survival_scoreboard_colors_fix' into 'master'

Simpler implementation of !1200 and fixes to !1195

Closes #2844

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

18 months agoSimpler implementation of !1200 and fixes to !1195
Dr. Jaska [Mon, 12 Jun 2023 17:35:53 +0000 (17:35 +0000)]
Simpler implementation of !1200 and fixes to !1195

18 months agobot_cmd: update usage example of the cc subcommand. Use the BOLD macro in 2 Survival...
terencehill [Mon, 12 Jun 2023 14:56:56 +0000 (16:56 +0200)]
bot_cmd: update usage example of the cc subcommand. Use the BOLD macro in 2 Survival notifications

18 months agoMerge branch 'drjaska/new-defaults' into 'master'
LegendaryGuard [Mon, 12 Jun 2023 00:27:50 +0000 (00:27 +0000)]
Merge branch 'drjaska/new-defaults' into 'master'

Refined default values for mouse `sensitivity` (halved from 6 to 3) and `mastervolume` (9.0 to 7.0).

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

18 months agoRefined default values for mouse `sensitivity` (halved from 6 to 3) and `mastervolume...
Dr. Jaska [Mon, 12 Jun 2023 00:27:50 +0000 (00:27 +0000)]
Refined default values for mouse `sensitivity` (halved from 6 to 3) and `mastervolume` (9.0 to 7.0).

18 months agoMerge branch 'terencehill/survival_scoreboard_colors_fix' into 'master'
LegendaryGuard [Sun, 11 Jun 2023 12:16:52 +0000 (12:16 +0000)]
Merge branch 'terencehill/survival_scoreboard_colors_fix' into 'master'

Survival: show hunters to other hunters in the scoreboard. It fixes #2844

Closes #2844

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

18 months agoSurvival: show hunters to other hunters in the scoreboard. It fixes #2844
terencehill [Sun, 11 Jun 2023 12:16:52 +0000 (12:16 +0000)]
Survival: show hunters to other hunters in the scoreboard. It fixes #2844

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

18 months agoMerge branch 'terencehill/survival_fixes' into 'master'
Dr. Jaska [Sat, 10 Jun 2023 19:26:50 +0000 (19:26 +0000)]
Merge branch 'terencehill/survival_fixes' into 'master'

Survival: refactored code to prevent cheating and 2 minor fixes

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

18 months agoMerge branch 'Juhu/vehicle_ws_fix' into 'master'
LegendaryGuard [Sat, 10 Jun 2023 17:44:50 +0000 (17:44 +0000)]
Merge branch 'Juhu/vehicle_ws_fix' into 'master'

Make primary fire work in vehicles if the player has no gun

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

18 months agoMake primary fire work in vehicles if the player has no gun
Juhu [Sat, 10 Jun 2023 17:44:50 +0000 (17:44 +0000)]
Make primary fire work in vehicles if the player has no gun

18 months agoMerge branch 'LegendaryGuard/new_minigame_banning' into 'master'
LegendaryGuard [Sat, 10 Jun 2023 08:16:28 +0000 (08:16 +0000)]
Merge branch 'LegendaryGuard/new_minigame_banning' into 'master'

Add new 'playban' cvar to disallow banned players (forced to spectate) from playing minigames

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

18 months agoAdd new 'playban' cvar to disallow banned players (forced to spectate) from playing...
LegendaryGuard [Sat, 10 Jun 2023 08:16:28 +0000 (08:16 +0000)]
Add new 'playban' cvar to disallow banned players (forced to spectate) from playing minigames

18 months agoMerge branch 'terencehill/vote_commands' into 'master'
z411 [Sat, 10 Jun 2023 02:17:26 +0000 (02:17 +0000)]
Merge branch 'terencehill/vote_commands' into 'master'

Made moveto* votes always show player ID and name, 2 other minor voting related fixes

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

18 months agoRemove 2 redundant bounds
terencehill [Fri, 9 Jun 2023 21:00:12 +0000 (23:00 +0200)]
Remove 2 redundant bounds

18 months agoMerge branch 'terencehill/banning_stuff'
terencehill [Fri, 9 Jun 2023 15:16:43 +0000 (17:16 +0200)]
Merge branch 'terencehill/banning_stuff'

18 months agoMerge branch 'drjaska/surv-columns' into 'master'
terencehill [Fri, 9 Jun 2023 15:03:16 +0000 (15:03 +0000)]
Merge branch 'drjaska/surv-columns' into 'master'

Fix default scoreboard columns for survival

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

18 months agoFix default scoreboard columns for survival
Dr. Jaska [Fri, 9 Jun 2023 15:03:16 +0000 (15:03 +0000)]
Fix default scoreboard columns for survival

18 months agoFix and improve many ban cvar descriptions
terencehill [Fri, 9 Jun 2023 14:55:52 +0000 (16:55 +0200)]
Fix and improve many ban cvar descriptions

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 agoTransifex autosync
Rudolf Polzer [Fri, 9 Jun 2023 05:23:08 +0000 (07:23 +0200)]
Transifex autosync

18 months agoMerge branch 'drjaska/2839' into 'master'
z411 [Fri, 9 Jun 2023 00:04:48 +0000 (00:04 +0000)]
Merge branch 'drjaska/2839' into 'master'

tempfix 'Anonymous player' -> '???' until it's translatable

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

18 months agotempfix 'Anonymous player' -> '???' until it's translatable
Dr. Jaska [Fri, 9 Jun 2023 00:04:48 +0000 (00:04 +0000)]
tempfix 'Anonymous player' -> '???' until it's translatable

18 months agoSurvival: refactor survival status networking to avoid sending hunter statuses to...
terencehill [Thu, 8 Jun 2023 16:07:18 +0000 (18:07 +0200)]
Survival: refactor survival status networking to avoid sending hunter statuses to survivors

18 months agoSurvival: don't show personal colors of players joining mid-round in the scoreboard
terencehill [Thu, 8 Jun 2023 15:36:19 +0000 (17:36 +0200)]
Survival: don't show personal colors of players joining mid-round in the scoreboard

18 months agoSurvival, FT and CA: show eliminated players as soon as a player connects
terencehill [Thu, 8 Jun 2023 15:28:35 +0000 (17:28 +0200)]
Survival, FT and CA: show eliminated players as soon as a player connects

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