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

..

GUI

Merge branch 'master' into 1.1

2021-02-15 10:40:59 +01:00

TextRender.cpp

Refactor draw calls and instancing logic to be more modular

2021-02-03 09:33:48 +01:00

TextRender.h

Bumping all copyright headers to 2021.

2021-01-02 14:28:49 +01:00

UI.Build.cs

Bumping all copyright headers to 2021.

2021-01-02 14:28:49 +01:00

UICanvas.cpp

Fixes

2021-02-07 20:19:10 +01:00

UICanvas.cs

Fix

2021-02-05 21:11:41 +01:00

UICanvas.h

Bumping all copyright headers to 2021.

2021-01-02 14:28:49 +01:00

UIControl.cpp

Fix calling OnParentChanged in Actor load

2021-02-02 12:52:21 +01:00

UIControl.cs

Fixes for UI control sync

2021-02-03 22:00:12 +01:00

UIControl.h

Bumping all copyright headers to 2021.

2021-01-02 14:28:49 +01:00