451900b7ee
Merge branch 'FlaxEngine:master' into material_import
2023-09-15 02:17:34 -04:00
mafiesto4
9291295a4d
Fix Dictionary and HashSet iterators to prevent unwanted data copies
...
#1361
2023-09-10 11:25:36 +02:00
a1a274df37
Merge branch 'FlaxEngine:master' into material_import
2023-08-09 15:31:44 -04:00
9156e7727b
Merge commit 'refs/pull/1115/head' of https://github.com/FlaxEngine/FlaxEngine into material_import1.6
...
Repair merge
2023-08-09 15:28:15 -04:00
mafiesto4
c9254457a9
Code style tweaks
2023-07-24 16:24:39 +02:00
mafiesto4
338499536f
Add ModelInstanceActor::GetMaterialSlots
2023-07-18 10:55:00 +02:00
mafiesto4
40fc2f8295
Fix missing header files in deployed engine package
...
#1242
2023-07-14 11:25:54 +02:00
mafiesto4
a14de5e255
Fix Array For Each visual script node local vars setup
2023-07-04 17:58:32 +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
e3f004b831
remove extraneous stack trace print that i used for debugging
2023-05-22 14:26:55 -04:00
284c3d832a
fix a couple of bugs with importing without material instances
2023-05-22 14:26:20 -04:00
37fe1154a3
Importing as instances works now
2023-05-22 10:12:00 -04: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
mafiesto4
987e680908
Fix warning on Asset::WaitForLoaded` when loading failed before
2023-03-03 17:43:55 +01:00
mafiesto4
0cf40729fa
Merge remote-tracking branch 'origin/master' into dotnet7
2023-02-19 15:04:02 +01:00
mafiesto4
ec8df18ee4
Remove not important warning
2023-02-17 02:17:25 +01:00
mafiesto4
7dc83b5472
Fix compilation warning
2023-02-16 22:59:31 +01:00
mafiesto4
969053a240
Add JsonAsset.Save to fix saving new tag
...
#885
2023-02-16 14:32:52 +01:00
mafiesto4
30fa911832
Merge remote-tracking branch 'origin/master' into dotnet7
...
# Conflicts:
# README.md
2023-02-16 09:54:22 +01:00
mafiesto4
ab3e4afb53
Merge branch 'fix_thread_join' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-fix_thread_join
2023-02-15 15:33:44 +01:00
mafiesto4
cb83de4769
Fix compilation issues with various C++ scripting cases
2023-02-13 16:05:14 +01:00
mafiesto4
ac59cc4633
Merge remote-tracking branch 'origin/master' into dotnet7
2023-02-13 10:05:51 +01:00
mafiesto4
82823d6945
Various improvements and fixes
2023-02-09 20:05:46 +01:00
mafiesto4
0270772463
Merge remote-tracking branch 'origin/master' into dotnet7
2023-02-06 10:02:13 +01:00
mafiesto4
0709288eac
Revert Depth Offset (wrong impl, can be done later)
2023-01-31 14:22:37 +01:00
mafiesto4
c39d1283f8
Add sort order for custom model drawing
2023-01-31 09:29:04 +01:00
mafiesto4
a219a3d2eb
Add **Depth Offset to materials**
2023-01-29 22:09:51 +01:00
GoaLitiuM
b0bc1fa310
Fix error when joining exited threads
...
The internal thread handles were cleared prematurely when attempting to join them. The handles should be also cleared when trying to kill already exited threads.
2023-01-29 21:30:01 +02:00
mafiesto4
7b20bc38a4
Merge branch '1.5' into dotnet7
...
# Conflicts:
# Content/Shaders/GI/DDGI.flax
# Content/Shaders/GI/GlobalSurfaceAtlas.flax
# Content/Shaders/TAA.flax
# Content/Shaders/VolumetricFog.flax
# Source/Tools/Flax.Build/Projects/VisualStudio/VCProjectGenerator.cs
2023-01-17 11:52:52 +01:00
mafiesto4
f127bbebe1
Refactor enum flags with __underlying_type and new EnumHasAnyFlags/EnumHasAllFlags
...
Fixes #832
Closes #886
2023-01-15 12:44:39 +01:00
Menotdan
mafiesto4
GoaLitiuM