Flax/FlaxEngine
3
0
Fork 0
Code Issues Pull Requests Releases Activity
6,826 Commits 15 Branches 23 Tags
a001a5fbdca4a802bfef7a34412ffca86bd99ff6
Commit Graph

206 Commits

Author SHA1 Message Date
mafiesto4 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
mafiesto4 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
GoaLitiuM 080091c271 Fix missing bindings for Actor related actions 2023-09-23 15:35:55 +03:00
GoaLitiuM 52cf4df641 Add input bindings for File menu actions 2023-09-23 15:23:09 +03:00
GoaLitiuM a1cbaba743 Add Editor input bindings for Profiler window and Profiler actions 2023-09-23 15:23:09 +03:00
GoaLitiuM 8ed57863b8 Add Editor input bindings for Tools menu items 2023-09-23 15:23:09 +03:00
GoaLitiuM 69ce189c5d Add input bindings for Scene viewport related actions and Pilot Actor 2023-09-23 15:23:08 +03:00
GoaLitiuM 642766d9cc Add Editor input options for Play Current Scenes and running cooked game 2023-09-23 15:23:07 +03:00
Tryibion 12c0ce9ea5 Revert maximize. 2023-09-20 18:09:16 -05:00
Tryibion ccb3f40de0 Prevent inital window from being covering the task bar on restore of windows window 2023-09-20 17:58:08 -05:00
mafiesto4 a71de7357c Merge remote-tracking branch 'origin/master' into 1.7 2023-09-19 21:42:53 +02:00
mafiesto4 40c98ac9e5 Merge branch 'fix_folder_rename' of https://github.com/MineBill/FlaxEngine into MineBill-fix_folder_rename 2023-09-18 16:56:53 +02:00
MineBill 9931a5c026 Don't treat '.' in folder names as extensions. 2023-09-16 19:09:38 +03:00
GoaLitiuM 5ab299fed9 Fix assets getting deleted when modified by external applications 2023-09-16 18:11:22 +03:00
mafiesto4 fb488cbaf7 Merge remote-tracking branch 'origin/master' into 1.7 2023-09-11 22:43:46 +02:00
mafiesto4 16fed8927c Refactor #1266 (code quality and simplicity) 2023-09-11 20:02:53 +02:00
mafiesto4 829d3b3642 Add editor shortcuts usability when toolstrip or main menu controls are focused 2023-09-11 15:07:06 +02:00
mafiesto4 716e643f2a Fix applying prefab changes to nesting prefab instances 
#1256
 2023-09-10 21:07:41 +02:00
mafiesto4 f088f2b61d Merge remote-tracking branch 'origin/master' into 1.7 2023-08-18 10:33:51 +02:00
mafiesto4 18b47257fd Add **Behavior Tree** asset type and editing 2023-08-16 13:26:33 +02:00
mafiesto4 9f7fd42677 Codestyle fix 2023-08-14 18:44:21 +02:00
mafiesto4 7da93ad68d Merge branch 'feature/1151-play-mode-refactor-cleanup' of https://github.com/envision3d/FlaxEngine into envision3d-feature/1151-play-mode-refactor-cleanup 2023-08-14 18:42:05 +02:00
mafiesto4 0e2d1b6ad2 Merge remote-tracking branch 'origin/master' into 1.7 2023-08-14 18:14:59 +02:00
mafiesto4 55ca419aba Merge branch 'paste-fix' of https://github.com/Tryibion/FlaxEngine into Tryibion-paste-fix 2023-08-14 16:18:44 +02:00
envision3d b9ffb950f3 Refactor and more appropriately organize logic 
- move play logic to simulation module
- update play hotkey to call play game/scene delegate function
- link hotkey tooltip text to inputOptions
 2023-08-06 13:11:45 -05:00
mafiesto4 8dc98174cf Minor tweaks 2023-08-01 14:14:27 +02:00
mafiesto4 869649e5ed Merge remote-tracking branch 'origin/master' into 1.7 2023-08-01 14:05:49 +02:00
mafiesto4 81860e5f18 Cleanup code #1215 and add cook game icon 2023-07-31 19:02:53 +02:00
mafiesto4 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
Tryibion 10c8454e8f Paste at same level of selected actor parent node instead of as child of selected actor for better behavior. 2023-07-27 10:33:30 -05:00
Tryibion 83427ba1d4 Add batch creating prefabs from mutiple selected actors in the scene tree. 2023-07-20 23:02:26 -05:00
mafiesto4 656866c1d4 Various improvements in Editor code 2023-06-29 16:41:15 +02:00
envision3d 940b0e02e5 improve state syncing of context menus and editor options 2023-06-28 04:08:36 -05:00
envision3d 39f4c00135 add play button actions, number of players 
- add context menu support for toolstrip buttons
- add "Play Game" vs. "Play Scenes"
- add context menu for choosing play button action to toolstrip button
- add number of game client selection for cook & run
- add context menu for cook & run to toolstrip button
- add menu items for the above
- add editor option entries for saving user preferences for the above
 2023-06-28 02:02:10 -05:00
mafiesto4 a3e3ee396a Revert default value back to false as in #1179 2023-06-17 16:37:33 +02:00
mafiesto4 cd68f2463b Adjustment for #1179 to rebuild by default 2023-06-17 16:36:05 +02:00
Wiktor Kocielski 70470bc421 Make rebuilding database when adding asset proxy optional 2023-06-17 12:13:54 +03:00
mafiesto4 086e4c9835 Add content proxy modifications function and workspace rebuilding for custom asset types extensions 2023-06-15 09:51:26 +02:00
mafiesto4 14d12418b6 Add iOS and Apple icons 2023-06-12 14:34:31 +02:00
mafiesto4 22239bc2d1 Merge remote-tracking branch 'origin/master' into 1.6 2023-05-05 11:41:32 +02:00
mafiesto4 695b630e79 Merge branch 'delete-bug-fix' of https://github.com/Tryibion/FlaxEngine into Tryibion-delete-bug-fix 2023-05-05 11:26:09 +02:00
Tryibion 144287ba1c Add Unload all but this scene option to scene context menu to unload all of the active scenes except for the selected one. 2023-05-03 20:38:55 -05:00
Tryibion 1978cb6df9 Fix bug with not deleting all children on folder delete 2023-04-28 08:48:13 -05:00
mafiesto4 390460907d Merge remote-tracking branch 'origin/master' into 1.6 
# Conflicts:
#	Source/Editor/Scripting/CodeEditors/VisualStudioCodeEditor.cpp
#	Source/Tools/Flax.Build/Deps/Dependencies/OpenAL.cs
 2023-04-22 18:59:41 +02:00
Tryibion cdc8e4adb8 Take parent actor name as initial prefab name. 2023-04-17 13:34:25 -05:00
mafiesto4 67b373c6df Merge remote-tracking branch 'origin/master' into 1.6 2023-04-17 13:18:08 +02:00
Tryibion 4e5795ab91 Changed Cook&Run to Cook & Run. 2023-04-14 16:21:19 -05:00
mafiesto4 047eb2eddf Add iOS to Game Cooker platforms 2023-04-12 22:29:21 +02:00
mafiesto4 2475706df4 Merge remote-tracking branch 'origin/master' into 1.6 2023-04-04 18:08:25 +02:00
mafiesto4 6c8b5e5e8a Improve #970 by using OptionsChanged event 2023-04-04 17:40:05 +02:00