]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
16 months agoMinigames: apply flood control only to common minigame commands since individual...
terencehill [Sun, 30 Jul 2023 08:47:24 +0000 (10:47 +0200)]
Minigames: apply flood control only to common minigame commands since individual minigame commands shouldn't be limited for gameplay reasons

17 months agoOptimize a couple checks, sort notifications in all.inc
terencehill [Fri, 28 Jul 2023 18:05:13 +0000 (20:05 +0200)]
Optimize a couple checks, sort notifications in all.inc

17 months agoTransifex autosync
Rudolf Polzer [Fri, 28 Jul 2023 05:23:15 +0000 (07:23 +0200)]
Transifex autosync

17 months agoTransifex autosync
Rudolf Polzer [Mon, 24 Jul 2023 05:23:11 +0000 (07:23 +0200)]
Transifex autosync

17 months agoMerge branch 'bones_was_here/svqc_itemfixes' into 'master'
terencehill [Sun, 23 Jul 2023 08:17:47 +0000 (08:17 +0000)]
Merge branch 'bones_was_here/svqc_itemfixes' into 'master'

Items fixes and refactoring

Closes #2857

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

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

17 months agoFix #2814 "trigger_push division by zero errors when starting map AMT-Freestyle6...
terencehill [Sat, 22 Jul 2023 15:04:32 +0000 (17:04 +0200)]
Fix #2814 "trigger_push division by zero errors when starting map AMT-Freestyle6". Also fix a warning on the same map when a door squashes the player

17 months agoUpdate dpdefs/upstream
bones_was_here [Sat, 22 Jul 2023 09:25:53 +0000 (19:25 +1000)]
Update dpdefs/upstream

17 months agoMerge branch 'bones_was_here/removeitem' into 'master'
bones_was_here [Fri, 21 Jul 2023 09:03:02 +0000 (09:03 +0000)]
Merge branch 'bones_was_here/removeitem' into 'master'

items: only draw the removal effect when appropriate

Closes #2849

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

17 months agoitems: only draw the removal effect when appropriate
bones_was_here [Fri, 21 Jul 2023 08:57:27 +0000 (18:57 +1000)]
items: only draw the removal effect when appropriate

Sends an extra update that triggers the effect prior to removal.
Currently only used for loot items when picked up or touching void.

Fixes #2849
without reverting to the old way of sending the effect in SVQC which
caused every player to receive it even if they couldn't see the item,
and without the expense of additional culling.

Changes the pipeline hash because g_powerups_drop_ondeath is enabled by
default and bots remove an item from their goals immediately if it's
deleted, but if it still exists (for 1-2 frames in this case) they only
remove it if it's in their PVS.

17 months agoUpdate dpdefs/upstream
bones_was_here [Fri, 21 Jul 2023 08:44:10 +0000 (18:44 +1000)]
Update dpdefs/upstream

17 months agoTransifex autosync
Rudolf Polzer [Fri, 21 Jul 2023 05:23:12 +0000 (07:23 +0200)]
Transifex autosync

17 months agoTransifex autosync
Rudolf Polzer [Thu, 20 Jul 2023 05:23:11 +0000 (07:23 +0200)]
Transifex autosync

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

17 months agoinstagib: optimise item replacement
bones_was_here [Sun, 16 Jul 2023 14:29:12 +0000 (00:29 +1000)]
instagib: optimise item replacement

17 months agopowerups: fix #2857 and move g_powerups cvar out of server/items/items.qc
bones_was_here [Tue, 4 Jul 2023 12:26:24 +0000 (22:26 +1000)]
powerups: fix #2857 and move g_powerups cvar out of server/items/items.qc

This sets ITEM_FLAG_NORMAL initially and adds ITEM_FLAG_MUTATORBLOCKED
about as late as possible: must be done after mapinfo settemps are
applied, see b95beb262077d8f733bbee7cb0d5f4c05b7b3e2f
and before StartItem() calls have_pickup_item().

Moves a little more powerup-specific code out of common code.

Removes some default powerup balance settings which don't need to be in QC.

Clarifies var naming inside powerup m_iteminit() funcs.

17 months agoitems: call FilterItem mutator hook earlier as it may change almost anything
bones_was_here [Sun, 16 Jul 2023 09:10:14 +0000 (19:10 +1000)]
items: call FilterItem mutator hook earlier as it may change almost anything

such as the pickup sound (new toys).

Documents what FilterItem may and may not do.

Allows mutators to override the pickup model, consistent with being able
to override the sound.

Reduces code duplication.

17 months agoitems: clean up some more unnecessary locals in StartItem()
bones_was_here [Tue, 4 Jul 2023 12:29:16 +0000 (22:29 +1000)]
items: clean up some more unnecessary locals in StartItem()

