Commit Graph

7 Commits

Author SHA1 Message Date
Wojtek Figat
b73ff9aaf6 Merge branch '1.1' into 1.2
# Conflicts:
#	Source/Platforms/DotNet/Newtonsoft.Json.dll
#	Source/Platforms/DotNet/Newtonsoft.Json.pdb
#	Source/Platforms/UWP/Binaries/Newtonsoft.Json.dll
#	Source/Platforms/XboxOne/Binaries/Newtonsoft.Json.dll
2021-04-24 12:32:17 +02:00
Wojtek Figat
b2729e35c2 Fixes for UWP build 2021-04-17 19:36:38 +02:00
Wojtek Figat
b3887c0874 Add support for separate data and code output directories in Game Cooker 2021-03-16 16:06:59 +01:00
Wojtek Figat
6cbeac6537 Merge remote-tracking branch 'origin/master' into 1.1
# Conflicts:
#	Source/Engine/Navigation/NavMesh.cpp
#	Source/Engine/Navigation/NavMeshBuilder.cpp
2021-01-22 11:31:22 +01:00
Wojtek Figat
be319c446d Refactor settings types to use scripting API 2021-01-05 14:14:34 +01:00
VNC
6ab300025b Fixed a ton of typos 2021-01-05 02:13:15 +01:00
Wojtek Figat
6fb9eee74c You're breathtaking! 2020-12-07 23:40:54 +01:00