Flax/FlaxEngine
3
0
Fork 0
Code Issues Pull Requests Releases Activity
5,390 Commits 15 Branches 23 Tags
698a9f193800a2e225ad901faffcb93632ebf84f
Commit Graph

60 Commits

Author SHA1 Message Date
mafiesto4 390460907d Merge remote-tracking branch 'origin/master' into 1.6 
# Conflicts:
#	Source/Editor/Scripting/CodeEditors/VisualStudioCodeEditor.cpp
#	Source/Tools/Flax.Build/Deps/Dependencies/OpenAL.cs
 2023-04-22 18:59:41 +02:00
mafiesto4 97e2e9a61d Fix content view items refresh (eg. after delete) when using search field 2023-04-22 11:51:18 +02:00
mafiesto4 67b373c6df Merge remote-tracking branch 'origin/master' into 1.6 2023-04-17 13:18:08 +02:00
mafiesto4 6562a8769e Merge branch 'master' of https://github.com/Withaust/FlaxEngine into Withaust-master 2023-04-17 12:34:23 +02:00
mafiesto4 b7dcf9576e Merge branch 'content-bug-fix' of https://github.com/Tryibion/FlaxEngine into Tryibion-content-bug-fix 2023-04-17 12:29:03 +02:00
mafiesto4 2eea7abc27 Add Create collision data action to be performed for each model selected in the Content Window 2023-04-17 12:20:02 +02:00
Wiktor Kocielski dbd5c71344 Fix RMB deletion to take selection into account 2023-04-15 22:32:52 +03:00
Tryibion c420318267 Fix bug with path name preventing the item to be renamed when duplicated. 2023-04-14 09:18:06 -05:00
mafiesto4 91c017713c Merge remote-tracking branch 'origin/master' into 1.6 2023-04-13 12:12:33 +02:00
Tryibion 133e192b98 Added the function of de-selecting items in content view and removed selecting first item 2023-04-07 11:04:52 -05:00
mafiesto4 12f4dc74d2 Optimize default C# stdlib references to prevent using jit-ed features in a game assembly 2023-04-01 23:34:05 +02:00
mafiesto4 74758f5380 Merge remote-tracking branch 'origin/master' into 1.6 
# Conflicts:
#	Source/Tools/Flax.Build/Build/Builder.Projects.cs
#	Source/Tools/Flax.Build/Build/Plugins/NetworkingPlugin.cs
 2023-03-14 11:52:41 +01:00
mafiesto4 a7c5397641 Fix content window auto scrolling regression 
656fcf9847
 2023-03-01 22:47:52 +01:00
mafiesto4 eebc4951de Merge branch '1.5' into dotnet7 
# Conflicts:
#	Source/Platforms/DotNet/NUnit/agents/net40/nunit-agent.exe
#	Source/Platforms/DotNet/NUnit/agents/net40/nunit.engine.api.dll
#	Source/Platforms/DotNet/NUnit/agents/net40/nunit.engine.core.dll
#	Source/Platforms/DotNet/NUnit/agents/net7.0/nunit.agent.addins
#	Source/Platforms/DotNet/NUnit/nunit.engine.api.dll
#	Source/Platforms/DotNet/NUnit/nunit.engine.core.dll
#	Source/Platforms/DotNet/NUnit/nunit.engine.dll
#	Source/Platforms/DotNet/NUnit/nunit3-console.exe
#	Source/Platforms/DotNet/NUnit/nunit3-console.exe.config
#	Source/Platforms/DotNet/NUnit/testcentric.engine.metadata.dll
#	Source/Tools/Flax.Build/Deps/Downloader.cs
#	Source/Tools/Flax.Stats/CodeFrame.cs
#	Source/Tools/Flax.Stats/CodeFrameNode.cs
#	Source/Tools/Flax.Stats/Flax.Stats.Build.cs
#	Source/Tools/Flax.Stats/Languages.cs
#	Source/Tools/Flax.Stats/Program.cs
#	Source/Tools/Flax.Stats/TaskType.cs
#	Source/Tools/Flax.Stats/Tools.cs
#	Source/Tools/FlaxEngine.Tests/TestEditorUtils.cs
 2023-01-10 15:49:44 +01:00
mafiesto4 9626e9bbb6 Update copyright year 2023-01-10 15:29:37 +01:00
mafiesto4 af7b53814d Merge remote-tracking branch 'origin/1.5' into dotnet7 
# Conflicts:
#	Content/Shaders/GI/DDGI.flax
#	Content/Shaders/TAA.flax
 2022-12-30 09:24:10 +01:00
