mafiesto4 e115aa2c4e Merge remote-tracking branch 'origin/master' into 1.5 ...

# Conflicts:
#	Source/Engine/Content/JsonAsset.cpp

2022-10-19 13:36:46 +02:00

..

BuildSettings.cs

Update copyright year

2022-01-14 13:31:12 +01:00

BuildSettings.h

Update copyright year

2022-01-14 13:31:12 +01:00

GameSettings.cpp

Add Network Settings

2022-09-03 12:54:37 +02:00

GameSettings.cs

Add game settings assets loading (not only objects)

2022-09-06 13:33:17 +02:00

GameSettings.h

Add Network Settings

2022-09-03 12:54:37 +02:00

GraphicsSettings.h

Merge remote-tracking branch 'origin/master' into 1.5

2022-10-19 13:36:46 +02:00

LayersAndTagsSettings.cs

Update copyright year

2022-01-14 13:31:12 +01:00

LayersTagsSettings.h

Update copyright year

2022-01-14 13:31:12 +01:00

PlatformSettings.h

Update copyright year

2022-01-14 13:31:12 +01:00

PlatformSettingsBase.h

Update copyright year

2022-01-14 13:31:12 +01:00

Settings.h

Fix custom json asset usage for game settings if loaded before game scripting module is loaded

2022-09-14 21:13:58 +02:00

TimeSettings.h

Update copyright year

2022-01-14 13:31:12 +01:00