Commit Graph

444 Commits

Author SHA1 Message Date
mafiesto4 50d47fe801 Fix asset load to trigger loading task within mutex to prevent race conditions when loading the same prefab from many threads at once 2023-10-16 16:10:57 +02:00
mafiesto4 e4941e5b00 Add asset loading task state check on fail 2023-10-15 18:46:15 +02:00
mafiesto4 7904690ecf Cleanuo some old code style 2023-10-14 14:00:58 +02: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 64d4076615 Minor tweaks 2023-10-09 12:06:55 +02:00
mafiesto4 d7e9e2ed16 Fix AssetsCache to include project path and reject cache when project gets duplicated with cache
#1631
2023-10-09 11:33:02 +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
mafiesto4 86d1d29820 Fix deadlock regression from fd679f0af5 when applying Game Settings itself 2023-10-05 10:13:49 +02:00
mafiesto4 fd679f0af5 Add automatic game settings apply when saving json file in Editor
#1440
2023-10-04 23:11:38 +02:00
mafiesto4 0ae413d4fe Fix crash when using Visual Script runtime in async 2023-10-01 10:55:48 +02:00
mafiesto4 a71de7357c Merge remote-tracking branch 'origin/master' into 1.7 2023-09-19 21:42:53 +02:00
mafiesto4 49a6b5734a Fix crash when setting material instance base material before it's loaded 2023-09-19 14:14:57 +02:00
mafiesto4 fb488cbaf7 Merge remote-tracking branch 'origin/master' into 1.7 2023-09-11 22:43:46 +02:00
mafiesto4 9291295a4d Fix Dictionary and HashSet iterators to prevent unwanted data copies
#1361
2023-09-10 11:25:36 +02:00
mafiesto4 8dc98174cf Minor tweaks 2023-08-01 14:14:27 +02:00
mafiesto4 94386d24ab Minor tweaks 2023-08-01 10:27:31 +02:00
mafiesto4 ce16debabd Merge remote-tracking branch 'origin/master' into 1.7 2023-07-24 23:21:03 +02:00
mafiesto4 c9254457a9 Code style tweaks 2023-07-24 16:24:39 +02:00
mafiesto4 e39a56fc4e Merge remote-tracking branch 'origin/master' into 1.7 2023-07-18 11:47:39 +02:00
mafiesto4 338499536f Add ModelInstanceActor::GetMaterialSlots 2023-07-18 10:55:00 +02:00
mafiesto4 3141b4fb04 Merge remote-tracking branch 'origin/master' into 1.7
# Conflicts:
#	Source/Engine/Level/Actors/SplineModel.cpp
#	Source/Engine/Level/Actors/SplineModel.h
2023-07-14 14:10:21 +02:00
mafiesto4 40fc2f8295 Fix missing header files in deployed engine package
#1242
2023-07-14 11:25:54 +02:00
mafiesto4 24c03c0e4b Add cloth painting tools to Editor 2023-07-13 23:30:37 +02:00
mafiesto4 6ae77d0c17 Merge remote-tracking branch 'origin/1.6' into 1.7 2023-07-09 11:55:50 +02:00
mafiesto4 a14de5e255 Fix Array For Each visual script node local vars setup 2023-07-04 17:58:32 +02:00
mafiesto4 99ee0b1bfe Add MeshDeformation utility for generic meshes vertices morphing (eg. via Blend Shapes or Cloth) 2023-07-03 09:49:23 +02:00
mafiesto4 04963fef18 Various code fixes and tweaks 2023-07-02 15:46:29 +02:00
mafiesto4 f995d12686 Fix editor deployment 2023-06-17 11:08:51 +02:00
mafiesto4 534d2388f5 Fix crash when removing json instance for scene asset that is different 2023-06-12 17:07:24 +02:00
mafiesto4 7140c4a2d8 Merge remote-tracking branch 'origin/master' into 1.6 2023-06-11 21:38:20 +02:00
mafiesto4 b299ed3246 Add more assertions to tests build 2023-06-09 23:34:55 +02:00
mafiesto4 a3ab7cd14e Fix file lock when loading asset fails
#1103
2023-05-16 11:52:49 +02:00
mafiesto4 80e6853f44 Merge remote-tracking branch 'origin/master' into 1.6
# Conflicts:
#	Source/Editor/CustomEditors/Dedicated/UIControlEditor.cs
2023-05-08 22:22:32 +02:00
mafiesto4 3ea771fe22 Fix crash on engine exit when asset fails to load due to serialized version mismatch 2023-05-08 17:06:13 +02:00
mafiesto4 2c2b403da1 Revert aeda759086 2023-05-08 13:57:02 +02:00
mafiesto4 69cdb1268a Merge remote-tracking branch 'origin/master' into 1.6 2023-05-08 12:58:42 +02:00
mafiesto4 aeda759086 Minor tweak 2023-05-08 12:32:42 +02: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
mafiesto4 37e8fa7b76 Fix creating localization table on blank project
#1060
2023-05-05 14:54:42 +02:00
mafiesto4 71a5d56105 Add support for importing skeleton-only as Skinned Model (eg. from animation file to have skeleton for retargeting) 2023-05-04 15:43:44 +02:00
mafiesto4 05ffaf7cef Add **skeleton retargeting** to play animations on different skeletons 2023-05-04 11:54:17 +02:00
mafiesto4 5a2831d0cb Various improvements 2023-04-29 12:11:17 +02:00
mafiesto4 915f6a719d Add automatic skeleton retargeting when playing Anim Graph on other skeletal model 2023-04-26 20:03:27 +02:00
mafiesto4 5b50562a9f Refactor Skeleton Mapping to be handled by Skinned Model instead of Animation asset 2023-04-26 14:27:01 +02:00
mafiesto4 510fc443e8 Refactor CoreCLR runtime into explicit dotnet api instead of mocking mono api
Required by platforms that will use mono under the hood for .Net 7
New `USE_CSHARP` define for C# ability
Engine doesn't use `mono_*` apis directly but via MCore/MClass/MMethod/ apis
2023-03-27 17:29:42 +02:00
mafiesto4 eed2cdfe04 Progress on dotnet7 runtime hosting with mono 2023-03-22 17:59:46 +01: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 dadb9207b9 Fix Json asset cooking to properly serialize whole asset data even if modified at runtime 2023-03-13 16:00:27 +01:00
mafiesto4 95748744a4 Add logging missing asset type on failed load 2023-03-13 14:23:23 +01:00