Commit Graph

10 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
cf3ac7a26e Merge remote-tracking branch 'origin/master' into linux-editor
# Conflicts:
#	Source/Engine/Core/Math/Color.cs
#	Source/Engine/Navigation/Navigation.cpp
#	Source/Engine/Platform/Win32/Win32Platform.cpp
2021-02-23 22:29:07 +01:00
Wojtek Figat
19c83e3b6e Add Sprite Render actor for sprites drawing 2021-02-23 13:23:22 +01:00
W2.Wizard
ee76440477 Cleanup 4 2021-02-21 11:41:30 +01:00
Jean-Baptiste Perrier
cd0a1a5fdd Merge branch '1.1' of https://github.com/FlaxEngine/FlaxEngine into convertactor 2021-02-17 14:30:11 +01:00
Jean-Baptiste Perrier
f4a587faf9 Support undo. 2021-02-16 17:36:23 +01:00
Wojtek Figat
c00b32364a Add SceneGraphNode.OnContextMenu for customizations 2021-02-02 12:51:36 +01:00
Jean-Baptiste Perrier
d2888d0007 Adding Convert feature to Actor context menu. 2021-01-09 23:21:31 +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