]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
2 years agoPut .realowner check before turret_validate_target
LegendaryGuard [Sat, 26 Nov 2022 22:32:49 +0000 (23:32 +0100)]
Put .realowner check before turret_validate_target

2 years agoSet g_nades_ice, g_nades_translocate, g_nades_spawntype and g_nades_heal to true
LegendaryGuard [Sat, 26 Nov 2022 21:03:39 +0000 (22:03 +0100)]
Set g_nades_ice, g_nades_translocate, g_nades_spawntype and g_nades_heal to true

2 years agoReplace little spaces to tabs
LegendaryGuard [Wed, 19 Oct 2022 22:56:44 +0000 (00:56 +0200)]
Replace little spaces to tabs

2 years agoReplace 1 to constant and clean some lines
LegendaryGuard [Wed, 19 Oct 2022 22:53:00 +0000 (00:53 +0200)]
Replace 1 to constant and clean some lines

2 years agoAdd more description in g_nades_bonus_type cvar
LegendaryGuard [Wed, 19 Oct 2022 22:51:29 +0000 (00:51 +0200)]
Add more description in g_nades_bonus_type cvar

2 years agoReplace numbers into constants
LegendaryGuard [Sun, 16 Oct 2022 15:17:34 +0000 (17:17 +0200)]
Replace numbers into constants

2 years agoAdd description on g_nades_translocate cvar
LegendaryGuard [Sun, 16 Oct 2022 13:44:55 +0000 (15:44 +0200)]
Add description on g_nades_translocate cvar

2 years agoAdjust the lines as should be previously
LegendaryGuard [Sun, 16 Oct 2022 13:40:07 +0000 (15:40 +0200)]
Adjust the lines as should be previously

2 years agoAdd server side bool cvars to handle nade balance for admin purposes
LegendaryGuard [Sun, 16 Oct 2022 13:33:08 +0000 (15:33 +0200)]
Add server side bool cvars to handle nade balance for admin purposes

2 years agoAdd server side cvar for tandem nade to enable/disable special items, weapons, vehicl...
LegendaryGuard [Sun, 16 Oct 2022 11:35:48 +0000 (13:35 +0200)]
Add server side cvar for tandem nade to enable/disable special items, weapons, vehicles and turrets (disabled by default)

2 years agoMerge branch 'master' into LegendaryGuard/armorizing_and_dark_nades
LegendaryGuard [Sun, 16 Oct 2022 10:37:30 +0000 (12:37 +0200)]
Merge branch 'master' into LegendaryGuard/armorizing_and_dark_nades

2 years agoTransifex autosync
Rudolf Polzer [Sun, 16 Oct 2022 05:24:21 +0000 (07:24 +0200)]
Transifex autosync

2 years agoRevert "Merge branch 'Mario/ctf_colormaps' into 'master'" because it breaks backwards...
terencehill [Sat, 15 Oct 2022 10:08:45 +0000 (12:08 +0200)]
Revert "Merge branch 'Mario/ctf_colormaps' into 'master'" because it breaks backwards-compatibility. It will be merged back when we are close to a release.

This reverts commit 07bbfa46e816c94bd63a2af533c4a2a31e0078a5, reversing
changes made to 0db0001bd383b6d57f9583120d0868feb70290e7.

2 years agoTransifex autosync
Rudolf Polzer [Sat, 15 Oct 2022 05:23:47 +0000 (07:23 +0200)]
Transifex autosync

2 years agoProperly set serverflags's flags
terencehill [Fri, 14 Oct 2022 20:52:52 +0000 (22:52 +0200)]
Properly set serverflags's flags

2 years agoTransifex autosync
Rudolf Polzer [Thu, 13 Oct 2022 05:23:46 +0000 (07:23 +0200)]
Transifex autosync

2 years agoMerge branch 'Mario/q3compat_sanity' into 'master'
bones_was_here [Wed, 12 Oct 2022 07:38:38 +0000 (07:38 +0000)]
Merge branch 'Mario/q3compat_sanity' into 'master'

Merge branch Mario/q3compat_sanity (M merge request)

Closes #2281

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

2 years agoTransifex autosync
Rudolf Polzer [Wed, 12 Oct 2022 05:23:49 +0000 (07:23 +0200)]
Transifex autosync

