GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity
Files
b73ff9aaf67375016425b7ea3cb2f25976ffaf2c
FlaxEngine/Source/Engine/Content
History
Wojtek Figat b73ff9aaf6 Merge branch '1.1' into 1.2 
# Conflicts:
#	Source/Platforms/DotNet/Newtonsoft.Json.dll
#	Source/Platforms/DotNet/Newtonsoft.Json.pdb
#	Source/Platforms/UWP/Binaries/Newtonsoft.Json.dll
#	Source/Platforms/XboxOne/Binaries/Newtonsoft.Json.dll
2021-04-24 12:32:17 +02:00
..
Assets
Add MeshBase as shared impl part for Mesh and SkinnedMesh
2021-03-30 17:57:53 +02:00
Cache
Fix using AssetsCache in game code
2021-04-17 19:37:11 +02:00
Factories
Fixes and code cleanup for Flax Storage types
2021-03-08 11:33:19 +01:00
Loading
Fixes and tweaks
2021-02-12 10:57:45 +01:00
Storage
Fix assertion on engine close due to rare invalid storage object refs count
2021-03-27 19:27:04 +01:00
Upgraders
Bumping all copyright headers to 2021.
2021-01-02 14:28:49 +01:00
Asset.cpp
Fix dead-lock
2021-03-31 15:42:10 +02:00
Asset.cs
Bumping all copyright headers to 2021.
2021-01-02 14:28:49 +01:00
Asset.h
Bumping all copyright headers to 2021.
2021-01-02 14:28:49 +01:00
AssetInfo.h
Bumping all copyright headers to 2021.
2021-01-02 14:28:49 +01:00
AssetReference.h
Refactor AssetsContainer
2021-02-26 15:40:44 +01:00
AssetsContainer.h
Refactor AssetsContainer
2021-02-26 15:40:44 +01:00
BinaryAsset.cpp
Fix regression from d65ae8de96
2021-03-23 09:17:45 +01:00
BinaryAsset.h
Bumping all copyright headers to 2021.
2021-01-02 14:28:49 +01:00
Config.h
Bumping all copyright headers to 2021.
2021-01-02 14:28:49 +01:00
Content.Build.cs
kinda mandatory
2021-03-03 18:32:52 +01:00
Content.cpp
Fix asset path used in registry
2021-03-26 22:24:44 +01:00
Content.cs
Bumping all copyright headers to 2021.
2021-01-02 14:28:49 +01:00
Content.h
Bumping all copyright headers to 2021.
2021-01-02 14:28:49 +01:00
JsonAsset.cpp
Refactor settings types to use scripting API
2021-01-05 14:14:34 +01:00
JsonAsset.cs
Bumping all copyright headers to 2021.
2021-01-02 14:28:49 +01:00
JsonAsset.h
Merge branch 'master' into 1.1
2021-02-15 10:40:59 +01:00
MaterialBase.cs
Bumping all copyright headers to 2021.
2021-01-02 14:28:49 +01:00
SkinnedModel.cs
Bumping all copyright headers to 2021.
2021-01-02 14:28:49 +01:00
Types.h
Bumping all copyright headers to 2021.
2021-01-02 14:28:49 +01:00
WeakAssetReference.h
Refactor AssetsContainer
2021-02-26 15:40:44 +01:00