Merge remote-tracking branch 'origin/master' into linux-editor

2021-01-10 09:14:03 +01:00
parent efa5d05f5f d586f828b2
commit c7547b3a46
2436 changed files with 5156 additions and 31149 deletions
--- a/Source/Platforms/Android/Binaries/Project/app/src/main/java/com/flaxengine/GameActivity.java
+++ b/Source/Platforms/Android/Binaries/Project/app/src/main/java/com/flaxengine/GameActivity.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 package com.flaxengine;

--- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/dxcompiler.dll
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/dxcompiler.dll
--- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/dxcompiler.lib
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/dxcompiler.lib
--- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/dxil.dll
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/dxil.dll