GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity
Files
74758f53800bab606781fa2b85d6179d6e045552
FlaxEngine/Source/Engine/Content
History
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
..
Assets
Revert Depth Offset (wrong impl, can be done later)
2023-01-31 14:22:37 +01:00
Cache
Refactor enum flags with __underlying_type and new EnumHasAnyFlags/EnumHasAllFlags
2023-01-15 12:44:39 +01:00
Factories
Update copyright year
2023-01-10 15:29:37 +01:00
Loading
Fix error when joining exited threads
2023-01-29 21:30:01 +02:00
Storage
Remove not important warning
2023-02-17 02:17:25 +01:00
Upgraders
Merge branch 'master' into 1.5
2023-01-10 15:37:55 +01:00
Asset.cpp
Fix warning on Asset::WaitForLoaded` when loading failed before
2023-03-03 17:43:55 +01:00
Asset.cs
Update copyright year
2023-01-10 15:29:37 +01:00
Asset.h
Merge branch 'master' into 1.5
2023-01-10 15:37:55 +01:00
AssetInfo.h
Merge branch 'master' into 1.5
2023-01-10 15:37:55 +01:00
AssetReference.h
Update copyright year
2023-01-10 15:29:37 +01:00
AssetsContainer.h
Update copyright year
2023-01-10 15:29:37 +01:00
BinaryAsset.cpp
Merge branch 'master' into 1.5
2023-01-10 15:37:55 +01:00
BinaryAsset.h
Merge branch 'master' into 1.5
2023-01-10 15:37:55 +01:00
Config.h
Update copyright year
2023-01-10 15:29:37 +01:00
Content.Build.cs
Update copyright year
2023-01-10 15:29:37 +01:00
Content.cpp
Add logging missing asset type on failed load
2023-03-13 14:23:23 +01:00
Content.cs
Update copyright year
2023-01-10 15:29:37 +01:00
Content.h
Update copyright year
2023-01-10 15:29:37 +01:00
JsonAsset.cpp
Merge remote-tracking branch 'origin/master' into 1.6
2023-03-14 11:52:41 +01:00
JsonAsset.cs
Merge branch 'dotnet7' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-dotnet7
2023-01-12 15:15:40 +01:00
JsonAsset.h
Fix Json asset cooking to properly serialize whole asset data even if modified at runtime
2023-03-13 16:00:27 +01:00
MaterialBase.cs
Update copyright year
2023-01-10 15:29:37 +01:00
SceneReference.h
Fix compilation issues with various C++ scripting cases
2023-02-13 16:05:14 +01:00
SkinnedModel.cs
Update copyright year
2023-01-10 15:29:37 +01:00
SoftAssetReference.h
Merge branch 'master' into 1.5
2023-01-10 15:37:55 +01:00
Types.h
Update copyright year
2023-01-10 15:29:37 +01:00
WeakAssetReference.h
Update copyright year
2023-01-10 15:29:37 +01:00