Flax/FlaxEngine
3
0
Fork 0
Code Issues Pull Requests Releases Activity
14,163 Commits 16 Branches 23 Tags
bd5edcc4d2d2ea7ecfd462d722b4d1a590679511
Commit Graph
14163 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
mafiesto4 bd5edcc4d2 Fix minor Editor UI issues 2026-09-15 12:55:13 +02:00
mafiesto4 3ff1f825a7 Revert partially #2147 to fix #4091 when imported as fbx 2026-09-15 12:54:56 +02:00
mafiesto4 d7f52ee832 Fix using NuGet package with different dependencies 
#4182
 2026-09-15 06:47:11 +02:00
mafiesto4 411c94efcc Fix typo 2026-09-14 08:48:22 +02:00
mafiesto4 7bf8d257bb Merge branch 'xxSeys1-ScrollContentPanelNavBarToCurrentFolder' 2026-09-14 08:36:43 +02:00
mafiesto4 5a850b1334 Merge branch 'ScrollContentPanelNavBarToCurrentFolder' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-ScrollContentPanelNavBarToCurrentFolder 
# Conflicts:
#	Source/Editor/Windows/ContentWindow.cs
 2026-09-14 08:36:39 +02:00
mafiesto4 c23477c2cc Merge branch 'Duroxxigar-update-simple-move-comment' 2026-09-14 08:34:49 +02:00
mafiesto4 eb27faeda8 Merge branch 'update-simple-move-comment' of https://github.com/Duroxxigar/FlaxEngine into Duroxxigar-update-simple-move-comment 2026-09-14 08:34:46 +02:00
mafiesto4 889d42df56 Merge branch 'luchu1993-fix-mesh-collider-recook' 2026-09-14 08:32:34 +02:00
mafiesto4 8726d86520 Merge branch 'fix-mesh-collider-recook' of https://github.com/luchu1993/FlaxEngine into luchu1993-fix-mesh-collider-recook 2026-09-14 08:32:28 +02:00
mafiesto4 8f67017bc7 Merge branch 'Duroxxigar-update-bound-shape-names' 2026-09-14 08:30:55 +02:00
mafiesto4 e669e9ca65 Fix old api usage for #4185 2026-09-14 08:30:51 +02:00
mafiesto4 b586c6a0fb Merge branch 'update-bound-shape-names' of https://github.com/Duroxxigar/FlaxEngine into Duroxxigar-update-bound-shape-names 2026-09-14 08:15:59 +02:00
mafiesto4 7bcdbef4ca Revert #4178 changes for Windows due to flickering bug 2026-09-14 08:14:42 +02:00
mafiesto4 61b6ec7b91 Merge branch 'ifromstone-dev/ParentedFloatingWindowOrder' 2026-09-14 08:13:28 +02:00
mafiesto4 744c5ef581 Merge branch 'dev/ParentedFloatingWindowOrder' of https://github.com/ifromstone/FlaxEngine into ifromstone-dev/ParentedFloatingWindowOrder 2026-09-14 08:07:58 +02:00
mafiesto4 cbe09b8985 Merge branch 'killerdevildog-fix-parsefloat-exponent-plus-sign' 2026-09-14 07:06:21 +02:00
mafiesto4 0132b6038b Merge branch 'fix-parsefloat-exponent-plus-sign' of https://github.com/killerdevildog/FlaxEngine into killerdevildog-fix-parsefloat-exponent-plus-sign 2026-09-14 07:06:11 +02:00
mafiesto4 ecadcaa046 Merge branch 'ifromstone-dev/ObjectInterfaceReferences' 2026-09-14 07:01:07 +02:00
mafiesto4 c43cfef0a9 Add tests for interface reference marshaling 
#2746
 2026-09-14 07:00:55 +02:00
mafiesto4 e5a6b73caa Remove SoftObjectInterfaceReference 
#2746
 2026-09-14 07:00:24 +02:00
mafiesto4 09f0477e18 Add auto-expand for items list with a single category in use 2026-09-14 06:59:52 +02:00
mafiesto4 f83d853e5d Fix default value in Editor when it's null for value-type 2026-09-14 06:59:01 +02:00
mafiesto4 0fc3972cea Refactor #2746 to use ScriptingObjectInterfaceReference for C# too instead of attribute 
Use `MarshalAs=ScriptingObject*` for more universal way of marshaling data between C++ and C#
 2026-09-14 06:58:40 +02:00
