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

..

ClipboardBase.h

You're breathtaking!

2020-12-07 23:40:54 +01:00

FileBase.cpp

Add error log when trying to load bytes from file data that is too big

2021-03-29 13:49:49 +02:00

FileBase.h

Bumping all copyright headers to 2021.

2021-01-02 14:28:49 +01:00

FileSystemBase.cpp

Fix loading game assets in cooked build via path relative to the project folder

2021-03-01 13:00:07 +01:00

FileSystemBase.h

Fix loading game assets in cooked build via path relative to the project folder

2021-03-01 13:00:07 +01:00

FileSystemWatcherBase.h

Bumping all copyright headers to 2021.

2021-01-02 14:28:49 +01:00

NetworkBase.cpp

Fix typo

2021-03-16 22:31:51 +01:00

NetworkBase.h

Fix typo

2021-03-16 22:31:51 +01:00

PlatformBase.cpp

Switch impl progress

2021-03-09 19:18:40 +01:00

PlatformBase.cs

Bumping all copyright headers to 2021.

2021-01-02 14:28:49 +01:00

PlatformBase.h

Merge remote-tracking branch 'origin/1.1' into 1.2

2021-03-15 09:38:58 +01:00

StringUtilsBase.cpp

Add path utils to support StringView

2021-04-21 23:47:27 +02:00

ThreadBase.cpp

Bumping all copyright headers to 2021.

2021-01-02 14:28:49 +01:00

ThreadBase.h

Bumping all copyright headers to 2021.

2021-01-02 14:28:49 +01:00

WindowBase.cpp

Fix windows cleanup to prevent unmapped leftovers on Linux X11

2021-02-28 16:11:59 +01:00

WindowBase.h

Merge branch 'fix-per-window-dpi' of git://github.com/stefnotch/FlaxEngine into stefnotch-fix-per-window-dpi

2021-03-08 20:50:31 +01:00

WindowsManager.cpp

Remove unused WindowsManager::CalcCenteredWinPos

2021-03-09 14:32:53 +01:00