Commit Graph

16 Commits

Author SHA1 Message Date
Wojtek Figat
04836f037d Fix json proxy regression for Generic json assets 2021-04-22 10:58:52 +02:00
Wojtek Figat
cca8200794 Fix JsonAssetProxy.IsProxyFor 2021-04-16 15:47:01 +02:00
Wojtek Figat
7448383079 Add LocalizedStringTable 2021-04-16 15:39:31 +02:00
Wojtek Figat
e9215c1a9e Tweaks 2021-04-16 11:34:10 +02:00
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
4d73b271b8 Fix some minor issues with materials previews in Editor 2021-02-25 16:38:05 +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
W2.Wizard
35b687bf3d Additional cleanup
Cleaned up some additional stuff that I found
2021-02-21 18:17:35 +01:00
W2.Wizard
52bc268ee7 Cleanup 1 2021-02-21 10:05:47 +01:00
Wojtek Figat
161917977c Add reusing created collision data for model when UI requests it 2021-02-18 11:12:36 +01:00
stefnotch
c7feeb624d Tweaks 2021-02-08 09:48:46 +01:00
Wojtek Figat
04bb83fe31 Fixes 2021-02-07 20:19:10 +01:00
Jean-Baptiste Perrier
03eb39afe6 Bumping all copyright headers to 2021. 2021-01-02 14:28:49 +01:00
Wojtek Figat
826c0206cb Fix model collision data generate option to be in ModelProxy 2020-12-29 23:11:00 +01:00
Jean-Baptiste Perrier
d0e509a8fc Adding "Generate collision data" from Model context menu. 2020-12-21 23:20:42 +01:00
Wojtek Figat
6fb9eee74c You're breathtaking! 2020-12-07 23:40:54 +01:00