Commit Graph

13 Commits

Author SHA1 Message Date
Wojtek Figat
543d1a3c0e Add Tracy profiler support 2021-05-02 11:27:10 +02:00
Wojtek Figat
bdde0af771 Fix typos 2021-04-27 10:22:06 +02:00
stefnotch
fb28cae2b4 Move ScreenToGameViewport from Engine to Screen
And make it accessible from the C# side
2021-03-15 20:18:53 +01:00
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
c25abfda65 Remove ProjectInfo.h include from Editor.h 2021-02-19 09:36:23 +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
W2.Wizard
8fd0af3f39 Fixed Typos and padding 2021-01-17 10:18:30 +01:00
mafiesto4
c7547b3a46 Merge remote-tracking branch 'origin/master' into linux-editor 2021-01-10 09:14:03 +01:00
mafiesto4
efa5d05f5f Fixes for building editor for Linux 2021-01-05 16:23:02 +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
6fb9eee74c You're breathtaking! 2020-12-07 23:40:54 +01:00