Commit Graph

13 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
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
mafiesto4
5f7f53304d Fix crash on GPUDeviceVulkan dispose if compute queue was using graphics queue 2021-01-18 15:26:45 +01:00
Wojtek Figat
b76d5d34ea Fix lambda 2021-01-14 21:21:08 +01:00
Wojtek Figat
be319c446d Refactor settings types to use scripting API 2021-01-05 14:14:34 +01:00
Jean-Baptiste Perrier
03eb39afe6 Bumping all copyright headers to 2021. 2021-01-02 14:28:49 +01:00
Wojtek Figat
05790ab9a1 Fix code style 2020-12-30 22:56:17 +01:00
Wojtek Figat
4c205be617 Fix code style 2020-12-30 11:20:37 +01:00
Wojtek Figat
4ec3e6aed9 Remove unused code 2020-12-30 00:52:07 +01:00
Wojtek Figat
7e6b236661 Remove unused code 2020-12-20 10:51:29 +01:00
Wojtek Figat
6fb9eee74c You're breathtaking! 2020-12-07 23:40:54 +01:00