2 years agoFix notifications.cfg merge conflict
LegendaryGuard [Tue, 11 Oct 2022 16:18:33 +0000 (18:18 +0200)]
Fix notifications.cfg merge conflict

2 years agoMerge branch 'Mario/qc_droptofloor' into 'master'
Mario [Tue, 11 Oct 2022 11:04:09 +0000 (11:04 +0000)]
Merge branch 'Mario/qc_droptofloor' into 'master'

Merge branch Mario/qc_droptofloor (XS merge request)

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

2 years agoMerge branch 'terencehill/welcome_dialog_fix' into 'master'
terencehill [Tue, 11 Oct 2022 10:49:20 +0000 (10:49 +0000)]
Merge branch 'terencehill/welcome_dialog_fix' into 'master'

Fix #2724 "Pressing escape opens wrong menu when watching demos".

Closes #2724

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

2 years agoMerge branch 'Mario/elevator_view_fix' into 'master'
terencehill [Mon, 10 Oct 2022 23:32:52 +0000 (23:32 +0000)]
Merge branch 'Mario/elevator_view_fix' into 'master'

Disable sv_gameplayfix_unstickplayers as it introduces glitchy visuals while riding elevators

Closes #2740

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

2 years agoMerge branch 'master' into LegendaryGuard/armorizing_and_dark_nades
LegendaryGuard [Mon, 10 Oct 2022 21:42:02 +0000 (23:42 +0200)]
Merge branch 'master' into LegendaryGuard/armorizing_and_dark_nades

2 years agoRemove sv_gameplayfix_unstickplayers 2 as it is no longer necessary
Mario [Sun, 9 Oct 2022 11:49:48 +0000 (21:49 +1000)]
Remove sv_gameplayfix_unstickplayers 2 as it is no longer necessary

2 years agoTransifex autosync
Rudolf Polzer [Sat, 8 Oct 2022 05:23:49 +0000 (07:23 +0200)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Fri, 7 Oct 2022 05:23:47 +0000 (07:23 +0200)]
Transifex autosync

2 years agoMerge branch 'z411/powerups_drop' into 'master'
LegendaryGuard [Thu, 6 Oct 2022 07:57:22 +0000 (07:57 +0000)]
Merge branch 'z411/powerups_drop' into 'master'

Use Mario's RemoveItem function to remove powerup when expired

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

2 years agoUse Mario's RemoveItem function to remove powerup when expired
z411 [Thu, 6 Oct 2022 07:57:22 +0000 (07:57 +0000)]
Use Mario's RemoveItem function to remove powerup when expired

2 years agoTransifex autosync
Rudolf Polzer [Thu, 6 Oct 2022 05:23:47 +0000 (07:23 +0200)]
Transifex autosync

2 years agoMerge branch 'Mario/reset_clear_item_waypoints' into 'master'
terencehill [Wed, 5 Oct 2022 16:08:25 +0000 (16:08 +0000)]
Merge branch 'Mario/reset_clear_item_waypoints' into 'master'

Clear item waypoints when deleting items to fix issues with dropped powerups

Closes #2735 and #2721

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

2 years agoClear item waypoints when deleting items to fix issues with dropped powerups
Mario [Wed, 5 Oct 2022 16:08:24 +0000 (16:08 +0000)]
Clear item waypoints when deleting items to fix issues with dropped powerups

2 years agoMerge branch 'z411/powerups_drop' into 'master'
terencehill [Wed, 5 Oct 2022 15:39:33 +0000 (15:39 +0000)]
Merge branch 'z411/powerups_drop' into 'master'

Allow manual powerup dropping (with use key) & fix powerup dropping outside of the map

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

2 years agoMerge branch 'terencehill/mapvote_winnermap' into 'master'
terencehill [Wed, 5 Oct 2022 14:59:18 +0000 (14:59 +0000)]
Merge branch 'terencehill/mapvote_winnermap' into 'master'

Map vote screen: expand winner map image to the center of the screen for a second before loading the winner map

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

