Commit Graph

5 Commits

Author SHA1 Message Date
Wojtek Figat
81f3a65a5f Merge branch 'fix-per-window-dpi' of git://github.com/stefnotch/FlaxEngine into stefnotch-fix-per-window-dpi
# Conflicts:
#	Source/Editor/Utilities/Utils.cs
#	Source/Editor/Windows/Assets/MaterialWindow.cs
#	Source/Editor/Windows/Assets/ParticleEmitterWindow.cs
#	Source/Engine/Platform/Linux/LinuxWindow.cpp
#	Source/Engine/Platform/Windows/WindowsWindow.cpp
2021-03-08 20:50:31 +01:00
Wojtek Figat
b6557cb15c Fix showing shader source code window over a calling window 2021-02-15 12:02:25 +01:00
stefnotch
c7feeb624d Tweaks 2021-02-08 09:48:46 +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