]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
2 years agoAdd cvars to limit spawn counts for vehicles and turrets, plus spawned turrets in...
LegendaryGuard [Mon, 4 Jul 2022 23:12:35 +0000 (01:12 +0200)]
Add cvars to limit spawn counts for vehicles and turrets, plus spawned turrets in DM-like gamemodes don't attack against owner except Tesla turret

2 years agoSpawn the same drop position of vehicles for the turrets
LegendaryGuard [Sat, 2 Jul 2022 01:00:07 +0000 (03:00 +0200)]
Spawn the same drop position of vehicles for the turrets

2 years agoNow vehicles can't be respawned after being spawned and destroyed, plus add nodrop...
LegendaryGuard [Fri, 1 Jul 2022 23:54:05 +0000 (01:54 +0200)]
Now vehicles can't be respawned after being spawned and destroyed, plus add nodrop option parameter in spawnvehicle function

2 years agoLeave if's 'round_handler_IsRoundStarted' as should be before
LegendaryGuard [Thu, 30 Jun 2022 23:20:56 +0000 (01:20 +0200)]
Leave if's 'round_handler_IsRoundStarted' as should be before

2 years agoMerge branch 'master' into LegendaryGuard/armorizing_and_dark_nades
LegendaryGuard [Thu, 30 Jun 2022 23:16:03 +0000 (01:16 +0200)]
Merge branch 'master' into LegendaryGuard/armorizing_and_dark_nades

2 years agoNow spawned vehicles from nades cannot be respawned after being deleted, no more...
LegendaryGuard [Thu, 30 Jun 2022 23:09:20 +0000 (01:09 +0200)]
Now spawned vehicles from nades cannot be respawned after being deleted, no more count limits thanks to the no respawn option, and add correctly cl_tandemnade_type due to several changes when merging master branch

2 years agoDon't set 2nd parameter of Net_LinkEntity more than 0
LegendaryGuard [Thu, 30 Jun 2022 00:07:56 +0000 (02:07 +0200)]
Don't set 2nd parameter of Net_LinkEntity more than 0

2 years agoNow turrets can be spawned successfully on the ground
LegendaryGuard [Thu, 30 Jun 2022 00:02:49 +0000 (02:02 +0200)]
Now turrets can be spawned successfully on the ground

2 years agoRemove unnecessary .variable for spawnturret function
LegendaryGuard [Sat, 25 Jun 2022 19:10:41 +0000 (21:10 +0200)]
Remove unnecessary .variable for spawnturret function

2 years agoFix a possible crash, if vehicles and turrets are disabled. Similar issue #2703
LegendaryGuard [Sat, 25 Jun 2022 11:04:13 +0000 (13:04 +0200)]
Fix a possible crash, if vehicles and turrets are disabled. Similar issue #2703

2 years agoAdd effects for spawned turrets from the nade or anything, plus add a verify paramete...
LegendaryGuard [Sat, 25 Jun 2022 10:49:42 +0000 (12:49 +0200)]
Add effects for spawned turrets from the nade or anything, plus add a verify parameter on both functions

2 years agoAdd effects for spawned vehicles from the nade or anything
LegendaryGuard [Fri, 24 Jun 2022 22:39:34 +0000 (00:39 +0200)]
Add effects for spawned vehicles from the nade or anything

2 years agoImproving functions and add them into headers
LegendaryGuard [Fri, 24 Jun 2022 01:30:00 +0000 (03:30 +0200)]
Improving functions and add them into headers

2 years agoMove spawn functions to the correct code places
LegendaryGuard [Fri, 24 Jun 2022 00:29:37 +0000 (02:29 +0200)]
Move spawn functions to the correct code places

2 years agoMerge branch 'terencehill/unwanted_autojoin_fix' into 'master' xonotic-v0.8.5
bones_was_here [Wed, 22 Jun 2022 05:26:52 +0000 (05:26 +0000)]
Merge branch 'terencehill/unwanted_autojoin_fix' into 'master'

Fix #2701 "Unwanted random auto-join"

Closes #2701

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

