Flax/FlaxEngine
3
0
Fork 0
Code Issues Pull Requests Releases Activity
13,609 Commits 15 Branches 23 Tags
bc30d67c3f203d682dceaee5c3752da4ffe2c46f
Commit Graph

417 Commits

Author SHA1 Message Date
mafiesto4 2fc95bdf57 Merge remote-tracking branch 'origin/master' into 1.12 
# Conflicts:
#	Content/Editor/MaterialTemplates/Deformable.shader
#	Flax.flaxproj
#	Source/Engine/Content/Content.h
#	Source/Engine/Serialization/JsonTools.cpp
 2026-04-01 17:14:21 +02:00
mafiesto4 243173df3c Fix pasted ghost prefab objects when paste target is not defined 
#3945
 2026-03-30 10:14:50 +02:00
mafiesto4 eab7794e3b Merge remote-tracking branch 'origin/master' into 1.12 
# Conflicts:
#	Source/Engine/Content/Storage/FlaxStorage.cpp
#	global.json
 2026-03-26 23:44:33 +01:00
mafiesto4 3f2e6d82c9 Fix regression from 21e2c830e5 when reimport Animation 
#3937
 2026-03-25 18:44:56 +01:00
mafiesto4 707d19284d Merge branch 'FocusSelectedVJControls' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-FocusSelectedVJControls 2026-03-25 14:56:27 +01:00
mafiesto4 f3c957481c Merge remote-tracking branch 'origin/master' into 1.12 
# Conflicts:
#	Source/Editor/GUI/Dialogs/ColorPickerDialog.cs
#	Source/Editor/GUI/Dialogs/ColorSelector.cs
 2026-03-24 23:41:58 +01:00
Saas e5d526c9af show whole timeline when animation loads 2026-03-18 16:55:45 +01:00
mafiesto4 45a8d82a83 Merge remote-tracking branch 'origin/master' into 1.12 
# Conflicts:
#	Content/Shaders/GI/DDGI.flax
#	Content/Shaders/GUI.flax
#	Flax.flaxproj
#	Source/Editor/Windows/AboutDialog.cs
#	Source/Engine/Serialization/Stream.cpp
#	Source/Shaders/GUICommon.hlsl
 2026-03-13 08:09:16 +01:00
mafiesto4 d784fddf95 Code style cleanup for #3944 2026-03-12 17:22:43 +01:00
mafiesto4 0fa3472f24 Refactor Texture Data function to be reusable 2026-03-06 11:40:43 +01:00
mafiesto4 94789712e8 Add basis_universal support for textures on Web 
Add implementation for loading interchange texture formats with multiple runtime formats support
 2026-03-06 11:09:29 +01:00
fibref c9fbafe014 Merge branch 'FlaxEngine:master' into flax-msdf-font 2026-02-16 22:48:19 +08:00
fibref 75a1b14beb initial support for MSDF font 2026-02-14 22:12:26 +08:00
Saas eac9f67bc1 Merge remote-tracking branch 'upstream/master' into FocusSelectedVJControls 2026-02-09 15:52:27 +01:00
mafiesto4 4a7f1a5fde Fix various issues 2026-02-06 10:37:52 +01:00
mafiesto4 5d0fdc8313 Add info about skinned model skeleton size 2026-02-06 09:28:06 +01:00
mafiesto4 21e2c830e5 Refactor Animation editor to use cloned asset for live preview of nested animations editing 
#3773
 2026-02-03 16:32:22 +01:00
mafiesto4 dfb1fb91a5 Fix ability to override material instance hidden parameters 
#3802
 2025-11-18 21:29:51 +01:00
mafiesto4 91ee9f5e05 Refactor Mesh SDF generation on GPU to use raytracing for more precise results 2025-11-13 22:05:23 +01:00
mafiesto4 87e2c4c4d5 Merge remote-tracking branch 'origin/master' into 1.11 
# Conflicts:
#	Content/Editor/DebugMaterials/DDGIDebugProbes.flax
#	Source/Editor/Windows/OutputLogWindow.cs
#	Source/Engine/Level/Actor.cpp
 2025-09-24 18:18:27 +02:00
