GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
10c47b8c2aec7913e246c23ca04b191d40cdfe98
FlaxEngine/Source/Editor
History
Wojtek Figat cdeb9a3b15 Merge remote-tracking branch 'origin/master' into 1.9 
# 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/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/DefaultTerrainMaterial.flax
#	Content/Engine/SingleColorMaterial.flax
#	Content/Engine/SkyboxMaterial.flax
#	Source/Engine/Graphics/Materials/MaterialShader.h
2024-04-23 10:30:01 +02:00
..
Analytics
Update year in copyright note
2024-02-26 19:00:48 +01:00
Content
Fix crash when removing Anim Event visual script that is used in opened Animation timeline
2024-04-22 18:11:25 +02:00
Cooker
Fix cooking small textures for Android/iOS with ASTC enabled
2024-03-28 18:24:37 +01:00
CustomEditors
Merge remote-tracking branch 'origin/master' into 1.9
2024-04-23 10:30:01 +02:00
Gizmo
Revert 1a68a52611 to draw after geometry
2024-03-25 12:02:40 +01:00
GUI
Fix crash when removing Anim Event visual script that is used in opened Animation timeline
2024-04-22 18:11:25 +02:00
History
Update year in copyright note
2024-02-26 19:00:48 +01:00
Managed
Add logging and cleaning up leaked scene objects after play mode in Editor
2024-04-22 22:59:38 +02:00
Modules
Fix editor toolstrip by moving game cooking and building to the right for less missclicks
2024-04-14 15:05:25 +02:00
Options
Merge remote-tracking branch 'upstream/master'
2024-03-29 13:38:38 -07:00
Plugins
Update year in copyright note
2024-02-26 19:00:48 +01:00
Progress
Update year in copyright note
2024-02-26 19:00:48 +01:00
SceneGraph
Fix errors on using spline editor in Prefab window
2024-04-05 16:37:11 +02:00
Scripting
Fix crash when removing Anim Event visual script that is used in opened Animation timeline
2024-04-22 18:11:25 +02:00
States
Add logging and cleaning up leaked scene objects after play mode in Editor
2024-04-22 22:59:38 +02:00
Surface
Fix surface node moving regression from f19977a956
2024-04-22 22:56:01 +02:00
Tools
Fix terrain heightmap to use higher range format when decompressed
2024-04-15 12:16:50 +02:00
Undo
Revert profiler events to pass nunit tests without engine in-use 6d98bc5ef8
2024-03-07 21:38:25 +01:00
Utilities
Add logging and cleaning up leaked scene objects after play mode in Editor
2024-04-22 22:59:38 +02:00
Viewport
Fix missing UI Control preview when changing UI Widget type
2024-04-17 16:43:53 +02:00
Windows
Merge remote-tracking branch 'origin/master' into 1.9
2024-04-17 09:58:59 +02:00
CustomEditorWindow.cs
Update year in copyright note
2024-02-26 19:00:48 +01:00
Editor.Build.cs
Update year in copyright note
2024-02-26 19:00:48 +01:00
Editor.cpp
Restore opening existing projects with -new
2024-03-24 23:57:12 +02:00
Editor.cs
Refactor UI Control linkage in the prefab previews to prevent bugs
2024-03-12 17:48:51 +01:00
Editor.h
Update year in copyright note
2024-02-26 19:00:48 +01:00
EditorAssets.cs
Update year in copyright note
2024-02-26 19:00:48 +01:00
EditorIcons.cs
Update year in copyright note
2024-02-26 19:00:48 +01:00
IEditable.cs
Update year in copyright note
2024-02-26 19:00:48 +01:00
ProjectInfo.cpp
Update year in copyright note
2024-02-26 19:00:48 +01:00
ProjectInfo.cs
Update year in copyright note
2024-02-26 19:00:48 +01:00
ProjectInfo.h
Update year in copyright note
2024-02-26 19:00:48 +01:00
ViewportDebugDrawData.cs
Update year in copyright note
2024-02-26 19:00:48 +01:00