2 years agoFix #2701 "Unwanted random auto-join". This patch basically reverts 4941322
terencehill [Tue, 21 Jun 2022 21:56:46 +0000 (23:56 +0200)]
Fix #2701 "Unwanted random auto-join". This patch basically reverts 4941322

2 years agoTransifex autosync
Rudolf Polzer [Mon, 20 Jun 2022 05:23:29 +0000 (07:23 +0200)]
Transifex autosync

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

2 years agoUpdate the-big-keybench demo
bones_was_here [Sat, 18 Jun 2022 15:42:59 +0000 (01:42 +1000)]
Update the-big-keybench demo

2 years agoMerge branch 'bones_was_here/805' into 'master'
bones_was_here [Sat, 18 Jun 2022 14:54:03 +0000 (14:54 +0000)]
Merge branch 'bones_was_here/805' into 'master'

Increase Xonotic version to 0.8.5

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

2 years agoDo the pre-release TODOs
bones_was_here [Sat, 18 Jun 2022 09:38:43 +0000 (19:38 +1000)]
Do the pre-release TODOs

2 years agoIncrease Xonotic version to 0.8.5
bones_was_here [Sat, 18 Jun 2022 06:54:02 +0000 (16:54 +1000)]
Increase Xonotic version to 0.8.5

Also update version compatibility policy:
DisableServerBackwardsCompatibility() is removed, allowing 0.9.0 to join
servers running the last 0.8.x release.
Instead the general policy is to support the previous release on a
"best effort" basis.

Also some minor cleanups for gameversion cvars.

2 years agoTransifex autosync
Rudolf Polzer [Sat, 18 Jun 2022 05:23:50 +0000 (07:23 +0200)]
Transifex autosync

2 years agoMerge breaking changes for 0.8.5 into 'master'
bones_was_here [Fri, 17 Jun 2022 16:47:44 +0000 (16:47 +0000)]
Merge breaking changes for 0.8.5 into 'master'

Closes #2434

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

2 years agoTransifex autosync
Rudolf Polzer [Fri, 17 Jun 2022 05:23:24 +0000 (07:23 +0200)]
Transifex autosync

2 years agoMerge branch 'master' into LegendaryGuard/armorizing_and_dark_nades
LegendaryGuard [Thu, 16 Jun 2022 21:57:08 +0000 (23:57 +0200)]
Merge branch 'master' into LegendaryGuard/armorizing_and_dark_nades

2 years agoSimplify the code, remove some unnecessary else statements
LegendaryGuard [Thu, 16 Jun 2022 21:36:41 +0000 (23:36 +0200)]
Simplify the code, remove some unnecessary else statements

2 years agoVehicle and Turret options in emerald nade works as intended, now can be played in...
LegendaryGuard [Thu, 16 Jun 2022 19:52:50 +0000 (21:52 +0200)]
Vehicle and Turret options in emerald nade works as intended, now can be played in teamplay gamemodes, enjoy!

2 years agosv_maxidle_playertospectator: fix joining players getting moved to spec immediately
bones_was_here [Sun, 12 Jun 2022 00:00:05 +0000 (10:00 +1000)]
sv_maxidle_playertospectator: fix joining players getting moved to spec immediately

In gametypes without teams, if the player left the welcome dialog open for
the duration of sv_maxidle_playertospectator and then clicked join,
they were immediately moved back to spec for idling.

This could happen with any menu dialog or console command that allowed
joining without changing CSQC button state or mouse angle.

It was not noticeable prior to !1021 because pressing jump to join
changed the player's button state which reset their idlesince.
sv_maxidle_minplayers would have prevented this being found in local testing.

2 years agoMerge branch 'drjaska/catimelimit' into 'master'
terencehill [Sat, 11 Jun 2022 23:35:24 +0000 (23:35 +0000)]
Merge branch 'drjaska/catimelimit' into 'master'

Whitelist g_*_round_timelimit

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

2 years agoWhitelist g_*_round_timelimit
Dr. Jaska [Sat, 11 Jun 2022 23:35:24 +0000 (23:35 +0000)]
Whitelist g_*_round_timelimit