2 years agoMerge branch 'bones_was_here/teameditems' into 'master'
terencehill [Wed, 5 Oct 2022 14:32:56 +0000 (14:32 +0000)]
Merge branch 'bones_was_here/teameditems' into 'master'

Teamed items fixes and Q3 compatibility

Closes #2368

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

2 years agoCompact timelimit / leadlimit display code
terencehill [Wed, 5 Oct 2022 14:09:28 +0000 (16:09 +0200)]
Compact timelimit / leadlimit display code

2 years agoLOG_HELP: print a new line only if missing, like LOG_INFO does. It fixes console...
terencehill [Wed, 5 Oct 2022 13:21:08 +0000 (15:21 +0200)]
LOG_HELP: print a new line only if missing, like LOG_INFO does. It fixes console output of dumpturrets -, dumpweapons - and dumpnotifs -

2 years agoTransifex autosync
Rudolf Polzer [Tue, 4 Oct 2022 05:23:47 +0000 (07:23 +0200)]
Transifex autosync

2 years agoDon't drop powerfup if something has dropped before
z411 [Tue, 4 Oct 2022 05:23:42 +0000 (02:23 -0300)]
Don't drop powerfup if something has dropped before

2 years agoRemove unnecessary setorigin() calls in Item_Respawn() and Item_Reset()
bones_was_here [Mon, 3 Oct 2022 07:37:04 +0000 (17:37 +1000)]
Remove unnecessary setorigin() calls in Item_Respawn() and Item_Reset()

Item_Show() already did it, no need to immediately do it again.

2 years agoAdd support for teamed items on Q3 maps by using fullspawndata
bones_was_here [Mon, 3 Oct 2022 06:36:08 +0000 (16:36 +1000)]
Add support for teamed items on Q3 maps by using fullspawndata

Closes #2368

2 years agoFix bug where ReadyRestart could cause teamed items to all spawn together
bones_was_here [Mon, 3 Oct 2022 06:36:01 +0000 (16:36 +1000)]
Fix bug where ReadyRestart could cause teamed items to all spawn together

For weapons this was subtle: ghost item(s) would appear as well as
the item selected to spawn.

For powerups they would all spawn at once, and/or previously scheduled
spawns were not cancelled.

Fixing this requires leaving the first of the teamed items marked so
Item_FindTeam() will do its job again at ReadyRestart.  This requires
changing the abused effect field to a bitmask other than EF_NODRAW so
that DP will draw the ghost for the marked item.

Some minor cleanups to Item_FindTeam() are included.

2 years agoFix indenting in Item_RespawnCountdown()
bones_was_here [Mon, 3 Oct 2022 06:35:31 +0000 (16:35 +1000)]
Fix indenting in Item_RespawnCountdown()

2 years agoReduce indent level in Item_FindTeam()
bones_was_here [Mon, 3 Oct 2022 06:35:22 +0000 (16:35 +1000)]
Reduce indent level in Item_FindTeam()

2 years agoTransifex autosync
Rudolf Polzer [Mon, 3 Oct 2022 05:23:46 +0000 (07:23 +0200)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Sun, 2 Oct 2022 05:24:19 +0000 (07:24 +0200)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Sat, 1 Oct 2022 05:23:48 +0000 (07:23 +0200)]
Transifex autosync

2 years agoDon't write notification count to file: it's useless and often causes merge conflicts
terencehill [Fri, 30 Sep 2022 23:02:25 +0000 (01:02 +0200)]
Don't write notification count to file: it's useless and often causes merge conflicts

2 years agoMerge branch 'bones_was_here/playernums' into 'master'
terencehill [Fri, 30 Sep 2022 13:55:08 +0000 (13:55 +0000)]
Merge branch 'bones_was_here/playernums' into 'master'

Automatic per-map min & max player limits, many warmup and player count and Welcome message things

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

2 years agoUpdate description of g_mapinfo_q3compat and move its definition to the correct location
Mario [Fri, 30 Sep 2022 12:16:25 +0000 (22:16 +1000)]
Update description of g_mapinfo_q3compat and move its definition to the correct location

2 years agoMerge branch 'master' into Mario/q3compat_sanity
Mario [Fri, 30 Sep 2022 09:54:07 +0000 (19:54 +1000)]
Merge branch 'master' into Mario/q3compat_sanity

