Flax/FlaxEngine
3
0
Fork 0
Code Issues Pull Requests Releases Activity
14,213 Commits 16 Branches 23 Tags
2b5ea33df0c68dfd830b7141d8d399dfffcdc950
Commit Graph
4918 Commits
Author SHA1 Message Date
mafiesto4 57d5937bcb Merge branch 'prefab-grid' of https://github.com/Tryibion/FlaxEngine into Tryibion-prefab-grid 2024-08-05 18:12:10 +02:00
mafiesto4 979ab9f6ee Fix World Triplanar Texture node to support displacement and float4 value 2024-08-05 14:37:31 +02:00
mafiesto4 e44e44d317 Merge remote-tracking branch 'origin/master' into 1.9 2024-08-05 11:08:51 +02:00
Tryibion 0d42b6d7ee Add actor type and script type to search filters. 2024-07-30 21:41:50 -05:00
Tryibion 649559a917 Fix missing debug draw from prefabs 2024-07-28 13:48:54 -05:00
Tryibion 3db604c30c Add grid gizmo to prefab scene. 2024-07-27 12:24:13 -05:00
Tryibion 5f5b0485b5 Cache context menu and add check to prevent accidental duplication. 2024-07-27 10:42:51 -05:00
Tryibion 728401b67c Add pasting. 2024-07-27 10:30:05 -05:00
Tryibion 1a9c3ba3ff Add options menu to json assets 2024-07-27 09:28:56 -05:00
mafiesto4 642fb510f8 Merge branch 'openfbx_fixes' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-openfbx_fixes 2024-07-26 09:36:58 +02:00
Tryibion 074751f91f Re-add lazy rebuilds 2024-07-25 18:23:26 -05:00
mafiesto4 0f5fcba95d Merge branch 'fix-miss-comments' of https://github.com/Tryibion/FlaxEngine into Tryibion-fix-miss-comments 2024-07-26 01:14:30 +02:00
Tryibion e05eedfc76 Force rebuild on proxy changes if rebuild is true 2024-07-25 17:28:55 -05:00
mafiesto4 b4d1e6197c Fix crash when removing Visual Script asset that's instance is selected in Properties window 2024-07-25 17:16:50 +02:00
Tryibion 9fbc7a5f09 Add missing comments for spawnable json proxy ctors. 2024-07-25 10:16:26 -05:00
mafiesto4 2853273205 Merge branch 'IndustryStandardTransformHotkeysSupport' of https://github.com/RomanZhu/FlaxPublic into RomanZhu-IndustryStandardTransformHotkeysSupport 2024-07-25 10:54:08 +02:00
mafiesto4 ab4703c3dd Merge branch 'Arcnor-colorPickerAlwaysChangesColor' 2024-07-25 10:06:32 +02:00
mafiesto4 6cdd56ad11 Merge branch 'colorPickerAlwaysChangesColor' of https://github.com/Arcnor/FlaxEngine into Arcnor-colorPickerAlwaysChangesColor 
# Conflicts:
#	Source/Editor/Options/InterfaceOptions.cs
 2024-07-25 10:06:05 +02:00
mafiesto4 66122e6e3b Merge branch 'RenameActors' of https://github.com/RuanLucasGD/FlaxEngine into RuanLucasGD-RenameActors 2024-07-25 09:28:14 +02:00
mafiesto4 91a8a670d5 Merge branch 'lightmap-material-nodes' of https://github.com/Swiggies/FlaxEngine into Swiggies-lightmap-material-nodes 2024-07-25 09:25:15 +02:00
mafiesto4 2c1f835528 Merge branch 'table-improve' of https://github.com/Tryibion/FlaxEngine into Tryibion-table-improve 2024-07-25 09:17:01 +02:00
mafiesto4 e4cf4c9f17 Merge branch 'jsontype-thumbnail' of https://github.com/Tryibion/FlaxEngine into Tryibion-jsontype-thumbnail 2024-07-25 08:41:21 +02:00
mafiesto4 7bb365c57b Merge branch 'csharp_warning_fix' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-csharp_warning_fix 2024-07-25 08:40:22 +02:00
mafiesto4 17c484b97b Merge branch 'empty-ref-text' of https://github.com/Tryibion/FlaxEngine into Tryibion-empty-ref-text 2024-07-25 08:39:42 +02:00
mafiesto4 2913bb39e8 Merge branch 'customeditor_fixes' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-customeditor_fixes 2024-07-25 08:38:32 +02:00
mafiesto4 f21b259376 Various fixes after merge with Windows ARM pr 2024-07-25 08:34:51 +02:00
mafiesto4 34d4904b2e Update deps binaries 
#2624
 2024-07-24 23:28:48 +02:00