2 years agoAvoid checking Arc overheat twice
terencehill [Sat, 11 Jun 2022 19:08:30 +0000 (21:08 +0200)]
Avoid checking Arc overheat twice

2 years agoCompact some conditions in the Arc code
terencehill [Sat, 11 Jun 2022 18:40:35 +0000 (20:40 +0200)]
Compact some conditions in the Arc code

2 years agoMerge branch 'drjaska/frozenarcfix' into 'master'
LegendaryGuard [Thu, 9 Jun 2022 17:09:23 +0000 (17:09 +0000)]
Merge branch 'drjaska/frozenarcfix' into 'master'

Add a frozen status check to arc

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

2 years agoTransifex autosync
Rudolf Polzer [Wed, 8 Jun 2022 05:23:29 +0000 (07:23 +0200)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Tue, 7 Jun 2022 05:23:32 +0000 (07:23 +0200)]
Transifex autosync

2 years agoMerge branch 'terencehill/weapon_model_fixes' into 'master'
terencehill [Mon, 6 Jun 2022 21:01:51 +0000 (21:01 +0000)]
Merge branch 'terencehill/weapon_model_fixes' into 'master'

Fix electro and blaster shadow artifacts

Closes #2667

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

2 years agoAdd a frozen status check to arc
drjaska [Mon, 6 Jun 2022 19:45:22 +0000 (22:45 +0300)]
Add a frozen status check to arc

2 years agoMerge branch 'terencehill/clockedtime_tostring_improvements' into 'master'
LegendaryGuard [Mon, 6 Jun 2022 19:33:52 +0000 (19:33 +0000)]
Merge branch 'terencehill/clockedtime_tostring_improvements' into 'master'

Show compact times (1.34 instead of 0:01.34) in some places

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

2 years agoMerge branch 'Mario/speed_powerup_noeffects' into 'master'
LegendaryGuard [Mon, 6 Jun 2022 19:24:24 +0000 (19:24 +0000)]
Merge branch 'Mario/speed_powerup_noeffects' into 'master'

Merge branch Mario/speed_powerup_noeffects (XXS merge request)

Closes #2668

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

2 years agoDisable the bubbly particles that show while holding the Speed powerup, as the effect...
Mario [Mon, 6 Jun 2022 08:19:43 +0000 (18:19 +1000)]
Disable the bubbly particles that show while holding the Speed powerup, as the effect is too subtle to notice while being a distraction in first person view, closes #2668

2 years agoTransifex autosync
Rudolf Polzer [Mon, 6 Jun 2022 05:23:31 +0000 (07:23 +0200)]
Transifex autosync

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

2 years agoMerge branch 'z411/welcome_join' into 'master'
terencehill [Sat, 4 Jun 2022 21:05:48 +0000 (21:05 +0000)]
Merge branch 'z411/welcome_join' into 'master'

Add join button to Welcome dialog and make it default

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

2 years agoWelcome dialog: use capitals in Join and Spectate, fix compilation unit test
bones_was_here [Sat, 4 Jun 2022 18:29:00 +0000 (04:29 +1000)]
Welcome dialog: use capitals in Join and Spectate, fix compilation unit test

2 years agoMerge branch 'master' into develop
bones_was_here [Sat, 4 Jun 2022 18:12:24 +0000 (04:12 +1000)]
Merge branch 'master' into develop

2 years agoMerge translatable strings for !1017 (Mario/monsters) early
bones_was_here [Sat, 4 Jun 2022 18:03:11 +0000 (04:03 +1000)]
Merge translatable strings for !1017 (Mario/monsters) early

2 years agoMerge branch 'Mario/monsters' into 'develop'
bones_was_here [Sat, 4 Jun 2022 12:43:50 +0000 (12:43 +0000)]
Merge branch 'Mario/monsters' into 'develop'

Merge branch Mario/monsters (L merge request)

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

2 years agoMerge branch 'drjaska/weaponindepency' into 'master'
LegendaryGuard [Thu, 2 Jun 2022 20:02:55 +0000 (20:02 +0000)]
Merge branch 'drjaska/weaponindepency' into 'master'

