Commit Graph

5 Commits

Author SHA1 Message Date
mafiesto4 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
mafiesto4 c25abfda65 Remove ProjectInfo.h include from Editor.h 2021-02-19 09:36:23 +01:00
mafiesto4 1943de62e9 Add icon for Editor on Linux 2021-01-17 22:14:16 +01:00
jb-perrier 03eb39afe6 Bumping all copyright headers to 2021. 2021-01-02 14:28:49 +01:00
mafiesto4 6fb9eee74c You're breathtaking! 2020-12-07 23:40:54 +01:00