Saas 1dd96ae9cb add undo to MoveSelectedNodes (do TODO) 2025-09-19 23:04:43 +02:00
mafiesto4 55968a8ddc Merge branch 'prefab-viewport-scaling' of https://github.com/Tryibion/FlaxEngine into Tryibion-prefab-viewport-scaling 2025-09-14 23:11:59 +02:00
mafiesto4 3b19e1b40c Fix collision data memory preview text 2025-09-04 21:47:51 +02:00
mafiesto4 d47ac95681 Modernize the code to use unified scene access #3513 2025-08-28 23:48:25 +02:00
mafiesto4 d314d5b324 Format memory usage to human-readable format 
#3495
 2025-08-26 18:05:42 +02:00
mafiesto4 a027ed3b63 Merge branch 'add-collision-v&t' of https://github.com/Tryibion/FlaxEngine into Tryibion-add-collision-v&t 2025-08-26 17:57:01 +02:00
mafiesto4 0fabca19cd Merge branch 'MoreSearchableCM' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-MoreSearchableCM 2025-08-19 18:20:01 +02:00
mafiesto4 10e9aee8ce Add particle data layout debugger tab 2025-07-14 10:28:43 +02:00
mafiesto4 3e82e550f3 Add option for debug shapes drawing for particle emitters 
#3267
 2025-07-11 23:00:41 +02:00
xxSeys1 75647d149a make visual script editor method override cm searchable 2025-06-28 19:40:03 +02:00
Tryibion 53d4ea51af Add prefab UI viewport scaling. 2025-06-27 21:18:53 -05:00
mafiesto4 2cedac8d96 Merge branch 'PrefabEditorScrollToSelectionFix' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-PrefabEditorScrollToSelectionFix 2025-06-16 14:43:34 +02:00
mafiesto4 614ffa70a0 Merge branch 'ModelSliders' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-ModelSliders 2025-06-15 21:43:00 +02:00
mafiesto4 2f02ec52ed Cleanup code 
#3546
 2025-06-15 20:48:19 +02:00
xxSeys1 e2f741cab9 adjust model window and animated model slider speeds 2025-06-12 18:45:02 +02:00
Zode 27ac755bbe Make particle emitter editor window source code button disable itself is no source code is available 2025-06-11 23:15:11 +03:00
xxSeys1 112e728465 fix scroll to node on selection in prefab editor 2025-06-09 13:56:41 +02:00
Tryibion 6b78b498f7 Use direct count from internal call. 2025-06-04 10:17:41 -05:00
mafiesto4 55b441e9fa Fix transparency-related material options when using material with deferred shading 2025-06-03 12:55:54 +02:00
mafiesto4 2fd9b4a62a Fix loading models with no meshes 2025-06-03 12:28:17 +02:00
mafiesto4 4d9407e4e9 Merge code on properties objects locking to use the same path for prefab and scene properties panels 2025-06-02 11:03:16 +02:00
mafiesto4 1ebb3e67d6 Merge branch 'add-root-tree-line-option' of https://github.com/Tryibion/FlaxEngine into Tryibion-add-root-tree-line-option 2025-06-02 10:17:34 +02:00
mafiesto4 14fcc593c7 Fix various margins and spacings between UI elements in Editor to be consistent 2025-05-30 15:28:56 +02:00
Tryibion 954cf3eb5b Add option to show verticies and triangles of collision model in a collider data window. 2025-05-23 17:57:14 -05:00
Tryibion 545a43de32 Add drawing root tree lines except for in scene and prefab tree. 2025-05-23 16:50:55 -05:00
mafiesto4 c7bb7be20f Merge branch 'improvedImportPath' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-improvedImportPath 2025-05-08 14:38:20 +02:00
xxSeys1 d8059c3db3 disable create file dialog create button if asset can't be created 2025-05-04 20:08:12 +02:00
xxSeys1 e568e6e17b improve import path ui 2025-05-01 19:15:43 +02:00
xxSeys1 2ea3cde203 add search operator tooltip to prefab editor search bar 
somewhat of a follow up to #3300
 2025-04-26 16:33:49 +02:00
mafiesto4 eb86002fbd Add AutoAttachDebugPreviewActor option to editor for quick debugging anim graphs on dynamically spawned player 2025-04-08 22:44:31 +02:00