GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity
6,442 Commits 14 Branches 0 Tags
88530606dfd930df73f6610cc22207ceae0d7e73
Commit Graph

183 Commits

Author SHA1 Message Date
Wojtek Figat
20f9bdc209 Fix regression in adding model material slots 2021-03-31 21:25:12 +02:00
Wojtek Figat
51926f517e Add support for masking Material Slots when cooking Collision Data 2021-03-31 12:15:38 +02:00
Wojtek Figat
382a35aabf Fix regression in adding model material slots 2021-03-31 10:12:05 +02:00
Wojtek Figat
a6d488c4ef Add support for generating Collision Data from Skinned Models 2021-03-30 17:58:24 +02:00
Wojtek Figat
fcd86bccf5 Fix scripting reload without scenes loaded 
#375
 2021-03-22 23:41:21 +01:00
Wojtek Figat
40a3fb96a2 Fix ParticleSystemWindow overlapping text bug 
#239
 2021-03-20 18:40:06 +01: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
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
68f6e0251c Cleanup 8 2021-02-21 14:27:44 +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
W2.Wizard
92fafe877c Cleanup 2 2021-02-21 10:23:01 +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
d88335c51f Add support for audio clip playback preview in editor window 2021-02-17 12:31:30 +01:00
Wojtek Figat
b6557cb15c Fix showing shader source code window over a calling window 2021-02-15 12:02:25 +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
stefnotch
c7feeb624d Tweaks 2021-02-08 09:48:46 +01:00
Wojtek Figat
6b660c846b Fix updating prefab object reference values after apply in prefab editor 2021-02-05 21:12:14 +01:00
Wojtek Figat
3661b19d6c Fix some prefabs issues 2021-02-04 23:34:44 +01:00
Wojtek Figat
23652d1bc5 Merge remote-tracking branch 'origin/master' into 1.1 
# Conflicts:
#	Source/Engine/Input/Input.cpp
 2021-02-02 10:29:52 +01:00
Wojtek Figat
b22805f866 Add support for custom duplicate of SceneGraphNode 2021-02-01 16:03:33 +01:00
Wojtek Figat
bab236c081 Add support for custom SceneGraphNode to handle delete with undo 2021-02-01 13:51:32 +01:00
stefnotch
164da0f87a Fix spelling error 2021-01-28 16:24:36 +01:00
Wojtek Figat
876a728b41 Fix scene animation rendering issue with game window is not selected tab 
Fixes #170
 2021-01-27 23:27:19 +01:00
Wojtek Figat
f6085c7479 Fix crash when reloading scripts with opened custom json asset 2021-01-24 23:31:24 +01:00
Wojtek Figat
c02faf51a0 Merge branch 'AboutFlaxAdjustment' of git://github.com/W2Wizard/FlaxEngine into W2Wizard-AboutFlaxAdjustment 2021-01-18 21:07:49 +01:00
W2.Wizard
8fd0af3f39 Fixed Typos and padding 2021-01-17 10:18:30 +01:00
VNC
6ab300025b Fixed a ton of typos 2021-01-05 02:13:15 +01:00
Wojtek Figat
bf9204f146 Add IconsScale to editor interface options 2021-01-03 22:13:31 +01:00
Jean-Baptiste Perrier
03eb39afe6 Bumping all copyright headers to 2021. 2021-01-02 14:28:49 +01:00
Wojtek Figat
1798bf003b Fix editing overridden particle emitter parameter in particle system window 2020-12-21 11:37:10 +01:00
Wojtek Figat
6fb9eee74c You're breathtaking! 2020-12-07 23:40:54 +01:00