2 years agoAdjust the map size diameter needed for some gamemodes to 3250, fixes medium sized...
Mario [Fri, 30 Sep 2022 09:49:33 +0000 (19:49 +1000)]
Adjust the map size diameter needed for some gamemodes to 3250, fixes medium sized maps generating with support for Duel

2 years agoFix support for Clan Arena and Key Hunt in Q3 maps
Mario [Fri, 30 Sep 2022 09:10:41 +0000 (19:10 +1000)]
Fix support for Clan Arena and Key Hunt in Q3 maps

2 years agoAdd some "always supported" gamemodes to the supported gamemodes list when the .arena...
Mario [Fri, 30 Sep 2022 09:05:06 +0000 (19:05 +1000)]
Add some "always supported" gamemodes to the supported gamemodes list when the .arena file contains type ffa

2 years agoAttempt to avoid generating mapinfo data if a .defi file exists when g_mapinfo_q3comp...
Mario [Fri, 30 Sep 2022 09:00:18 +0000 (19:00 +1000)]
Attempt to avoid generating mapinfo data if a .defi file exists when g_mapinfo_q3compat is enabled, to reduce the number of potential crashes from random defrag maps. Don't add regular gamemodes if a target_stopTimer entity exists in the map when generating mapinfo data

2 years agoWhitelist g_mapinfo_q3compat
Mario [Fri, 30 Sep 2022 07:50:35 +0000 (17:50 +1000)]
Whitelist g_mapinfo_q3compat

2 years agoCheck for an empty string after processing it a little, fixes a few more edge cases
Mario [Fri, 30 Sep 2022 07:20:33 +0000 (17:20 +1000)]
Check for an empty string after processing it a little, fixes a few more edge cases

2 years agoTransifex autosync
Rudolf Polzer [Fri, 30 Sep 2022 05:23:51 +0000 (07:23 +0200)]
Transifex autosync

2 years agoReplace arena settings with a single q3compat cvar to handle mapinfo generation with...
Mario [Fri, 30 Sep 2022 05:14:51 +0000 (15:14 +1000)]
Replace arena settings with a single q3compat cvar to handle mapinfo generation with .arena and .defi files, fix some edge cases and avoid using fallbacks if they aren't for the current map

2 years agoSkip commented out lines when scanning .arena files for map information
Mario [Thu, 29 Sep 2022 08:25:56 +0000 (18:25 +1000)]
Skip commented out lines when scanning .arena files for map information

2 years agoTransifex autosync
Rudolf Polzer [Thu, 29 Sep 2022 05:23:46 +0000 (07:23 +0200)]
Transifex autosync

2 years agoProper powerup throwing bugfix
z411 [Wed, 28 Sep 2022 20:48:47 +0000 (17:48 -0300)]
Proper powerup throwing bugfix

2 years agoClean up welcome message newlines
bones_was_here [Mon, 26 Sep 2022 05:23:33 +0000 (15:23 +1000)]
Clean up welcome message newlines

2 years agoMake MOTD header fancier in welcome message
bones_was_here [Mon, 26 Sep 2022 05:23:23 +0000 (15:23 +1000)]
Make MOTD header fancier in welcome message

2 years agoUse a translatable chatcon notification for "Match is restarting..."
bones_was_here [Mon, 26 Sep 2022 05:23:20 +0000 (15:23 +1000)]
Use a translatable chatcon notification for "Match is restarting..."

2 years agog_warmup -1: abort countdown if player count falls too low
bones_was_here [Mon, 26 Sep 2022 05:23:16 +0000 (15:23 +1000)]
g_warmup -1: abort countdown if player count falls too low

Includes translatable chatcon + centreprint notification for this case.

2 years agoFix unnecessary inflation of g_warmup_majority_factor in some cases
bones_was_here [Mon, 26 Sep 2022 05:23:11 +0000 (15:23 +1000)]
Fix unnecessary inflation of g_warmup_majority_factor in some cases

For example with 10 players joined and g_warmup_majority_factor 0.8
the old code required 9 players to be ready, new code requires 8.
Behaviour is unchanged when joined players * factor is not an integer.

Also improve cvar description.

