Commit Graph

225 Commits

Author SHA1 Message Date
Wojtek Figat
5a9ca6f130 Merge remote-tracking branch 'origin/1.1' into linux-editor
# Conflicts:
#	Source/Engine/Core/Math/BoundingSphere.cs
#	Source/Engine/Debug/DebugDraw.cpp
#	Source/Engine/Platform/Win32/Win32Platform.cpp
#	Source/Engine/Platform/Win32/Win32Platform.h
2021-02-23 22:32:17 +01:00
Wojtek Figat
d6546fb41c Update VulkanMemoryAllocator to 3.0.0-development (2021-02-16) 2021-02-17 11:00:48 +01:00
Wojtek Figat
fc4dc8cb50 Merge remote-tracking branch 'origin/1.1' into linux-editor
# Conflicts:
#	Source/FlaxEngine.Gen.cs
#	Source/Tools/Flax.Build/Utilities/Utilities.cs
2021-02-16 18:54:25 +01:00
Wojtek Figat
312e4ad010 Merge branch 'master' into 1.1
# Conflicts:
#	Source/Engine/Content/JsonAsset.h
#	Source/Engine/Core/Config/Settings.h
2021-02-15 10:40:59 +01:00
Wojtek Figat
865f2b871d Fix default frame rate for fbx imported clips to 14
2650de730d
2021-02-14 18:09:29 +01:00
Wojtek Figat
28f53339e7 Fix crash when loading string property in json that is not a string
Fixes #178
2021-02-02 23:33:42 +01:00
mafiesto4
ed10c15069 Fix mono compile 2021-02-01 09:59:25 +01:00
Wojtek Figat
81daaf663b Fix Assimp on Linux 2021-01-18 15:27:57 +01:00
mafiesto4
a9e4d6d908 Fix exposing Mono API when using dynamic linking 2021-01-18 15:26:55 +01:00
mafiesto4
3e0b753498 Refactor mono on Linux to use dynamic linking 2021-01-18 15:26:40 +01:00
Wojtek Figat
fdc8e371c4 Add support for using NavAreas for navigation 2021-01-18 13:18:26 +01:00
mafiesto4
7bbf089e9f Add curl for Editor on Linux 2021-01-10 22:15:13 +01:00
mafiesto4
8d7d2431df Add glslang for Linux 2021-01-10 19:57:01 +01:00
mafiesto4
09720ee758 Fix linking Assimp on Linux and strip the lib 2021-01-10 18:58:55 +01:00
mafiesto4
ee1b7bad56 Fix Editor build on Linux 2021-01-10 09:46:37 +01:00
mafiesto4
c7547b3a46 Merge remote-tracking branch 'origin/master' into linux-editor 2021-01-10 09:14:03 +01:00
Wojtek Figat
bd3f2b3019 Update DirectXShaderCompiler to 1.6 2021-01-05 14:16:57 +01:00
Wojtek Figat
199683897a Update DirectXShaderCompiler to 1.6 2021-01-05 14:15:22 +01:00
Jean-Baptiste Perrier
03eb39afe6 Bumping all copyright headers to 2021. 2021-01-02 14:28:49 +01:00
Wojtek Figat
5e469a0ae3 Remove deprecated and unsued OpenGL backend 2020-12-30 11:27:37 +01:00
mafiesto4
e4936547e3 Fixes for building editor for Linux 2020-12-23 21:54:21 +01:00
mafiesto4
969367dc3e Add Assimp for Linux 2020-12-23 21:27:29 +01:00
Wojtek Figat
87e026bd4f Fix Android build 2020-12-23 14:26:07 +01:00
Wojtek Figat
8198b73297 Add license files for all third party modules explicitly (even if using predefined license defined in config) 2020-12-22 23:29:42 +01:00
Wojtek Figat
6fb9eee74c You're breathtaking! 2020-12-07 23:40:54 +01:00