mafiesto4 dd61d5793c Merge branch 'woa_support' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-woa_support 
# Conflicts:
#	Source/ThirdParty/assimp/config.h.in
#	Source/Tools/Flax.Build/Deps/Dependencies/Assimp.cs
 2024-07-24 19:03:53 +02:00
mafiesto4 5ddf24381b Merge branch 'deprecation_messages' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-deprecation_messages 2024-07-24 16:41:49 +02:00
Tryibion 8209639261 Add being able to add a thumbnail to a SpawnableJsonProxy 2024-07-23 22:08:01 -05:00
Roman Zhuravlev a580d6785f Ignore Translate/Rotate/Scale/TransformSpace hotkeys while holding RMB. 
Allows to use industry standard WER hotkeys for transformations and not change modes while navigating through level.
 2024-07-21 22:25:25 +02:00
GoaLitiuM 8b22ffe007 Fix warnings about upcoming C# reserved keywords 2024-07-20 20:46:32 +03:00
Tryibion 1142fa68ea Small table improvements. 2024-07-19 20:49:58 -05:00
Tryibion 9b11461eaf Add type display to empty object ref in editor 2024-07-19 06:48:35 -05:00
mafiesto4 6e60a988a0 Fix node archetype 2024-07-19 00:54:05 +02:00
mafiesto4 64bd762f44 Fix compilation 2024-07-19 00:35:36 +02:00
mafiesto4 b33c2b4f36 Merge remote-tracking branch 'origin/master' into 1.9 2024-07-19 00:32:54 +02:00
mafiesto4 53ca33f301 Add option to sample Global SDF from higher cascade 2024-07-19 00:30:06 +02:00
mafiesto4 f132198ead Add more functionality and thumbnail to content items in finder for scripts 2024-07-18 14:19:27 +02:00
mafiesto4 5e0d90af2e Add displaying file extension for scripts in content finder to distinguish C++ files 2024-07-18 14:18:52 +02:00
mafiesto4 5d2a1e0507 Merge branch 'picker-type' of https://github.com/Tryibion/FlaxEngine into Tryibion-picker-type 2024-07-18 11:09:51 +02:00
mafiesto4 fe41ef619b Improve floating dock window hidden header to handle inputs properly 
#2770
 2024-07-18 10:47:46 +02:00
mafiesto4 3870a013fa Merge branch 'remove-redundant-tab' of https://github.com/Tryibion/FlaxEngine into Tryibion-remove-redundant-tab 2024-07-18 10:36:53 +02:00
mafiesto4 964a1940c4 Merge branch 'fix-last-tab-drag' of https://github.com/Tryibion/FlaxEngine into Tryibion-fix-last-tab-drag 2024-07-18 10:34:32 +02:00
mafiesto4 e8de6c37fc Merge branch 'texture-window-tabs' of https://github.com/Tryibion/FlaxEngine into Tryibion-texture-window-tabs 2024-07-18 08:46:38 +02:00
Tryibion 531c75bff9 Display asset picker type. 2024-07-16 20:32:47 -05:00
Tryibion 12f70572b0 Remove redundant first tab on floating window. 2024-07-16 20:05:27 -05:00
Tryibion 7090e85224 Fix not being able to drag a window tab all of the way to the right. 2024-07-16 19:25:05 -05:00
Tryibion d4bf8368b1 Separate import settings as new tab in texture window. 2024-07-16 11:43:04 -05:00
Tryibion e1dcd290b1 Add Editor update event. 2024-07-11 15:48:50 -05:00