17 months agoitems: warn instead of crashing if spawned with no pickup sound set
bones_was_here [Sun, 16 Jul 2023 07:30:37 +0000 (17:30 +1000)]
items: warn instead of crashing if spawned with no pickup sound set

Fixes null ptr deref when starting map dfwc2017-6, which was made easy
to trigger by 5606e7035655b105545cc7fbcbffa96e653b4e82

17 months agoitems: merge _StartItem() and StartItem(), warn instead of crashing if defaultrespawn...
bones_was_here [Tue, 4 Jul 2023 12:28:00 +0000 (22:28 +1000)]
items: merge _StartItem() and StartItem(), warn instead of crashing if defaultrespawntime not set

Null ptr deref is a pain to debug.

17 months agoRefine default value for bgmvolume (1 to 0.75) instead refining the mastervolume...
LegendaryGuard [Sun, 16 Jul 2023 00:19:29 +0000 (02:19 +0200)]
Refine default value for bgmvolume (1 to 0.75) instead refining the mastervolume (triggers all mixers)

17 months agoFix #2858 (missing quote) and don't refine default value for master volume for person...
LegendaryGuard [Sat, 15 Jul 2023 23:25:46 +0000 (01:25 +0200)]
Fix #2858 (missing quote) and don't refine default value for master volume for personal customizations, customize this config yourself, not here, please

17 months agoAllow customizing the amount of saturation of the color applied on top of waypoint...
terencehill [Sat, 15 Jul 2023 15:24:05 +0000 (17:24 +0200)]
Allow customizing the amount of saturation of the color applied on top of waypoint icons

17 months agoUpdate dpdefs/upstream
bones_was_here [Sat, 15 Jul 2023 12:11:29 +0000 (22:11 +1000)]
Update dpdefs/upstream

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

17 months agoMerge branch 'drjaska/balance-council' into 'master'
terencehill [Tue, 11 Jul 2023 22:10:49 +0000 (22:10 +0000)]
Merge branch 'drjaska/balance-council' into 'master'

Implemented 3 Balance Council votes

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

17 months agoImplemented 3 Balance Council votes
Dr. Jaska [Tue, 11 Jul 2023 22:10:49 +0000 (22:10 +0000)]
Implemented 3 Balance Council votes

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

17 months agoFix typo mistake on NADE_TYPE_DARKNESS, correct some indentations again and, in oknex...
LegendaryGuard [Mon, 10 Jul 2023 15:16:16 +0000 (17:16 +0200)]
Fix typo mistake on NADE_TYPE_DARKNESS, correct some indentations again and, in oknex.qc, replace comment lines into #if 0 block

17 months agoRefactor registered NADE_TYPE_DARK into NADE_TYPE_DARKNESS and correct some indentations
LegendaryGuard [Mon, 10 Jul 2023 14:49:42 +0000 (16:49 +0200)]
Refactor registered NADE_TYPE_DARK into NADE_TYPE_DARKNESS and correct some indentations

17 months agoRefactor Dark nade into Darkness nade and remove nade_green effects that could be...
LegendaryGuard [Mon, 10 Jul 2023 13:34:26 +0000 (15:34 +0200)]
Refactor Dark nade into Darkness nade and remove nade_green effects that could be used in the future

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

17 months agoFix cl_nade_type description; remove a dangling semicolon from a macro
terencehill [Sun, 9 Jul 2023 23:22:04 +0000 (01:22 +0200)]
Fix cl_nade_type description; remove a dangling semicolon from a macro

17 months agoMerge branch 'LegendaryGuard/armorizing_and_dark_nades' into 'master'
LegendaryGuard [Sun, 9 Jul 2023 21:41:50 +0000 (21:41 +0000)]
Merge branch 'LegendaryGuard/armorizing_and_dark_nades' into 'master'

New features: Ammo and Darkness nades. Improve nades. Fix turrets target and when Tesla turret owner's friend attacks against owner

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

17 months agoNew features: Ammo and Darkness nades. Improve nades. Fix turrets target and when...
LegendaryGuard [Sun, 9 Jul 2023 21:41:50 +0000 (21:41 +0000)]
New features: Ammo and Darkness nades. Improve nades. Fix turrets target and when Tesla turret owner's friend attacks against owner

17 months agoFix #2850 "xonotic crashes when pressing restart level after match end in campaign"
terencehill [Sun, 9 Jul 2023 08:39:26 +0000 (10:39 +0200)]
Fix #2850 "xonotic crashes when pressing restart level after match end in campaign"

17 months agoTransifex autosync
Rudolf Polzer [Sun, 9 Jul 2023 05:23:12 +0000 (07:23 +0200)]
Transifex autosync

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

18 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