weapon independency fixes

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

2 years agoChange Invasion's primary scoring field from frags to kills
Mario [Thu, 2 Jun 2022 10:51:55 +0000 (20:51 +1000)]
Change Invasion's primary scoring field from frags to kills

2 years agoUpdate pipeline hash
bones_was_here [Thu, 2 Jun 2022 02:42:32 +0000 (12:42 +1000)]
Update pipeline hash

2 years agoAdjust the way monsters test their target to make them less likely to drop them and...
Mario [Thu, 2 Jun 2022 02:28:39 +0000 (12:28 +1000)]
Adjust the way monsters test their target to make them less likely to drop them and find them again immediately, fixes some cases of spammy behaviour

2 years agoMerge branch 'master' into develop
bones_was_here [Thu, 2 Jun 2022 02:25:34 +0000 (12:25 +1000)]
Merge branch 'master' into develop

2 years agoAdjust frequency of mage's teleportation attack, update monster configuration to...
Mario [Thu, 2 Jun 2022 01:56:00 +0000 (11:56 +1000)]
Adjust frequency of mage's teleportation attack, update monster configuration to include missing cvars

2 years agoUpdate the golem's sounds - source is the unused carni-lycan playersounds
Mario [Thu, 2 Jun 2022 01:45:12 +0000 (11:45 +1000)]
Update the golem's sounds - source is the unused carni-lycan playersounds

2 years agoUpdate cl_modeldetailreduction description to note that it applies to any non-player...
Mario [Thu, 2 Jun 2022 01:37:14 +0000 (11:37 +1000)]
Update cl_modeldetailreduction description to note that it applies to any non-player and non-weapon models, remove old Invasion teamplay cvars from configuration

2 years agoPrevent monsters from attacking when the match is stopped, rename shambler sounds...
Mario [Thu, 2 Jun 2022 01:32:31 +0000 (11:32 +1000)]
Prevent monsters from attacking when the match is stopped, rename shambler sounds to golem, allow customising the maximum range a mage can teleport to players from

2 years agoMake monsters unable to pass through player clips by default
Mario [Thu, 2 Jun 2022 01:14:18 +0000 (11:14 +1000)]
Make monsters unable to pass through player clips by default

2 years agoFix whitespace inconsistency in the newly added teleportation rule
Mario [Thu, 2 Jun 2022 01:05:06 +0000 (11:05 +1000)]
Fix whitespace inconsistency in the newly added teleportation rule

2 years agoRemove commented out legacy keyframe information from monster codefiles and update...
Mario [Thu, 2 Jun 2022 01:03:13 +0000 (11:03 +1000)]
Remove commented out legacy keyframe information from monster codefiles and update the wyvern's model to match its name

2 years agoMerge branch 'bones_was_here/matchid_eventlog' into 'master'
terencehill [Tue, 31 May 2022 11:24:43 +0000 (11:24 +0000)]
Merge branch 'bones_was_here/matchid_eventlog' into 'master'

Always use a monotonic matchid to prevent random rejections by xonstat

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

2 years agofix if else branching logic
drjaska [Mon, 30 May 2022 02:36:56 +0000 (05:36 +0300)]
fix if else branching logic

2 years agoMake sure client has received gametype name before displaying it in the centerprint...
terencehill [Sun, 29 May 2022 23:02:19 +0000 (01:02 +0200)]
Make sure client has received gametype name before displaying it in the centerprint title

2 years agoSmall cleanup
terencehill [Sun, 29 May 2022 23:00:34 +0000 (01:00 +0200)]
Small cleanup

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

2 years agoTransifex autosync
Rudolf Polzer [Fri, 27 May 2022 05:23:26 +0000 (07:23 +0200)]
Transifex autosync

2 years agoTransifex autosync
Rudolf Polzer [Tue, 24 May 2022 05:23:26 +0000 (07:23 +0200)]
Transifex autosync

