Commit Graph

5874 Commits

Author SHA1 Message Date
Wojtek Figat
883abc2f3b Merge branch 'base-win-size' of https://github.com/Tryibion/FlaxEngine into Tryibion-base-win-size 2023-10-01 12:30:14 +02:00
Wojtek Figat
ec7dcc4cfb Merge branch 'vs_android_intellisense_fix' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-vs_android_intellisense_fix 2023-10-01 12:29:36 +02:00
Wojtek Figat
3ae0e4f65e Merge branch 'vscode_csharp_build_tasks' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-vscode_csharp_build_tasks 2023-10-01 12:28:30 +02:00
Wojtek Figat
7dc3a3c1a2 Merge branch 'assembly_load_fix' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-assembly_load_fix 2023-10-01 12:27:54 +02:00
Wojtek Figat
6e47db0ebe Merge branch 'sln_generation_fix2' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-sln_generation_fix2 2023-10-01 12:26:39 +02:00
Wojtek Figat
8c61b6d41b Merge branch 'blur-fix' of https://github.com/Tryibion/FlaxEngine into Tryibion-blur-fix 2023-10-01 12:25:39 +02:00
Wojtek Figat
19a0eab966 Merge branch 'sceneanim_null_check_fix' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-sceneanim_null_check_fix 2023-10-01 12:12:21 +02:00
Wojtek Figat
26040f27cc Merge branch 'renameNewActor' of https://github.com/Arcnor/FlaxEngine into Arcnor-renameNewActor 2023-10-01 12:08:01 +02:00
Wojtek Figat
da647d3403 Merge branch 'labelSetBaselineGap' of https://github.com/Arcnor/FlaxEngine into Arcnor-labelSetBaselineGap 2023-10-01 12:06:57 +02:00
Wojtek Figat
3f3f31f70f Merge branch 'visualscript_valuetype_fix' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-visualscript_valuetype_fix 2023-10-01 12:06:00 +02:00
Wojtek Figat
5e3bb4d51e Merge branch 'font-size-fixes' of https://github.com/Tryibion/FlaxEngine into Tryibion-font-size-fixes 2023-10-01 12:05:20 +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
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
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
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
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
f4ee709bc6 Merge branch 'master' of https://github.com/Zode/FlaxEngine into Zode-master 2023-10-01 11:35:06 +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
0d0dc9bc07 Merge branch 'output-win' of https://github.com/Tryibion/FlaxEngine into Tryibion-output-win 2023-10-01 11:27:11 +02:00
Chandler Cox
260c48e41d Change blur panel to draw self. Fix issue with blur strength slider. 2023-09-30 17:44:42 -05:00
Chandler Cox
bae1cfbc8a Change base editor window size to 75% of desktop size when restored for first time. 2023-09-30 17:35:42 -05:00
6483f95450 Fix Visual Studio project folder GUIDs randomization during regeneration 2023-09-30 03:26:56 +03:00
cc318dddd7 Remap non-native Editor VS build configurations to native configurations 2023-09-30 02:37:05 +03:00
8b8970e4b9 Generate VSCode attach profile for native debugging 2023-09-29 23:51:27 +03:00
bf2c10b036 Generate one VSCode debugger attach launch profile per debugger type 2023-09-29 23:51:24 +03:00
8a19b5ddd6 Skip adding VSCode task and launch profiles for plugins and dependencies 2023-09-29 23:51:22 +03:00
811d639573 Generate Visual Studio Code build tasks for C#-projects 2023-09-29 23:51:17 +03:00
18310c9264 Fix loading shared managed assemblies multiple times 2023-09-29 22:12:50 +03:00
Edu Garcia
8cdd026826 Merge branch 'FlaxEngine:master' into renameNewActor 2023-09-29 15:04:23 +01: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
1d42988f39 Fix VisualScript method calls not working with value types 2023-09-29 00:50:19 +03:00
Edu Garcia
6d3fdeec8a Rename new actor after creating it 2023-09-28 22:50:07 +01:00
Edu Garcia
8eed667d5a Makes BaseLinesGapScale configurable for Label 2023-09-28 22:41:24 +01:00
Chandler Cox
9a5d8e2c51 Fix tooltip crash 2023-09-28 15:31:30 -05:00
96d880df6a Fix crash in SceneAnimationPlayer 2023-09-28 22:06:07 +03:00
58445f04c4 Fix potential incorrect null checks in FlaxEngine.Objects
The null-conditional operator checks for reference equality of the
Object, but doesn't check the validity of the unmanaged pointer. This
check is corrected in cases where the object was not immediately
returned from the bindings layer and may have been destroyed earlier.
2023-09-28 22:05:58 +03:00
ea201b6173 Fix null check in SceneAnimationWindow
The null-conditional operator checks for reference equality of the
Object, but doesn't check the unmanaged pointer validity.
2023-09-28 22:05:17 +03: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
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
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
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
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
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