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

78 Commits

Author SHA1 Message Date
Wojtek Figat
40c98ac9e5 Merge branch 'fix_folder_rename' of https://github.com/MineBill/FlaxEngine into MineBill-fix_folder_rename 2023-09-18 16:56:53 +02:00
MineBill
9931a5c026 Don't treat '.' in folder names as extensions. 2023-09-16 19:09:38 +03:00
Ari Vuollet
5ab299fed9 Fix assets getting deleted when modified by external applications 2023-09-16 18:11:22 +03:00
Wojtek Figat
9bbdf16623 Fix potential content tree freeze when toggling engine/plugins files showing 2023-09-12 14:03:53 +02:00
Wojtek Figat
16fed8927c Refactor #1266 (code quality and simplicity) 2023-09-11 20:02:53 +02:00
Wojtek Figat
2ddb44afa8 Merge branch 'ContentBrowserImprovement' of https://github.com/NoriteSC/FlaxEngineFork into NoriteSC-ContentBrowserImprovement 
# Conflicts:
#	Source/Editor/Windows/ContentWindow.cs
 2023-09-11 15:39:48 +02:00
Chandler Cox
92a5432d22 Sort plugin projects in content tree. 2023-09-02 13:13:34 -05:00
Chandler Cox
8ad4c94545 Add not closing contnent filter cm on click 2023-08-25 15:25:51 -05:00
Chandler Cox
134273abd9 Remove popup from appearing if the content item can not re renamed. 2023-08-19 12:47:29 -05:00
NoriteSC
6a65ccd5ef rev1 2023-07-24 22:10:12 +02:00
Wojtek Figat
086e4c9835 Add content proxy modifications function and workspace rebuilding for custom asset types extensions 2023-06-15 09:51:26 +02:00
Wojtek Figat
81ae687238 Merge remote-tracking branch 'origin/master' into 1.6 2023-05-28 16:34:38 +02:00
Wojtek Figat
583a5d9223 Minor fixes to content window navigation 2023-05-28 13:17:43 +02:00
Ari Vuollet
bca5e908f1 Copy content files using Content Database instead of Content Importing 
Fixes an issue where copying asset files does not change the asset ID,
causing the copied assets to remain linked to the original files.
 2023-05-27 00:41:19 +03:00
Wojtek Figat
5a66e90b56 Merge remote-tracking branch 'origin/master' into 1.6 
# Conflicts:
#	.github/workflows/tests.yml
#	Source/Engine/Content/JsonAsset.cs
 2023-05-07 19:46:29 +02:00
Wojtek Figat
159fb8f5ee Fix folders delete regression issue from dbd5c71344 
#1084
 2023-05-07 18:22:58 +02:00
Wojtek Figat
b7f269f9bd Merge branch 'collision-creation-fix' of https://github.com/Tryibion/FlaxEngine into Tryibion-collision-creation-fix 2023-05-05 16:05:26 +02:00
Chandler Cox
95d798f49e Standardize to changing the folder for any proxy that can not be created in the current view. 2023-05-05 08:30:17 -05:00
Wojtek Figat
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
Wojtek Figat
97e2e9a61d Fix content view items refresh (eg. after delete) when using search field 2023-04-22 11:51:18 +02:00
Wojtek Figat
67b373c6df Merge remote-tracking branch 'origin/master' into 1.6 2023-04-17 13:18:08 +02:00
Wojtek Figat
6562a8769e Merge branch 'master' of https://github.com/Withaust/FlaxEngine into Withaust-master 2023-04-17 12:34:23 +02:00
Wojtek Figat
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
Wojtek Figat
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
Chandler Cox
c420318267 Fix bug with path name preventing the item to be renamed when duplicated. 2023-04-14 09:18:06 -05:00
Wojtek Figat
91c017713c Merge remote-tracking branch 'origin/master' into 1.6 2023-04-13 12:12:33 +02:00
Chandler Cox
133e192b98 Added the function of de-selecting items in content view and removed selecting first item 2023-04-07 11:04:52 -05:00
Wojtek Figat
12f4dc74d2 Optimize default C# stdlib references to prevent using jit-ed features in a game assembly 2023-04-01 23:34:05 +02:00
Wojtek Figat
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
Wojtek Figat
a7c5397641 Fix content window auto scrolling regression 
656fcf9847
 2023-03-01 22:47:52 +01:00
Wojciech Figat
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
Wojciech Figat
9626e9bbb6 Update copyright year 2023-01-10 15:29:37 +01:00
Wojciech Figat
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
Wojtek Figat
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
Wojtek Figat
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
Wojtek Figat
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
Wojciech Figat
3e8e839cd1 Refactor Editor Windows layout serialization of splitter values to prevent invalid state when loading windows 2022-12-27 13:54:53 +01:00
Chandler Cox
fc0befd773 Fixed some CM buttons that shouldnt close when clicked. 2022-12-23 11:08:14 -06:00
Chandler Cox
e725533ba7 Changed all search boxes to new class. 2022-12-15 21:18:49 -06:00
Chandler Cox
1b919b9fae Created new SearchBox class with button to clear the search. 2022-12-15 20:45:51 -06:00
Chandler Cox
7eab3fe5b3 Added back sorting sub project directories. 2022-12-12 18:18:48 -06:00
Chandler Cox
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
Wojtek Figat
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
Chandler Cox
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
Chandler Cox
656fcf9847 Changed the content window do the search bars do not scroll with the content. 2022-09-30 09:22:36 -05:00
Wojciech Figat
698545006f Add auto-selecting new item created in Content window 2022-08-18 15:21:32 +02:00
Wojciech Figat
e4079f011d Improve initial name for static model collision data asset 2022-07-22 10:20:13 +02:00
Wojtek Figat
1019550d4a Change search boxes in Editor to stick to the top of the panel 2022-07-19 15:37:10 +02:00