2 years agoweapon independency fixes
drjaska [Sun, 22 May 2022 18:58:42 +0000 (21:58 +0300)]
weapon independency fixes
Damage() function now checks that the target entity does not have a realowner which is another independent player before dealing damage and/or force to it
fireball's primary BFG no longer tries to target independent players
fireball's secondary "turrets" no longer try to target independent players
they also ignore frozen players as suggested by terence
electro's primary's explosion no longer explodes electro balls owned by other independent players
electro's primary's midair combo no longer explodes electro balls owned by other independent players
electro's comboexplosion no longer explodes electro balls owned by other independent players

2 years agoMerge branch 'drjaska/minefix2' into 'master'
terencehill [Fri, 20 May 2022 23:36:02 +0000 (23:36 +0000)]
Merge branch 'drjaska/minefix2' into 'master'

fix #2690 by making sure mines aren't proximity exploded by independent players

Closes #2690

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

2 years agofix #2690 by making sure mines aren't proximity exploded by independent players
drjaska [Thu, 19 May 2022 21:01:54 +0000 (00:01 +0300)]
fix #2690 by making sure mines aren't proximity exploded by independent players

2 years agoFix #2689 "Welcome dialog is not closed by voting screens or by disconnecting"
terencehill [Wed, 18 May 2022 10:21:44 +0000 (12:21 +0200)]
Fix #2689 "Welcome dialog is not closed by voting screens or by disconnecting"

2 years agoPlayerstats: fix higher average ping for players who disconnect and reconnect
terencehill [Wed, 18 May 2022 00:42:24 +0000 (02:42 +0200)]
Playerstats: fix higher average ping for players who disconnect and reconnect

2 years agoAdd join button to Welcome dialog and make it default
z411 [Tue, 17 May 2022 02:16:01 +0000 (22:16 -0400)]
Add join button to Welcome dialog and make it default

2 years agoFix a remaining tabbed whitespace in the renamed monster code
Mario [Tue, 17 May 2022 00:55:24 +0000 (10:55 +1000)]
Fix a remaining tabbed whitespace in the renamed monster code

2 years agoFix tabbed whitespace in the renamed monster deathtypes
Mario [Mon, 16 May 2022 13:12:40 +0000 (23:12 +1000)]
Fix tabbed whitespace in the renamed monster deathtypes

2 years agoMake sure centerprint title gets cleared if game ends prematurely
terencehill [Sun, 15 May 2022 23:20:24 +0000 (01:20 +0200)]
Make sure centerprint title gets cleared if game ends prematurely

2 years agoCall centerprint countdown only in the first tic, it will continue automatically...
terencehill [Sun, 15 May 2022 13:53:06 +0000 (15:53 +0200)]
Call centerprint countdown only in the first tic, it will continue automatically in the remaining tics. Hopefully it fixes ^COUNT occasionally shown in the last tic, probably due to lags

2 years agoApply panel alpha to centerprint title. It fixes title not fading out on menu display
terencehill [Sun, 15 May 2022 12:51:58 +0000 (14:51 +0200)]
Apply panel alpha to centerprint title. It fixes title not fading out on menu display

2 years agoAdd a comment for the ghost spectator bot workaround
terencehill [Fri, 13 May 2022 23:00:47 +0000 (01:00 +0200)]
Add a comment for the ghost spectator bot workaround

2 years agoFix comment and update hash
terencehill [Fri, 13 May 2022 22:42:03 +0000 (00:42 +0200)]
Fix comment and update hash

2 years agoAdd ReadyRestart support to Assault in campaign mode since it's a requirement now...
terencehill [Thu, 12 May 2022 14:01:13 +0000 (16:01 +0200)]
Add ReadyRestart support to Assault in campaign mode since it's a requirement now. It fixes broken Assault campaign level.

2 years agoCheck .bot_forced_team validity immediately
terencehill [Thu, 12 May 2022 00:53:59 +0000 (02:53 +0200)]
Check .bot_forced_team validity immediately

2 years agoMake bots observers (for one frame) before joining the game and put them in a team...
terencehill [Thu, 12 May 2022 00:48:56 +0000 (02:48 +0200)]
Make bots observers (for one frame) before joining the game and put them in a team in PutPlayerInServer so that everything gets initialized in the same way as for human players.

