GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity
Files
273b110db4a0b109ad3ba8a904c2a77f89c8a4e8
FlaxEngine/Source/Engine/Content
History
Wojtek Figat f045b5b6b6 Merge remote-tracking branch 'origin/master' into 1.12 
# Conflicts:
#	Content/Editor/Camera/M_Camera.flax
#	Content/Editor/CubeTexturePreviewMaterial.flax
#	Content/Editor/DebugMaterials/DDGIDebugProbes.flax
#	Content/Editor/DebugMaterials/SingleColor/Decal.flax
#	Content/Editor/DebugMaterials/SingleColor/Particle.flax
#	Content/Editor/DebugMaterials/SingleColor/Surface.flax
#	Content/Editor/DebugMaterials/SingleColor/SurfaceAdditive.flax
#	Content/Editor/DebugMaterials/SingleColor/Terrain.flax
#	Content/Editor/DefaultFontMaterial.flax
#	Content/Editor/Gizmo/FoliageBrushMaterial.flax
#	Content/Editor/Gizmo/Material.flax
#	Content/Editor/Gizmo/MaterialWire.flax
#	Content/Editor/Gizmo/SelectionOutlineMaterial.flax
#	Content/Editor/Gizmo/VertexColorsPreviewMaterial.flax
#	Content/Editor/Highlight Material.flax
#	Content/Editor/Icons/IconsMaterial.flax
#	Content/Editor/IesProfilePreviewMaterial.flax
#	Content/Editor/MaterialTemplates/Features/ForwardShading.hlsl
#	Content/Editor/Particles/Particle Material Color.flax
#	Content/Editor/Particles/Smoke Material.flax
#	Content/Editor/SpriteMaterial.flax
#	Content/Editor/Terrain/Circle Brush Material.flax
#	Content/Editor/Terrain/Highlight Terrain Material.flax
#	Content/Editor/TexturePreviewMaterial.flax
#	Content/Editor/Wires Debug Material.flax
#	Content/Engine/DefaultDeformableMaterial.flax
#	Content/Engine/DefaultMaterial.flax
#	Content/Engine/DefaultRadialMenu.flax
#	Content/Engine/DefaultTerrainMaterial.flax
#	Content/Engine/SingleColorMaterial.flax
#	Content/Engine/SkyboxMaterial.flax
#	Flax.flaxproj
#	Source/Engine/Graphics/Materials/MaterialShader.h
#	Source/Engine/Graphics/Materials/MaterialShaderFeatures.cpp
#	Source/Engine/Renderer/RenderList.h
#	Source/Shaders/Reflections.shader
#	Source/Shaders/ReflectionsCommon.hlsl
#	Source/Tools/Flax.Build/Bindings/BindingsGenerator.Cpp.cs
2026-02-11 00:20:38 +01:00
..
Assets
Merge remote-tracking branch 'origin/master' into 1.12
2026-02-11 00:20:38 +01:00
Cache
Optimize Asset::GetPath in cooked build
2025-07-29 21:41:59 +02:00
Factories
fix crash on asset auto-upgrade
2026-01-01 17:49:33 +08:00
Loading
Optimize Asset::GetPath in cooked build
2025-07-29 21:41:59 +02:00
Storage
Fix issues with model data storage when doing long actions in async (eg. SDF generation)
2025-11-10 15:02:33 +01:00
Upgraders
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
Asset.cpp
Fix very rare race condition when waiting for an asset to load
2026-02-03 23:33:09 +01:00
Asset.cs
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
Asset.h
Remove ConcurrentSystemLocker and use ReadWriteLock instead of better threading synchronization
2025-09-04 14:48:52 +02:00
AssetInfo.h
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
AssetReference.h
Optimize asset references to support direct registration to reduce Delegate memory allocations and overhead
2025-06-08 00:58:15 +02:00
AssetsContainer.h
Fix shader graph assets loading to wait for async task
2025-11-18 16:11:31 +01:00
BinaryAsset.cpp
Compilation errors fixing
2025-08-02 17:05:13 +02:00
BinaryAsset.h
Optimize Asset::GetPath in cooked build
2025-07-29 21:41:59 +02:00
Config.h
Add customizable per-platform affinity for content and pool threads
2025-07-29 10:41:41 +02:00
Content.Build.cs
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
Content.cpp
Add utility to get loaded assets
2026-02-05 12:37:03 +01:00
Content.cs
Optimize managed memory allocations in Editor profiler
2025-06-09 22:06:49 +02:00
Content.h
Fix build regression
2026-02-05 15:45:02 +01:00
Deprecated.h
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
JsonAsset.cpp
Fix regression from 6d05bf16b1
2025-09-05 08:51:43 +02:00
JsonAsset.cs
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
JsonAsset.h
Optimize Asset::GetPath in cooked build
2025-07-29 21:41:59 +02:00
JsonAssetReference.cs
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
JsonAssetReference.h
Optimize asset references to support direct registration to reduce Delegate memory allocations and overhead
2025-06-08 00:58:15 +02:00
MaterialBase.cs
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
SceneReference.h
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
SkinnedModel.cs
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
SoftAssetReference.h
Optimize asset references to support direct registration to reduce Delegate memory allocations and overhead
2025-06-08 00:58:15 +02:00
Types.h
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
WeakAssetReference.h
Optimize asset references to support direct registration to reduce Delegate memory allocations and overhead
2025-06-08 00:58:15 +02:00