killerdevildog 796bdae4ea Fix ParseFloat rejecting a '+' sign in the exponent 2026-09-13 13:48:01 -06:00
luchu1993 76c6c8d038 Fix mesh collider updates after recooking collision data 2026-09-12 22:57:55 +08:00
mafiesto4 a7754f3137 Merge branch 'dev/ObjectInterfaceReferences' of https://github.com/ifromstone/FlaxEngine into ifromstone-dev/ObjectInterfaceReferences 
# Conflicts:
#	Source/Engine/Scripting/Internal/ManagedDictionary.cpp
 2026-09-12 12:40:59 +02:00
Jake Young 48f23399fc Update comment for simple move to include Time.DeltaTime 2026-09-11 14:08:00 -04:00
mafiesto4 a370aa29e9 Fix interface or abstract property editing of read-only or scripting object types 2026-09-11 12:13:57 +02:00
mafiesto4 769694ff9b Fix flickering on multi-windows on macOS regression from #4141 2026-09-10 13:34:26 +02:00
Andrei Gagua a630575ab6 Move out ManagedDictionary impl from header file 
#4120
 2026-09-10 06:25:26 +02:00
mafiesto4 e9f1a5c9ab Merge branch 'GoaLitiuM-rider_cpp_preprocessor' 2026-09-09 08:18:13 +02:00
mafiesto4 e80dbeb263 Merge branch 'rider_cpp_preprocessor' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-rider_cpp_preprocessor 2026-09-09 08:18:08 +02:00
mafiesto4 3233013eb1 Merge branch 'xxSeys1-ShowWholeThing' 2026-09-09 08:08:18 +02:00
mafiesto4 efaff8338f Merge branch 'ShowWholeThing' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-ShowWholeThing 
# Conflicts:
#	Source/Editor/Surface/SurfaceUtils.cs
 2026-09-09 08:07:31 +02:00
Ari Vuollet 5e32e40c73 Improve Rider projects C++ preprocessor definitions 
All known preprocessor definitions from the compiler are now exposed to Rider
language server through MSBuild .props files in order to fix most error
squiggles caused by missing or invalid definitions. This should fix some common
errors like unable to resolve C++ and C standard library types and macros like
`assert`.
 2026-09-02 23:00:56 +03:00
mafiesto4 9a3623420c Revert mistake change from d99631ddbf 2026-08-30 22:30:32 +02:00
mafiesto4 09e58dfa63 Merge branch 'Withaust-master' 2026-08-30 22:20:12 +02:00
mafiesto4 f89d6f9868 Merge branch 'master' of https://github.com/Withaust/FlaxEngine into Withaust-master 2026-08-30 22:19:49 +02:00
Roman Zhu a215381d4b tsk tsk no crash a simp 2026-08-30 22:14:47 +02:00
Roman Zhu c393db6fdc Fix asset file race 
https://github.com/RomanZhu/FlaxEngine/commit/71bad36469bc6cdd31384f429bdc05c251e0eb91
 2026-08-30 22:13:27 +02:00
Roman Zhu ac4737a4d5 Silence successful content handle releases 2026-08-30 22:06:47 +02:00
mafiesto4 4deb754fa1 Update shaders 2026-08-30 22:05:56 +02:00
Roman Zhu c727ffa70d get rid of timestamp comparison for shaders, compare actual data 
# Conflicts:
#	Source/Engine/Graphics/Materials/MaterialShader.h
#	Source/Engine/Tests/Tests.Build.cs
 2026-08-30 22:05:42 +02:00
David Svez 3fcad576a1 Fix GUI traversal during child removal 2026-08-30 20:13:19 +02:00
mafiesto4 b375b40736 Minor fixes to nuget libs usage 2026-08-30 20:13:06 +02:00
Withaust ec1f4a9a4b Fix headless editor & Roslyn analyzer include resolution 2026-08-30 10:48:35 +03:00
mafiesto4 d9f14c0a86 Update macOS actions to to .NET 10 2026-08-30 00:13:03 +02:00
mafiesto4 ab7936c9ff Add middle and right mouse button actions to asset/object pickers to clear value or show popup quickly 2026-08-29 23:46:54 +02:00
mafiesto4 d890901ee6 Merge branch 'vaibhav8a-fix-typo-release' 2026-08-29 23:18:54 +02:00