It fixes a bug where bots connecting in the middle of a CA round join a team (with a message announcing it) and immediately leave it because joining a team is not allowed.

2 years agoPut GameLogInit() code in there instead of in spawnfunc(worldspawn)
bones_was_here [Wed, 11 May 2022 21:25:33 +0000 (07:25 +1000)]
Put GameLogInit() code in there instead of in spawnfunc(worldspawn)

2 years agoRemove redundant .team initialization in MUTATOR_HOOKFUNCTION(ca, reset_map_players...
terencehill [Wed, 11 May 2022 21:56:05 +0000 (23:56 +0200)]
Remove redundant .team initialization in MUTATOR_HOOKFUNCTION(ca, reset_map_players) for bots

2 years agoRevert "Menu: don't set intendedWidth for tabs, they get overridden by parent dialogs...
terencehill [Wed, 11 May 2022 21:32:02 +0000 (23:32 +0200)]
Revert "Menu: don't set intendedWidth for tabs, they get overridden by parent dialogs anyway", it fixes #2688 "Div by zero errors at menu"

This reverts commit e7230c21f582fb61399daa4e8367ff4e24ee0f0e.

2 years agoAlways use a monotonic matchid to prevent random rejections by xonstat
bones_was_here [Wed, 11 May 2022 21:17:15 +0000 (07:17 +1000)]
Always use a monotonic matchid to prevent random rejections by xonstat

2 years agoChange g_cts_finish_kill_delay default value from 10 to 2 and improve its description
terencehill [Thu, 5 May 2022 13:19:06 +0000 (15:19 +0200)]
Change g_cts_finish_kill_delay default value from 10 to 2 and improve its description

2 years agoApply player glow color instead of weapon charge color to dropped vortex and oknex
terencehill [Thu, 5 May 2022 11:32:28 +0000 (13:32 +0200)]
Apply player glow color instead of weapon charge color to dropped vortex and oknex

2 years agoBot AI: don't attack players who finished the race
terencehill [Thu, 5 May 2022 09:54:18 +0000 (11:54 +0200)]
Bot AI: don't attack players who finished the race

2 years agoDocument r parameter in player stats specs
terencehill [Thu, 5 May 2022 09:48:33 +0000 (11:48 +0200)]
Document r parameter in player stats specs

2 years agoMenu: don't set intendedWidth for tabs, they get overridden by parent dialogs anyway
terencehill [Thu, 5 May 2022 09:46:41 +0000 (11:46 +0200)]
Menu: don't set intendedWidth for tabs, they get overridden by parent dialogs anyway

2 years agoTransifex autosync
Rudolf Polzer [Tue, 3 May 2022 05:23:29 +0000 (07:23 +0200)]
Transifex autosync

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

2 years agoFix player glow color not applied to dropped weapons
terencehill [Sat, 30 Apr 2022 17:56:17 +0000 (19:56 +0200)]
Fix player glow color not applied to dropped weapons

2 years agoMerge branch 'terencehill/player_models_improvements' into 'develop'
LegendaryGuard [Fri, 29 Apr 2022 22:15:29 +0000 (22:15 +0000)]
Merge branch 'terencehill/player_models_improvements' into 'develop'

Player models improvements

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

2 years agoAdd the new death type notifications to notifications.cfg
Mario [Fri, 29 Apr 2022 13:45:07 +0000 (23:45 +1000)]
Add the new death type notifications to notifications.cfg

2 years agoRemove team setup from Invasion definition
Mario [Fri, 29 Apr 2022 12:44:55 +0000 (22:44 +1000)]
Remove team setup from Invasion definition

2 years agoMerge branch 'master' into Mario/monsters
Mario [Fri, 29 Apr 2022 12:43:46 +0000 (22:43 +1000)]
Merge branch 'master' into Mario/monsters

2 years agoMerge branch 'develop' into terencehill/player_models_improvements
terencehill [Thu, 28 Apr 2022 14:19:23 +0000 (16:19 +0200)]
Merge branch 'develop' into terencehill/player_models_improvements