mafiesto4 c35a267cd3 Merge branch 'CM-closing-fix' of https://github.com/Tryibion/FlaxEngine into Tryibion-CM-closing-fix 2022-12-28 19:22:50 +01:00
mafiesto4 c48a81a068 Merge branch '1.5' into dotnet7 
# Conflicts:
#	Source/Editor/Managed/ManagedEditor.Internal.cpp
#	Source/Engine/Core/Config/LayersAndTagsSettings.cs
 2022-12-28 18:49:14 +01:00
mafiesto4 85f7d81ce4 Merge branch 'cancel-search-button' of https://github.com/Tryibion/FlaxEngine into Tryibion-cancel-search-button 2022-12-27 21:53:47 +01:00
mafiesto4 3e8e839cd1 Refactor Editor Windows layout serialization of splitter values to prevent invalid state when loading windows 2022-12-27 13:54:53 +01:00
Tryibion fc0befd773 Fixed some CM buttons that shouldnt close when clicked. 2022-12-23 11:08:14 -06:00
Tryibion e725533ba7 Changed all search boxes to new class. 2022-12-15 21:18:49 -06:00
Tryibion 1b919b9fae Created new SearchBox class with button to clear the search. 2022-12-15 20:45:51 -06:00
Tryibion 7eab3fe5b3 Added back sorting sub project directories. 2022-12-12 18:18:48 -06:00
Tryibion 8d9e3ded74 Remove sorting children in convtent view treeand make it so the game is on top, plugins in the middle, and engine at the bottom of the tree. This is for better UX. 2022-12-12 16:55:12 -06:00
mafiesto4 7cfde78198 Code style fix 2022-11-27 21:05:20 +01:00
Ruan Lucas 66ce8abe01 Adds side mouse button shortcuts to the Content window 2022-11-24 23:58:24 -04:00
Tryibion 020351e56b Simplified enabling and disabling scrolling and implimented the stop scrolling functionality when renaming in the content tree panel as well 2022-10-06 00:03:38 -05:00
Tryibion 656fcf9847 Changed the content window do the search bars do not scroll with the content. 2022-09-30 09:22:36 -05:00
mafiesto4 698545006f Add auto-selecting new item created in Content window 2022-08-18 15:21:32 +02:00
mafiesto4 e4079f011d Improve initial name for static model collision data asset 2022-07-22 10:20:13 +02:00
mafiesto4 1019550d4a Change search boxes in Editor to stick to the top of the panel 2022-07-19 15:37:10 +02:00
mafiesto4 a881c90b2e Refactor engine to support double-precision vectors 2022-06-13 00:40:32 +02:00
mafiesto4 90906baae2 Various improvements for Editor 2022-05-06 17:14:25 +02:00
mafiesto4 8c2241c6dc Update copyright year 2022-01-14 13:31:12 +01:00
mafiesto4 10c6e34e06 Add preserving selection of the created new folder in the Content window 2021-12-08 16:51:26 +01:00
mafiesto4 1cc26c871d Fixes for regression in tree UI layout after recent refactor 2021-12-07 18:23:02 +01:00
ScottLongley 64650367be Add Orientation option to ContentWindow 2021-08-25 20:37:16 +10:00
thallard 3bc489a7b5 Replace string variable check by an enum 2021-08-06 15:50:30 +02:00
thallard baee3a60a6 Added tick when a button is selected 2021-08-06 11:47:50 +02:00
thallard 5e2b4adff3 Removed useless static path thanks to @jb-perrier 2021-08-06 00:21:27 +02:00
thallard 78d668c599 Change enum and variable name 2021-08-06 00:07:44 +02:00
thallard e8b867430f Remplace string variable by enum 2021-08-05 23:38:08 +02:00
thallard 1426b4ca49 Removed useless debug logs 2021-08-05 23:05:27 +02:00
thallard d95cd24b76 Added functionality to order items by name 2021-08-05 22:24:01 +02:00
W2Wizard 96089d5396 Fix timeline track icons 2021-06-13 16:20:23 +02:00
W2Wizard d54efc73f1 Adapt to new spritehandle names 
Lots of files! However only change was renaming the icons overall.
 2021-05-13 15:16:45 +02:00
mafiesto4 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
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
stefnotch 0a9e9e6695 Address review comments 2021-02-21 20:50:21 +01:00