GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,388 Commits 14 Branches 0 Tags
ab4703c3ddf6fad2104c05223b3908c7fa66ad29
Commit Graph

9388 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wojtek Figat
ab4703c3dd Merge branch 'Arcnor-colorPickerAlwaysChangesColor' 2024-07-25 10:06:32 +02:00
Wojtek Figat
4ce853d892 Merge branch 'RuanLucasGD-RenameActors' 2024-07-25 10:06:23 +02:00
Wojtek Figat
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
Wojtek Figat
66122e6e3b Merge branch 'RenameActors' of https://github.com/RuanLucasGD/FlaxEngine into RuanLucasGD-RenameActors 2024-07-25 09:28:14 +02:00
Wojtek Figat
c444661884 Merge branch 'Swiggies-lightmap-material-nodes' 2024-07-25 09:25:48 +02:00
Wojtek Figat
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
Wojtek Figat
dbd5566ee0 Merge branch 'Tryibion-inject-scene-load-children' 2024-07-25 09:24:16 +02:00
Wojtek Figat
ad2d4a2626 Merge branch 'inject-scene-load-children' of https://github.com/Tryibion/FlaxEngine into Tryibion-inject-scene-load-children 2024-07-25 09:24:12 +02:00
Wojtek Figat
148f03205f Merge branch 'Tryibion-table-improve' 2024-07-25 09:23:54 +02:00
Wojtek Figat
2c1f835528 Merge branch 'table-improve' of https://github.com/Tryibion/FlaxEngine into Tryibion-table-improve 2024-07-25 09:17:01 +02:00
Wojtek Figat
8038e045b0 Merge branch 'GoaLitiuM-assert_directions' 2024-07-25 09:16:23 +02:00
Wojtek Figat
7a635e2896 Merge branch 'assert_directions' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-assert_directions 2024-07-25 09:16:16 +02:00
Wojtek Figat
a40a5721f3 Merge branch 'Tryibion-jsontype-thumbnail' 2024-07-25 08:41:29 +02:00
Wojtek Figat
e4cf4c9f17 Merge branch 'jsontype-thumbnail' of https://github.com/Tryibion/FlaxEngine into Tryibion-jsontype-thumbnail 2024-07-25 08:41:21 +02:00
Wojtek Figat
5299afa276 Merge branch 'GoaLitiuM-module_compilation_fix' 2024-07-25 08:41:07 +02:00
Wojtek Figat
8e8e41d5e1 Merge branch 'module_compilation_fix' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-module_compilation_fix 2024-07-25 08:40:56 +02:00
Wojtek Figat
153e45c345 Merge branch 'GoaLitiuM-csharp_warning_fix' 2024-07-25 08:40:29 +02:00
Wojtek Figat
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
Wojtek Figat
8397a81428 Merge branch 'Tryibion-empty-ref-text' 2024-07-25 08:40:05 +02:00
Wojtek Figat
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
Wojtek Figat
3b740659f5 Merge branch 'GoaLitiuM-customeditor_fixes' 2024-07-25 08:38:41 +02:00
Wojtek Figat
2913bb39e8 Merge branch 'customeditor_fixes' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-customeditor_fixes 2024-07-25 08:38:32 +02:00
Chandler Cox
8209639261 Add being able to add a thumbnail to a SpawnableJsonProxy 2024-07-23 22:08:01 -05:00
Ari Vuollet
8b22ffe007 Fix warnings about upcoming C# reserved keywords 2024-07-20 20:46:32 +03:00
Ari Vuollet
24f7ec4a54 Fix statically linked binary modules not getting compiled 2024-07-20 15:41:26 +03:00
Ari Vuollet
55d55212c3 Add assertions for checking against un-normalized direction vectors 2024-07-20 15:34:11 +03:00
Chandler Cox
1142fa68ea Small table improvements. 2024-07-19 20:49:58 -05:00
Chandler Cox
305f725394 Ensure to add all scene objects of injected actors. 2024-07-19 08:19:34 -05:00
Chandler Cox
8a297a6fd4 Clean up code more. 2024-07-19 07:59:57 -05:00
Chandler Cox
d717430256 Clean up code 2024-07-19 07:48:01 -05:00
Chandler Cox
8804738193 Allow for Initializing children injected via scene loading. 2024-07-19 07:42:57 -05:00
Chandler Cox
9b11461eaf Add type display to empty object ref in editor 2024-07-19 06:48:35 -05:00
Wojtek Figat
d879b8e064 Add utility GetInstance method to Json Asset refs in csharp 
#2774
 2024-07-18 15:14:26 +02:00
Wojtek Figat
f132198ead Add more functionality and thumbnail to content items in finder for scripts 2024-07-18 14:19:27 +02:00
Wojtek Figat
5e0d90af2e Add displaying file extension for scripts in content finder to distinguish C++ files 2024-07-18 14:18:52 +02:00
Wojtek Figat
736119fdc6 Merge branch 'Zode-quaternion-fix-down' 2024-07-18 12:40:06 +02:00
Wojtek Figat
5259c41b40 Merge branch 'quaternion-fix-down' of https://github.com/Zode/FlaxEngine into Zode-quaternion-fix-down 2024-07-18 12:40:00 +02:00
Wojtek Figat
4a6f2f8821 Merge branch 'Swiggies-ccd-fix' 2024-07-18 12:39:24 +02:00
Wojtek Figat
529de24da4 Cache DisableCCD locally in physics backend 
#2768
 2024-07-18 12:39:15 +02:00
Wojtek Figat
fc3d15c544 Merge branch 'ccd-fix' of https://github.com/Swiggies/FlaxEngine into Swiggies-ccd-fix 2024-07-18 12:27:33 +02:00
Wojtek Figat
261c4a7e88 Merge branch 'GoaLitiuM-simplemove_gravity' 2024-07-18 12:26:11 +02:00
Wojtek Figat
ccd619f659 Merge branch 'simplemove_gravity' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-simplemove_gravity 2024-07-18 12:26:06 +02:00
Wojtek Figat
35bbd52f89 Merge branch 'GoaLitiuM-charcontroller_terrain_fix' 2024-07-18 11:54:54 +02:00
Wojtek Figat
ea45aa9b19 Merge branch 'charcontroller_terrain_fix' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-charcontroller_terrain_fix 2024-07-18 11:54:46 +02:00
Wojtek Figat
655c377da8 Merge branch 'Tryibion-phyx-ed' 2024-07-18 11:50:56 +02:00
Wojtek Figat
5498cbf3bf Merge branch 'phyx-ed' of https://github.com/Tryibion/FlaxEngine into Tryibion-phyx-ed 2024-07-18 11:50:46 +02:00
Wojtek Figat
10a343a490 Merge branch 'Tryibion-mesh-collider-neg-scale-fix' 2024-07-18 11:47:46 +02:00
Wojtek Figat
b2faad9634 Merge branch 'mesh-collider-neg-scale-fix' of https://github.com/Tryibion/FlaxEngine into Tryibion-mesh-collider-neg-scale-fix 2024-07-18 11:47:39 +02:00
Wojtek Figat
786ab54f84 Merge branch 'Tryibion-pref-layout-splitter' 2024-07-18 11:46:03 +02:00
Wojtek Figat
d41d153cff Merge branch 'pref-layout-splitter' of https://github.com/Tryibion/FlaxEngine into Tryibion-pref-layout-splitter 2024-07-18 11:45:53 +02:00