Commit Graph

16 Commits

Author SHA1 Message Date
Wojtek Figat
f32ea92336 Fix editor viewport camera orbiting issues
#354
2021-03-18 18:23:11 +01:00
Wojtek Figat
42366ee66a Fix synchronizing nested prefabs when adding new ObjectsLookupIdMapping
#351
2021-03-18 00:04:58 +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
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
W2.Wizard
89734760fa Revert previous checks, revert switch intend 2021-02-21 19:48:23 +01:00
W2.Wizard
35b687bf3d Additional cleanup
Cleaned up some additional stuff that I found
2021-02-21 18:17:35 +01:00
W2.Wizard
a4409c729b Fix Gizmo issue
For some reason the cleanup changed TransformGizmo to TransformGizmoBase in a few files.
2021-02-21 14:08:11 +01:00
W2.Wizard
d87f0df2a6 Cleanup 6 2021-02-21 12:05:40 +01:00
W2.Wizard
ee76440477 Cleanup 4 2021-02-21 11:41:30 +01:00
Wojtek Figat
7ad64d0284 Add support for viewport icons rendering in prefab editor window 2021-02-17 17:42:40 +01:00
Wojtek Figat
978ee84aea Add support for debug shapes preview in prefab editor window 2021-02-17 17:23:43 +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
96f1d9e820 Add UIControl outlines drawing in Prefab window 2021-02-07 20:19:21 +01:00
Wojtek Figat
53601d8a85 Optimize and improve ActorChildNodes handling 2021-01-27 12:11:59 +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