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

101 Commits

Author SHA1 Message Date
Wojtek Figat
abd6881d7b Fix removing large amount of assets in Editor at once 
#1484
 2023-10-13 15:43:11 +02:00
Wojtek Figat
09f2be907e Merge remote-tracking branch 'origin/master' into 1.7 
# Conflicts:
#	Flax.flaxproj
 2023-10-09 12:40:47 +02:00
Wojtek Figat
b56447bae4 Refactor code in #1423 to be cleaner 2023-10-08 15:14:35 +02:00
Wojtek Figat
3b23e50ee6 Merge branch 'auto-module' of https://github.com/Tryibion/FlaxEngine into Tryibion-auto-module 
# Conflicts:
#	Source/Editor/Windows/ContentWindow.ContextMenu.cs
 2023-10-08 13:43:28 +02:00
Wojtek Figat
e6c45fccb3 Merge remote-tracking branch 'origin/master' into 1.7 
# Conflicts:
#	Source/Engine/Level/Actors/AnimatedModel.cpp
 2023-10-05 10:44:03 +02:00
nothingTVatYT
78b074e7da Fix segfault: target can be null when font size is changed 2023-10-03 01:14:35 +02:00
Chandler Cox
bd32619016 Small fix 2023-10-01 21:11:08 -05:00
Wojtek Figat
58b9d76d24 Merge remote-tracking branch 'origin/master' into 1.7 
# Conflicts:
#	Source/Editor/Viewport/PrefabWindowViewport.cs
#	Source/Engine/Physics/PhysX/SimulationEventCallbackPhysX.cpp
 2023-09-28 20:42:54 +02:00
Wojtek Figat
481bbd3a77 Merge branch 'editor_bindings' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-editor_bindings 2023-09-28 20:17:35 +02:00
Wojtek Figat
2f9c601678 Merge remote-tracking branch 'origin/master' into 1.7 2023-09-27 17:32:47 +02:00
Wojtek Figat
90a4fba767 Improve #1490 performance to use Ordinal string comparision and just check for extension on some generated files 2023-09-25 15:39:00 +02:00
Wojtek Figat
8ac23e556a Merge branch 'gen-file-filter' of https://github.com/Tryibion/FlaxEngine into Tryibion-gen-file-filter 2023-09-25 15:37:11 +02:00
Ari Vuollet
385c3541c9 Apply global editor bindings in most windows 2023-09-23 15:23:09 +03:00
Wojtek Figat
1c20398d8c Merge remote-tracking branch 'origin/master' into 1.7 2023-09-22 22:43:29 +02:00
Chandler Cox
7012832050 Add filter to content window to hide generated files. Hide by default. 2023-09-21 21:29:21 -05:00
Chandler Cox
521b180352 Fix issue with copying and poasting in same folder. 2023-09-21 18:56:45 -05:00
Wojtek Figat
a71de7357c Merge remote-tracking branch 'origin/master' into 1.7 2023-09-19 21:42:53 +02:00
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
Chandler Cox
6e94b21452 Fix build issue 2023-09-17 20:02:22 -05:00
Chandler Cox
478c946c1c Add automatic module creation. 2023-09-17 17:42:18 -05: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
6bdbaecc18 Merge remote-tracking branch 'origin/master' into 1.7 
# Conflicts:
#	Source/Engine/Physics/PhysX/SimulationEventCallbackPhysX.cpp
 2023-09-13 10:29:28 +02: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
fb488cbaf7 Merge remote-tracking branch 'origin/master' into 1.7 2023-09-11 22:43:46 +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
Wojtek Figat
8906453b15 Merge remote-tracking branch 'origin/master' into 1.7 2023-08-28 09:11:29 +02: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
Wojtek Figat
8dc98174cf Minor tweaks 2023-08-01 14:14:27 +02: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