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

99 Commits

Author SHA1 Message Date
Wojtek Figat
ac1eb8d58d Merge branch 'master' into 1.2 2021-04-13 09:52:03 +02:00
Wojtek Figat
55155630ca Fix duplicating spline 
#452
 2021-04-12 21:06:34 +02:00
Wojtek Figat
ca3d4a84ad Fix text wrapping when no scene is loaded 2021-04-06 11:46:23 +02:00
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
5ca717a231 Merge remote-tracking branch 'origin/master' into 1.2 2021-03-23 12:32:04 +01:00
Wojtek Figat
fcd86bccf5 Fix scripting reload without scenes loaded 
#375
 2021-03-22 23:41:21 +01:00
Wojtek Figat
319bee0838 Fix Debug Log window info label 2021-03-22 23:29:54 +01:00
Wojtek Figat
40c537d114 Merge branch 'master' into 1.2 
# Conflicts:
#	Source/Engine/Platform/Network.h
 2021-03-22 11:26:36 +01:00
Wojtek Figat
40a3fb96a2 Fix ParticleSystemWindow overlapping text bug 
#239
 2021-03-20 18:40:06 +01:00
Wojtek Figat
42366ee66a Fix synchronizing nested prefabs when adding new ObjectsLookupIdMapping 
#351
 2021-03-18 00:04:58 +01:00
Wojtek Figat
c930d32b2b Add support for cooking game for Switch 2021-03-15 14:32:10 +01:00
Wojtek Figat
802893a214 Merge branch 'ortho' of git://github.com/jb-perrier/FlaxEngine into jb-perrier-ortho 2021-03-14 19:24:24 +01:00
Wojtek Figat
b4dcaef61a Add support for Game Cooker on Linux 2021-03-11 22:39:03 +01:00
Wojtek Figat
0bf4ab9cb6 Merge branch 'ui-fixes' of git://github.com/stefnotch/FlaxEngine into stefnotch-ui-fixes 2021-03-08 22:36:46 +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
Jean-Baptiste Perrier
512df5f673 Tweaks. 2021-03-02 18:27:14 +01:00
Wojtek Figat
db921bad10 Merge branch 'patch-1' of git://github.com/honzapatCZ/FlaxEngine into honzapatCZ-patch-1 2021-03-01 11:50:54 +01:00
Wojtek Figat
98a753267f Linux support improvements 2021-02-28 14:56:57 +01:00
Nejcraft
a1e7f4f689 some quotes from discord 2021-02-28 09:26:54 +01:00
Wojtek Figat
e1497bcfe2 Optimize DebugLog stack trace formatting 2021-02-26 14:08:53 +01:00
Wojtek Figat
ff70c16051 Add support for capturing stack trace of called DebugLog from C++ 2021-02-26 13:58:42 +01:00
Wojtek Figat
e1387e92a3 Fix Debug Log stack trace collecting in Editor 
Fixes #51
 2021-02-26 12:49:33 +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
Wojtek Figat
19c83e3b6e Add Sprite Render actor for sprites drawing 2021-02-23 13:23:22 +01:00
stefnotch
a2f01ba638 Add more descriptive "no scene" message 
This is worthwhile, since this is one of the first messages a newcomer will see
 2021-02-22 19:27:16 +01:00
stefnotch
0a9e9e6695 Address review comments 2021-02-21 20:50:21 +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
68f6e0251c Cleanup 8 2021-02-21 14:27:44 +01:00
W2.Wizard
597a9c537d Cleanup 7 2021-02-21 13:50:25 +01:00
stefnotch
22b798928a Add icon to content window 2021-02-21 12:58:45 +01:00
stefnotch
1fb07a01d2 Basic icon for log window 
It also clears the icon when you click on the window
 2021-02-21 12:53:08 +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
6d7bd78816 Optimize automatic navmesh rebuild in editor for navmesh relevant actors only 2021-02-19 13:02:27 +01:00
Wojtek Figat
5507fea29d Merge branch 'convertactor' of git://github.com/jb-perrier/FlaxEngine into jb-perrier-convertactor 2021-02-18 10:18:25 +01:00
Wojtek Figat
978ee84aea Add support for debug shapes preview in prefab editor window 2021-02-17 17:23:43 +01:00
Jean-Baptiste Perrier
cd0a1a5fdd Merge branch '1.1' of https://github.com/FlaxEngine/FlaxEngine into convertactor 2021-02-17 14:30:11 +01:00
Wojtek Figat
d88335c51f Add support for audio clip playback preview in editor window 2021-02-17 12:31:30 +01:00
Jean-Baptiste Perrier
f4a587faf9 Support undo. 2021-02-16 17:36:23 +01:00
Wojtek Figat
f66b7ff785 Add support for Custom Define in Game Cooker for build scripts configuration 2021-02-16 13:54:57 +01:00
Jean-Baptiste Perrier
44afa732f1 Merge branch 'master' of https://github.com/FlaxEngine/FlaxEngine into convertactor 2021-02-15 21:43:46 +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
Wojtek Figat
4c673bec9b Add BAGUETTE 2021-02-10 22:59:40 +01:00
stefnotch
c7feeb624d Tweaks 2021-02-08 09:48:46 +01:00