Commit Graph

115 Commits

Author SHA1 Message Date
f99a244b8e Merge remote-tracking branch 'origin/master' into sdl_platform
# Conflicts:
#	Source/Editor/Windows/GameWindow.cs
2025-10-18 02:19:30 +03:00
668a4dbb4d Merge remote-tracking branch 'origin/master' into sdl_platform 2025-10-14 01:09:26 +03:00
Wojtek Figat
e1b3429b4c Fix regression on game window defocus 2025-10-13 21:50:19 +02:00
Wojtek Figat
87e2c4c4d5 Merge remote-tracking branch 'origin/master' into 1.11
# Conflicts:
#	Content/Editor/DebugMaterials/DDGIDebugProbes.flax
#	Source/Editor/Windows/OutputLogWindow.cs
#	Source/Engine/Level/Actor.cpp
2025-09-24 18:18:27 +02:00
Wojtek Figat
9749487e24 Move prefab and game UI size context menu to shared UI Module
#3571
2025-09-14 23:59:40 +02:00
Wojtek Figat
55968a8ddc Merge branch 'prefab-viewport-scaling' of https://github.com/Tryibion/FlaxEngine into Tryibion-prefab-viewport-scaling 2025-09-14 23:11:59 +02:00
1d8f221f1b Merge remote-tracking branch 'origin/1.11' into sdl_platform_1.11
# Conflicts:
#	Source/Engine/Platform/Windows/WindowsPlatform.cpp
#	Source/Tools/Flax.Build/Build/ProjectTarget.cs
#	Source/Tools/Flax.Build/Configuration.cs
2025-09-07 19:31:16 +03:00
Wojtek Figat
826009c1b4 Merge remote-tracking branch 'origin/master' into 1.11
# Conflicts:
#	Content/Editor/DebugMaterials/DDGIDebugProbes.flax
#	Source/Engine/Scripting/Scripting.cpp
2025-08-25 23:48:08 +02:00
fc341a86e7 Merge remote-tracking branch 'origin/master' into sdl_platform 2025-08-24 09:44:28 +03:00
Chandler Cox
a02b7d4a1a Add events for when audio settings are changed for the game window. 2025-08-17 11:58:42 -05:00
b183b5bcfc Merge remote-tracking branch 'origin/master' into sdl_platform 2025-08-12 15:22:34 +03:00
Wojtek Figat
c882b547c8 Fix game UI focus loss when hiding focused control to maintain gamepad navigation in Editor 2025-07-15 12:34:02 +02:00
Wojtek Figat
4af26a5516 SImplify editor code for actors debug shapes drawing 2025-07-11 23:00:53 +02:00
Chandler Cox
52b64540ab Add extra index guard logic 2025-06-28 10:46:11 -05:00
Chandler Cox
53d4ea51af Add prefab UI viewport scaling. 2025-06-27 21:18:53 -05:00
6ff260d052 Merge remote-tracking branch 'origin/master' into sdl_platform 2025-06-16 14:09:29 +03:00
Zode
c1e782bb32 Add hotkey to quick focus debug console input 2025-06-09 23:34:02 +03:00
b1fd86e6b5 Merge remote-tracking branch 'origin/master' into sdl_platform 2025-06-02 18:15:16 +03:00
xxSeys1
5b618b4f31 add icons to more commonly used editor windows 2025-05-05 13:24:21 +02:00
Chandler Cox
9d527ab4a6 Remove editable from check for enabling inputs for game window GUI. 2025-04-25 20:36:53 -05:00
Chandler Cox
bbc221086a Fix GUI input when edit GUI option is false and game is being played. 2025-04-25 17:55:07 -05:00
84ada18299 Fix unlock mouse hotkey not unlocking CursorLockMode.Locked cursor 2025-04-21 23:13:23 +03:00
7e59c3b9a7 Fix restoring locked cursor state when window gains focus again 2025-04-19 21:14:03 +03:00
c3bae49aae Force cursor to center of Game Window when tab handle is clicked 2025-04-19 21:13:43 +03:00
Wojtek Figat
9c3fd052cd Remove copyright year from source files and update to 2025 2025-04-07 19:22:21 +02:00
Wojtek Figat
5d3da8a8d0 Merge remote-tracking branch 'origin/master' into 1.10
# Conflicts:
#	Source/Editor/SceneGraph/Actors/StaticModelNode.cs
#	Source/Engine/Graphics/Models/Mesh.cs
#	Source/Engine/Graphics/Models/ModelData.h
2025-03-13 11:23:01 +01:00
Wojtek Figat
cd72f4f19b Add Edit GUI option to Game Window
#3269
2025-03-11 00:04:57 +01:00
Wojtek Figat
5bdbbb6d38 Merge remote-tracking branch 'origin/master' into 1.10 2025-03-07 23:41:02 +01:00
Wojtek Figat
47b22b305d Add conditional showing of Clear Debug Draw buttons only if there is anything to clear
#2989
2025-03-03 09:51:05 +01:00
Wojtek Figat
6ad20b222d Merge branch 'DebugDrawClearInEditor' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-DebugDrawClearInEditor
# Conflicts:
#	Source/Editor/Windows/GameWindow.cs
2025-03-03 09:40:01 +01:00
Wojtek Figat
a6fb651ff4 Merge remote-tracking branch 'origin/master' into 1.10
# Conflicts:
#	Source/Engine/Graphics/Materials/MaterialShader.h
2025-02-18 09:19:59 +01:00
xxSeys1
6a5f22400d update volume slider in game panel on menu show 2025-02-05 12:35:49 +01:00
Wojtek Figat
4e31d436d5 Merge branch 'GamePanelAudio' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-GamePanelAudio 2025-02-01 15:23:33 +01:00
Wojtek Figat
246944f688 Merge remote-tracking branch 'origin/master' into 1.10 2024-11-06 09:29:48 +01:00
Wojtek Figat
e9dcb8a8bb Add option to build editor without profiler 2024-11-06 09:29:26 +01:00
xxSeys1
6c6a557ffb make naming more consistent 2024-10-25 23:00:05 +02:00
xxSeys1
2721364df6 improve naming 2024-10-25 19:30:53 +02:00
xxSeys1
dddd5b83d0 add button to remove override 2024-10-18 16:58:49 +02:00
xxSeys1
af79a32847 make naming more consistent 2024-10-17 22:06:07 +02:00
xxSeys1
a810288e2e do todo 2024-10-17 22:04:53 +02:00
xxSeys1
21083f8905 expand play mode game panel focus options 2024-10-17 19:24:38 +02:00
xxSeys1
7e1d6679ce add debug draw clear to game and editor panel 2024-10-15 19:43:08 +02:00
xxSeys1
a50c21cf36 add audio volume and muted in game panel tab rmb menu 2024-10-09 17:19:00 +02:00
Wojtek Figat
c6e121a777 Add 2k res to scene anim renderer 2024-10-03 13:39:58 +02:00
Chandler Cox
6705205e2f Update cursor unlock text with correct input key bind. 2024-05-17 09:41:02 -05:00
Chandler Cox
430b22d5d7 Dont unfocus game window while cursor is not visible unless the lock mode is none. 2024-05-04 17:37:32 -05:00
Wojtek Figat
77850f91b8 Merge branch 're-add-gamewin-inputs' of https://github.com/Tryibion/FlaxEngine into Tryibion-re-add-gamewin-inputs 2024-03-19 17:55:47 +01:00
Chandler Cox
41637232ea Add back some more game window inputs but dont run the action if the editor is in play mode. 2024-03-19 07:28:30 -05:00
Wojtek Figat
24299dc5cc Fix game ui inputs to UI when game is paused in Editor 2024-03-18 21:36:43 +01:00
Wojtek Figat
c60244878d Add **UI Control gizmo for editing UIs** 2024-03-16 22:00:40 +01:00