Commit Graph

373 Commits

Author SHA1 Message Date
Wojtek Figat
58b9d76d24 Merge remote-tracking branch 'origin/master' into 1.7
# Conflicts:
#	Source/Editor/Viewport/PrefabWindowViewport.cs
#	Source/Engine/Physics/PhysX/SimulationEventCallbackPhysX.cpp
2023-09-28 20:42:54 +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
2f9c601678 Merge remote-tracking branch 'origin/master' into 1.7 2023-09-27 17:32:47 +02:00
Nils Hausfeld
b6ad252305 - Removed unnecessary null-conditional operator
- Removed unnecessary Float2 allocation
2023-09-23 19:14:06 +02:00
642766d9cc Add Editor input options for Play Current Scenes and running cooked game 2023-09-23 15:23:07 +03:00
Nils Hausfeld
963300c2cb - Implemented shift tab support for Container Controls 2023-09-23 11:56:45 +02:00
Wojtek Figat
1c20398d8c Merge remote-tracking branch 'origin/master' into 1.7 2023-09-22 22:43:29 +02:00
Wojtek Figat
19651db45e Merge branch 'max-min-on-click' of https://github.com/Tryibion/FlaxEngine into Tryibion-max-min-on-click 2023-09-22 18:49:14 +02:00
bbf8883275 Fix docking hint areas not hiding after dragging a window 2023-09-21 20:13:06 +03:00
Chandler Cox
eb5a1f1103 Fix max and min on double click main menu buttons for custom menu bar 2023-09-20 17:49:17 -05:00
Wojtek Figat
9f97787099 Merge remote-tracking branch 'origin/master' into 1.7 2023-09-20 16:02:48 +02:00
Wojtek Figat
a56ce92867 Fix crash when importing model with materials and Split Objects enabled 2023-09-19 23:07:10 +02:00
Wojtek Figat
6bdbaecc18 Merge remote-tracking branch 'origin/master' into 1.7
# Conflicts:
#	Source/Engine/Physics/PhysX/SimulationEventCallbackPhysX.cpp
2023-09-13 10:29:28 +02:00
Wojtek Figat
dbd85fddfe Refactor Editor Tab controls system to allows customizing the tab header controls 2023-09-12 22:24:15 +02:00
Wojtek Figat
fb488cbaf7 Merge remote-tracking branch 'origin/master' into 1.7 2023-09-11 22:43:46 +02:00
Wojtek Figat
16fed8927c Refactor #1266 (code quality and simplicity) 2023-09-11 20:02:53 +02:00
Wojtek Figat
2ddb44afa8 Merge branch 'ContentBrowserImprovement' of https://github.com/NoriteSC/FlaxEngineFork into NoriteSC-ContentBrowserImprovement
# Conflicts:
#	Source/Editor/Windows/ContentWindow.cs
2023-09-11 15:39:48 +02:00
Wojtek Figat
829d3b3642 Add editor shortcuts usability when toolstrip or main menu controls are focused 2023-09-11 15:07:06 +02:00
Chandler Cox
39ecfe8c24 Small bug fix 2023-09-03 12:11:33 -05:00
Chandler Cox
924e1c6d81 Fix right click deselecting scene tree nodes. 2023-09-03 06:36:29 -05:00
Wojtek Figat
6a5e660c2e Merge remote-tracking branch 'origin/master' into 1.7 2023-09-02 19:02:52 +02:00
Wojtek Figat
462da342a7 Fix ContextMenuSingleSelectGroup selection of the first item that had default value 2023-09-01 11:43:02 +02:00
Wojtek Figat
16930466d5 Hide some compiler-generated types from TypeSearchPopup 2023-08-29 11:43:11 +02:00
Wojtek Figat
8906453b15 Merge remote-tracking branch 'origin/master' into 1.7 2023-08-28 09:11:29 +02:00
Wojtek Figat
3b163b6c4b Minor cleanup 2023-08-27 16:36:37 +02:00
Wojtek Figat
94bd4d39f7 Merge branch 'animevent-abswrapper-remove' of https://github.com/Tryibion/FlaxEngine into Tryibion-animevent-abswrapper-remove 2023-08-27 16:31:48 +02:00
Wojtek Figat
6261f02d1c Merge branch 'add-tab-breaks' of https://github.com/Tryibion/FlaxEngine into Tryibion-add-tab-breaks 2023-08-27 16:29:31 +02:00
Wojtek Figat
97b56d1e72 Minor tweak #1332 2023-08-27 16:28:35 +02:00
Chandler Cox
87aba23299 Add tab breaks for window tabs. 2023-08-26 16:49:37 -05:00
Wojtek Figat
1287731816 Add reordering and reparenting decorators (with undo) 2023-08-25 14:54:40 +02:00
Chandler Cox
7e429854d6 Simplify check to use attribute. 2023-08-23 09:03:56 -05:00
Chandler Cox
e1645210b3 Add check and indication if no anim events are found. 2023-08-23 08:46:21 -05:00
Chandler Cox
e16e2e2877 Prevent AbstractWrapper from showing in Add AnimEvent CM. 2023-08-23 08:35:35 -05:00
Chandler Cox
a737e7bb05 Small fix to UI 2023-08-22 17:36:09 -05:00
Chandler Cox
ce4cf9b34b Add timeline position numbers and add to GUI. 2023-08-22 15:42:16 -05:00
Wojtek Figat
da44babb03 Add ignoring types with CompilerGeneratedAttribute in Editor 2023-08-14 13:11:00 +02:00
Wojtek Figat
869649e5ed Merge remote-tracking branch 'origin/master' into 1.7 2023-08-01 14:05:49 +02:00
Wojtek Figat
81860e5f18 Cleanup code #1215 and add cook game icon 2023-07-31 19:02:53 +02:00
Wojtek Figat
6e9b9b6d0e Merge branch 'feature/1151-play-mode-actions' of https://github.com/envision3d/FlaxEngine into envision3d-feature/1151-play-mode-actions 2023-07-31 17:24:55 +02:00
NoriteSC
0b89164328 Merge branch 'FlaxEngine:master' into ContentBrowserImprovement 2023-07-28 15:56:40 +02:00
Wojtek Figat
ce16debabd Merge remote-tracking branch 'origin/master' into 1.7 2023-07-24 23:21:03 +02:00
NoriteSC
6a65ccd5ef rev1 2023-07-24 22:10:12 +02:00
Chandler Cox
f80b7ee2a5 Fix spacing 2023-07-23 18:58:47 -05:00
Chandler Cox
12005ad314 Simplify functionality into function. 2023-07-23 15:20:57 -05:00
Chandler Cox
02d135053f Add scroll to selected asset/content item on asset picker select menu open. 2023-07-23 15:10:31 -05:00
envision3d
dba0675873 Merge branch 'master' of https://github.com/FlaxEngine/FlaxEngine into feature/1151-play-mode-actions 2023-07-20 02:00:53 -05:00
Wojtek Figat
e4c3461053 Merge remote-tracking branch 'origin/master' into 1.7 2023-07-03 22:01:50 +02:00
Wojtek Figat
656866c1d4 Various improvements in Editor code 2023-06-29 16:41:15 +02:00
Wojtek Figat
9536c37623 Add ability to unset type reference with null item 2023-06-28 15:12:58 +02:00
envision3d
940b0e02e5 improve state syncing of context menus and editor options 2023-06-28 04:08:36 -05:00