2 years agoImprove centreprint shown when max player limit blocks joining
bones_was_here [Mon, 26 Sep 2022 05:23:07 +0000 (15:23 +1000)]
Improve centreprint shown when max player limit blocks joining

2 years agoPrevent "Begin!" announcement & centreprint when returning to warmup
bones_was_here [Mon, 26 Sep 2022 05:23:02 +0000 (15:23 +1000)]
Prevent "Begin!" announcement & centreprint when returning to warmup

Applicable to ReadyRestart() / qc_cmd_sv resetmatch,
switching from unlimited to timed warmup (g_warmup -1),
and countdown abort (g_warmup -1).

2 years agoDisplay current and maximum player numbers on scoreboard
bones_was_here [Mon, 26 Sep 2022 05:22:57 +0000 (15:22 +1000)]
Display current and maximum player numbers on scoreboard

2 years agoMerge branch 'master' into z411/powerups_drop
z411 [Wed, 28 Sep 2022 19:56:30 +0000 (16:56 -0300)]
Merge branch 'master' into z411/powerups_drop

2 years agoClean up Q3 music checks
Mario [Wed, 28 Sep 2022 05:29:16 +0000 (15:29 +1000)]
Clean up Q3 music checks

2 years agoTransifex autosync
Rudolf Polzer [Wed, 28 Sep 2022 05:23:45 +0000 (07:23 +0200)]
Transifex autosync

2 years agoRemove unnecessary client global shortmapname
bones_was_here [Mon, 26 Sep 2022 05:22:50 +0000 (15:22 +1000)]
Remove unnecessary client global shortmapname

2 years agoDisplay untimed Warmup or min players requirement (g_warmup -1) in HUD timer and...
bones_was_here [Tue, 27 Sep 2022 17:05:34 +0000 (03:05 +1000)]
Display untimed Warmup or min players requirement (g_warmup -1) in HUD timer and info panels

Adds numplayers client global as it will also be used in Scoreboard_Draw().

Slightly increases default timer panel width.

2 years agoDisplay map shortname and longname in welcome message
bones_was_here [Mon, 26 Sep 2022 05:22:33 +0000 (15:22 +1000)]
Display map shortname and longname in welcome message

2 years agoDisplay minplayers and maxplayers in welcome message
bones_was_here [Mon, 26 Sep 2022 05:22:05 +0000 (15:22 +1000)]
Display minplayers and maxplayers in welcome message

These are stored in globals as they will be read by HUD and scoreboard

2 years agoImplement automatic per-map min & max player limits
bones_was_here [Mon, 26 Sep 2022 05:21:58 +0000 (15:21 +1000)]
Implement automatic per-map min & max player limits

Enabled by g_warmup -1 and g_maxplayers -1 respectively.

Map settings are loaded from .sizes files
and are rounded to a multiple of the number of teams.
At the midpoint, min players is rounded down and max players is rounded up.
Neither can exceed engine maxplayers which is also rounded down if necessary.

g_warmup -1 means stay in warmup until enough players have joined,
then switch to g_warmup_limit and wait for ready players.
"Enough" has a lower limit of 2 or 2 * number of teams,
so this can be useful on maps with no set minimum.

2 years agoRemove AvailableTeams(), instead store team number in existing teamplay global
bones_was_here [Mon, 26 Sep 2022 05:21:46 +0000 (15:21 +1000)]
Remove AvailableTeams(), instead store team number in existing teamplay global

2 years agoFix inconsistent ReadyCount() calling logic
bones_was_here [Mon, 26 Sep 2022 05:21:33 +0000 (15:21 +1000)]
Fix inconsistent ReadyCount() calling logic

timeout_status was checked at only 1 call site,
and readiness changes during a timeout were sometimes ignored.

ReadyCount() was sometimes called when not in warmup.

2 years agoSeparate and improve MapReadSizes()
bones_was_here [Mon, 26 Sep 2022 05:21:19 +0000 (15:21 +1000)]
Separate and improve MapReadSizes()

Ensure maps with small minimum player count can be selected for voting
when player count is low or zero, even if their minimum would otherwise be
too high, to reduce chance of maplist fallback (which ignores sizes).
Setting (for example) every CTF map to min 4 and every DM map to min 2
is a viable config with this code.

