GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity
Files
885ee15767d4812e8c01bdab87785d48ca26e148
FlaxEngine/Source/Engine/Core
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
..
Collections
Add new collection type ConcurrentDictionary
2026-02-07 00:44:51 +01:00
Config
Add RenderColorFormat option to graphics settings for rendering pipeline buffer format
2026-01-13 09:07:22 +01:00
Math
Merge remote-tracking branch 'origin/master' into 1.12
2026-02-11 00:20:38 +01:00
Memory
Fix collections capacity growing to use the closest power of two
2025-12-04 23:29:15 +01:00
Types
Fix regression from 7b7a92758f for Visual Scripts
2026-02-10 15:02:05 +01:00
Cache.cpp
Optimize async scene loading to run in separate stages with time-slicing
2025-06-11 14:33:47 +02:00
Cache.h
Optimize async scene loading to run in separate stages with time-slicing
2025-06-11 14:33:47 +02:00
Common.h
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
Compiler.h
Add USED attribute for forcing compiler to emit the symbol
2025-12-19 01:08:45 +02:00
Config.Gen.h
Post merge fixes and cleanup
2021-08-26 17:27:38 +02:00
Config.h
Add ShouldSerialize to ISerializable to properly handle serialization of custom C++ types in prefabs
2026-02-03 22:09:41 +01:00
Core.Build.cs
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
Core.h
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
Delegate.h
Add support for using custom memory allocator in lambda bind to Function
2025-08-05 22:13:21 +02:00
DeleteMe.h
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
Encoding.h
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
Enums.h
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
Formatting.h
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
ISerializable.h
Merge remote-tracking branch 'origin/master' into 1.12
2026-02-11 00:20:38 +01:00
Log.cpp
Add support for building engine without logging
2025-05-28 04:05:12 +02:00
Log.h
Fix various code to improve quality
2025-06-06 11:19:32 +02:00
LogContext.cpp
Add support for building engine without logging
2025-05-28 04:05:12 +02:00
LogContext.h
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
NonCopyable.h
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
Object.h
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
ObjectsRemovalService.cpp
Add various improvements
2025-08-11 23:47:48 +02:00
ObjectsRemovalService.h
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
Random.h
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
RandomStream.h
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
ScopeExit.h
Add SCOPE_EXIT macro and use it in prefab tests to cleanup assets on test fail
2025-05-30 11:16:17 +02:00
SIMD.h
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
Singleton.h
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
Templates.h
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
Utilities.h
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00