Commit Graph

6669 Commits

Author SHA1 Message Date
Wojtek Figat
3078a9d212 Merge branch 'davevanegdom-Statusbar-Imrpovements' 2023-10-01 12:04:01 +02:00
Wojtek Figat
4d6a27c92a Merge branch 'Statusbar-Imrpovements' of https://github.com/davevanegdom/FlaxEngine into davevanegdom-Statusbar-Imrpovements 2023-10-01 12:01:31 +02:00
Wojtek Figat
e0f840563d Merge branch 'M-3-H-master' 2023-10-01 12:00:50 +02:00
Wojtek Figat
a761a7e857 Merge branch 'master' of https://github.com/M-3-H/FlaxEngine into M-3-H-master 2023-10-01 12:00:40 +02:00
Wojtek Figat
5e283b3d16 Merge branch 'Tryibion-fix-tooltip' 2023-10-01 11:59:36 +02:00
Wojtek Figat
818b2c3bb5 Merge branch 'fix-tooltip' of https://github.com/Tryibion/FlaxEngine into Tryibion-fix-tooltip 2023-10-01 11:59:30 +02:00
Wojtek Figat
0690d8695d Merge branch 'Chikinsupu-Visject-PrettierConnectionBezier' 2023-10-01 11:59:10 +02:00
Wojtek Figat
c35a21a1dc Merge branch 'Visject-PrettierConnectionBezier' of https://github.com/Chikinsupu/FlaxEngine into Chikinsupu-Visject-PrettierConnectionBezier 2023-10-01 11:57:08 +02:00
Wojtek Figat
0eda67bd73 Fix nested profiler events usage
#https://github.com/FlaxEngine/FlaxEngine/issues/1380
2023-10-01 11:56:54 +02:00
Wojtek Figat
659a70dc81 Merge branch 'Tryibion-bool-fix' 2023-10-01 11:36:26 +02:00
Wojtek Figat
3a85b27cbe Merge branch 'bool-fix' of https://github.com/Tryibion/FlaxEngine into Tryibion-bool-fix 2023-10-01 11:36:21 +02:00
Wojtek Figat
8c69363fba Merge branch 'Zode-master' 2023-10-01 11:35:11 +02:00
Wojtek Figat
f4ee709bc6 Merge branch 'master' of https://github.com/Zode/FlaxEngine into Zode-master 2023-10-01 11:35:06 +02:00
Wojtek Figat
ecda813b4a Merge branch 'AndrejStojkovic-master' 2023-10-01 11:34:36 +02:00
Wojtek Figat
bd8240c5a5 Merge branch 'master' of https://github.com/AndrejStojkovic/FlaxEngine into AndrejStojkovic-master 2023-10-01 11:34:30 +02:00
Wojtek Figat
5bfcbd907a Merge branch 'Tryibion-output-win' 2023-10-01 11:27:19 +02:00
Wojtek Figat
0d0dc9bc07 Merge branch 'output-win' of https://github.com/Tryibion/FlaxEngine into Tryibion-output-win 2023-10-01 11:27:11 +02:00
Zode
db8f721fa7 Fix build project generation under arch 2023-09-29 11:20:24 +03:00
Chandler Cox
8f5af2e149 Fix bool editor when null. 2023-09-28 19:49:59 -05:00
Chandler Cox
9975bde78c Change output window search and scroll bars to be like other windows. 2023-09-28 19:09:02 -05:00
Wojtek Figat
fd3f10864b Fixes for iOS #1312 2023-09-29 00:00:51 +02:00
Chandler Cox
9a5d8e2c51 Fix tooltip crash 2023-09-28 15:31:30 -05:00
Wojtek Figat
310d61edda Merge branch 'Tryibion-prevent-full-desktop' 2023-09-28 20:34:29 +02:00
Wojtek Figat
983694eb4f Merge branch 'prevent-full-desktop' of https://github.com/Tryibion/FlaxEngine into Tryibion-prevent-full-desktop 2023-09-28 20:34:12 +02:00
Wojtek Figat
7e55a61444 Merge branch 'GoaLitiuM-editor_bindings' 2023-09-28 20:18:35 +02:00
Wojtek Figat
481bbd3a77 Merge branch 'editor_bindings' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-editor_bindings 2023-09-28 20:17:35 +02:00
Wojtek Figat
139e6d0d1f Improve #1514 to share code for tooltip position wrapping 2023-09-28 20:16:57 +02:00
Wojtek Figat
28c651252a Merge branch 'Tryibion-tooltip-move' 2023-09-28 20:07:50 +02:00
Wojtek Figat
b242820132 Merge branch 'tooltip-move' of https://github.com/Tryibion/FlaxEngine into Tryibion-tooltip-move 2023-09-28 19:59:59 +02:00
Wojtek Figat
88758a4f3a Merge branch 'Tryibion-editor-options-save-popup' 2023-09-28 19:58:29 +02:00
Wojtek Figat
9ad607c054 Merge branch 'editor-options-save-popup' of https://github.com/Tryibion/FlaxEngine into Tryibion-editor-options-save-popup 2023-09-28 19:58:24 +02:00
Wojtek Figat
e319b4dedc Minor optimization for PhysX events cleanup 2023-09-28 19:37:08 +02:00
Wojtek Figat
82b2f46b48 Post-merge tweaks for #1312 2023-09-28 19:21:06 +02:00
Wojtek Figat
30482f62e2 Merge branch 'GoaLitiuM-marshalling_scriptingobject_changes' 2023-09-28 18:41:30 +02:00
Wojtek Figat
279528a30d Merge branch 'marshalling_scriptingobject_changes' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-marshalling_scriptingobject_changes
# Conflicts:
#	Source/Engine/Engine/NativeInterop.Unmanaged.cs
#	Source/Engine/Scripting/Runtime/DotNet.cpp
2023-09-28 18:41:20 +02:00
Wojtek Figat
53c53c1166 Merge branch 'GoaLitiuM-sln_generation_fix' 2023-09-28 11:51:26 +02:00
Wojtek Figat
d89400b84e Merge branch 'sln_generation_fix' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-sln_generation_fix 2023-09-28 11:51:20 +02:00
Wojtek Figat
c50bbfff76 Merge branch 'GoaLitiuM-clang_detect_fix' 2023-09-28 11:48:44 +02:00
Wojtek Figat
bd842e60bd Merge branch 'clang_detect_fix' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-clang_detect_fix 2023-09-28 11:48:19 +02:00
Wojtek Figat
23cfc522e8 Merge branch 'GoaLitiuM-managed_error_dialog' 2023-09-28 11:47:30 +02:00
Wojtek Figat
0a8fa46f77 Merge branch 'managed_error_dialog' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-managed_error_dialog 2023-09-28 11:47:23 +02:00
Wojtek Figat
77f962b33d Fix soft refs in bindings to match C# version that is not generic 2023-09-28 11:47:16 +02:00
bcccb71373 Show full exception message in error message box for managed exceptions 2023-09-28 00:25:26 +03:00
8338d1cc37 Fix Which not returning the found executable on success 2023-09-27 21:47:45 +03:00
d7db26cf89 Detect latest versions of clang 2023-09-27 21:47:41 +03:00
22e5afdb6f Fix Visual Studio project GUIDs getting randomized during regeneration 2023-09-27 20:17:19 +03:00
0c00dc20a2 Always generate additional Visual Studio solution files for all platforms 2023-09-27 19:43:59 +03:00
bff18a5564 Add -genproject -rider option for generating Rider compatible solution files 2023-09-27 19:43:56 +03:00
Wojtek Figat
44292efa04 Fix editing array of tags in Editor that is null initially
#1451
2023-09-27 13:38:03 +02:00
Wojtek Figat
86c06297e8 Merge branch 'GoaLitiuM-unsub_event_nothrow' 2023-09-27 13:21:18 +02:00