Add g_maplist_sizes_specparty, reduces player count used when selecting
maps to allow for a consistent spectator population.

Better debugging messages.

2 years agoMisc cleanups for warmup and welcome message
bones_was_here [Mon, 26 Sep 2022 05:20:48 +0000 (15:20 +1000)]
Misc cleanups for warmup and welcome message

2 years agoDisable sv_gameplayfix_unstickplayers as it introduces glitchy visuals while riding...
Mario [Mon, 26 Sep 2022 01:56:26 +0000 (11:56 +1000)]
Disable sv_gameplayfix_unstickplayers as it introduces glitchy visuals while riding elevators

2 years agoTransifex autosync
Rudolf Polzer [Sun, 25 Sep 2022 05:24:18 +0000 (07:24 +0200)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Sat, 24 Sep 2022 05:23:41 +0000 (07:23 +0200)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Thu, 22 Sep 2022 05:23:47 +0000 (07:23 +0200)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Tue, 20 Sep 2022 05:23:41 +0000 (07:23 +0200)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Mon, 19 Sep 2022 05:23:48 +0000 (07:23 +0200)]
Transifex autosync

2 years agoMerge branch 'terencehill/shotgun_fixes' into 'master'
terencehill [Sun, 18 Sep 2022 20:24:20 +0000 (20:24 +0000)]
Merge branch 'terencehill/shotgun_fixes' into 'master'

Fix some shotgun bugs

Closes #2728

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

2 years agoTransifex autosync
Rudolf Polzer [Sun, 18 Sep 2022 05:24:20 +0000 (07:24 +0200)]
Transifex autosync

2 years agoFix some discrepancies in the QC port of droptofloor
Mario [Sun, 18 Sep 2022 01:08:58 +0000 (11:08 +1000)]
Fix some discrepancies in the QC port of droptofloor

2 years agoTransifex autosync
Rudolf Polzer [Sat, 17 Sep 2022 05:23:44 +0000 (07:23 +0200)]
Transifex autosync

2 years agoMerge branch 'terencehill/servers_quickmenu' into 'master'
terencehill [Fri, 16 Sep 2022 14:50:10 +0000 (14:50 +0000)]
Merge branch 'terencehill/servers_quickmenu' into 'master'

Custom server's quickmenu

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

2 years agoMake 2 strings translatable
terencehill [Fri, 16 Sep 2022 14:39:55 +0000 (16:39 +0200)]
Make 2 strings translatable

2 years agoSmooth v_deathtiltangle effect; don't apply v_deathtiltangle if cl_eventchase_death...
terencehill [Fri, 16 Sep 2022 10:58:01 +0000 (12:58 +0200)]
Smooth v_deathtiltangle effect; don't apply v_deathtiltangle if cl_eventchase_death is 2; avoid executing cl_rollangle code if cl_rollangle is 0

2 years agoTransifex autosync
Rudolf Polzer [Fri, 16 Sep 2022 05:23:44 +0000 (07:23 +0200)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Thu, 15 Sep 2022 05:23:44 +0000 (07:23 +0200)]
Transifex autosync

2 years agoMerge branch 'bones_was_here/font' into 'master'
terencehill [Tue, 13 Sep 2022 13:50:33 +0000 (13:50 +0000)]
Merge branch 'bones_was_here/font' into 'master'

Change default font hinting to 2, group font cvars better

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

2 years agoTransifex autosync
Rudolf Polzer [Mon, 12 Sep 2022 05:23:41 +0000 (07:23 +0200)]
Transifex autosync

2 years agoMerge branch 'master' into LegendaryGuard/armorizing_and_dark_nades
LegendaryGuard [Sun, 11 Sep 2022 21:56:32 +0000 (23:56 +0200)]
Merge branch 'master' into LegendaryGuard/armorizing_and_dark_nades

2 years agoMerge branch 'Mario/nade_orb_overlay' into 'master'
terencehill [Sun, 11 Sep 2022 21:26:15 +0000 (21:26 +0000)]
Merge branch 'Mario/nade_orb_overlay' into 'master'

Merge branch Mario/nade_orb_overlay  (S merge request)

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