Flax/FlaxEngine
3
0
Fork 0
Code Issues Pull Requests Releases Activity
11,396 Commits 15 Branches 23 Tags
1.10
Commit Graph

113 Commits

Author SHA1 Message Date
mafiesto4 9c3fd052cd Remove copyright year from source files and update to 2025 2025-04-07 19:22:21 +02:00
GoaLitiuM 5fd64ead62 Fix custom content and importers blocking scripting reload 2025-02-26 20:29:21 +02:00
GoaLitiuM 30257929e5 Fix error when ContentDatabase gets rebuilt while initializing editor 2025-02-26 20:29:21 +02:00
xxSeys1 b714194e3a Make text respect asset count 2024-10-22 23:45:18 +02:00
xxSeys1 3e0809ec0a improve delete assets confirm dialog 
- Improve visual spacing
- Improve grammar and reduce word count
- Make prompt respect asset count
 2024-10-22 14:16:11 +02:00
Tryibion a61096ffa5 Add cutting of content items. 2024-07-03 12:53:50 -05:00
mafiesto4 5c23f4ac09 Fix project cache in editor to use invariant culture when converting numbers 2024-05-30 17:22:30 +02:00
Tryibion 2260d79e26 Trim content item name on rename 2024-05-01 11:54:07 -05:00
Tryibion 127e8b077d Add focusing search bar in content view and output textbox. 2024-03-19 12:30:46 -05:00
mafiesto4 859c420d76 Update year in copyright note 2024-02-26 19:00:48 +01:00
mafiesto4 169024ae47 Fix new asset naming to always validate filename 
#2212
 2024-02-06 17:39:43 +01:00
GoaLitiuM 0c23b76456 Fix error when deleting multiple files and no folders selected 2023-10-14 17:28:21 +03:00
mafiesto4 abd6881d7b Fix removing large amount of assets in Editor at once 
#1484
 2023-10-13 15:43:11 +02:00
mafiesto4 09f2be907e Merge remote-tracking branch 'origin/master' into 1.7 
# Conflicts:
#	Flax.flaxproj
 2023-10-09 12:40:47 +02:00
mafiesto4 b56447bae4 Refactor code in #1423 to be cleaner 2023-10-08 15:14:35 +02:00
mafiesto4 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
mafiesto4 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
Tryibion bd32619016 Small fix 2023-10-01 21:11:08 -05:00
mafiesto4 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
mafiesto4 481bbd3a77 Merge branch 'editor_bindings' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-editor_bindings 2023-09-28 20:17:35 +02:00
mafiesto4 2f9c601678 Merge remote-tracking branch 'origin/master' into 1.7 2023-09-27 17:32:47 +02:00
mafiesto4 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
mafiesto4 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
GoaLitiuM 385c3541c9 Apply global editor bindings in most windows 2023-09-23 15:23:09 +03:00
mafiesto4 1c20398d8c Merge remote-tracking branch 'origin/master' into 1.7 2023-09-22 22:43:29 +02:00
Tryibion 7012832050 Add filter to content window to hide generated files. Hide by default. 2023-09-21 21:29:21 -05:00
Tryibion 521b180352 Fix issue with copying and poasting in same folder. 2023-09-21 18:56:45 -05:00
mafiesto4 a71de7357c Merge remote-tracking branch 'origin/master' into 1.7 2023-09-19 21:42:53 +02:00
mafiesto4 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
Tryibion 6e94b21452 Fix build issue 2023-09-17 20:02:22 -05:00
Tryibion 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
GoaLitiuM 5ab299fed9 Fix assets getting deleted when modified by external applications 2023-09-16 18:11:22 +03:00
mafiesto4 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
mafiesto4 9bbdf16623 Fix potential content tree freeze when toggling engine/plugins files showing 2023-09-12 14:03:53 +02:00
mafiesto4 fb488cbaf7 Merge remote-tracking branch 'origin/master' into 1.7 2023-09-11 22:43:46 +02:00
mafiesto4 16fed8927c Refactor #1266 (code quality and simplicity) 2023-09-11 20:02:53 +02:00
mafiesto4 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
Tryibion 92a5432d22 Sort plugin projects in content tree. 2023-09-02 13:13:34 -05:00
mafiesto4 8906453b15 Merge remote-tracking branch 'origin/master' into 1.7 2023-08-28 09:11:29 +02:00
Tryibion 8ad4c94545 Add not closing contnent filter cm on click 2023-08-25 15:25:51 -05:00
Tryibion 134273abd9 Remove popup from appearing if the content item can not re renamed. 2023-08-19 12:47:29 -05:00
mafiesto4 8dc98174cf Minor tweaks 2023-08-01 14:14:27 +02:00
NoriteSC 6a65ccd5ef rev1 2023-07-24 22:10:12 +02:00
mafiesto4 086e4c9835 Add content proxy modifications function and workspace rebuilding for custom asset types extensions 2023-06-15 09:51:26 +02:00
mafiesto4 81ae687238 Merge remote-tracking branch 'origin/master' into 1.6 2023-05-28 16:34:38 +02:00
mafiesto4 583a5d9223 Minor fixes to content window navigation 2023-05-28 13:17:43 +02:00
GoaLitiuM 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
mafiesto4 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