Flax/FlaxEngine
3
0
Fork 0
Code Issues Pull Requests Releases Activity
4,184 Commits 15 Branches 23 Tags
93c0dd704e5ceec04656cf3fea15eae13ddefb44
Commit Graph

310 Commits

Author SHA1 Message Date
mafiesto4 93c0dd704e Merge branch 'master' into 1.5 
# Conflicts:
#	Source/Engine/Serialization/Stream.cpp
 2022-11-21 15:51:57 +01:00
mafiesto4 e98621b887 Code style fix 
#814
 2022-11-06 23:05:36 +01:00
mafiesto4 735b07f0d7 Merge branch 'actor-CM' of https://github.com/Tryibion/FlaxEngine into Tryibion-actor-CM 2022-11-06 22:22:45 +01:00
mafiesto4 ac89b395af Merge branch 'prefab-tree-fix' of https://github.com/Tryibion/FlaxEngine into Tryibion-prefab-tree-fix 2022-11-06 22:05:22 +01:00
Tryibion 1af0188a3c changed how actor context menus are created. 2022-10-31 19:18:43 -05:00
mafiesto4 77b98f7081 Add Layer and StaticFlags from parent actor after spawnign actor in Prefab Window 2022-10-31 12:21:02 +01:00
mafiesto4 00be6ffb89 Merge branch 'master' into 1.5 2022-10-29 20:45:51 +02:00
mafiesto4 e1836a222c Fix bug with Screen.CursorVisible set in script OnStart 
#799
 2022-10-29 19:33:34 +02:00
Tryibion 50414d7fed added deselecting nodes when left clicking in blank area in the scene and prefab tree views 2022-10-29 09:22:39 -05:00
Tryibion 40a04bc5d6 Various fixes to prefab tree view. Scrolling like scene view, disable scrolling on renaming, can open CM anywhere in tree panel. 2022-10-29 09:14:08 -05:00
mafiesto4 437ed07368 Merge remote-tracking branch 'origin/master' into 1.5 2022-10-24 12:07:39 +02:00
mafiesto4 5341e355ce Code style fix 
#782
 2022-10-23 20:14:58 +02:00
mafiesto4 de012a23ee Merge branch 'move-updatecamerapreview' of https://github.com/Tryibion/FlaxEngine into Tryibion-move-updatecamerapreview 2022-10-23 19:15:46 +02:00
mafiesto4 70c53a4f67 Fix error if nothing is selected 2022-10-23 14:19:17 +02:00
Tryibion 5d8403be5b moved UpdateCameraPreview call to on selection changed and on state change 2022-10-19 20:59:55 -05:00
mafiesto4 e115aa2c4e Merge remote-tracking branch 'origin/master' into 1.5 
# Conflicts:
#	Source/Engine/Content/JsonAsset.cpp
 2022-10-19 13:36:46 +02:00
Tryibion ef34ad7600 Renamed scrollPosition to scrollControl for more accurate description 2022-10-16 19:05:41 -05:00
Tryibion 546501a553 Added performing layout when deleting actors and scrolling to duplicated/ pasted actors when action is performed. 2022-10-16 18:50:00 -05:00
mafiesto4 f528ba59ec Code style fix 
#766
 2022-10-12 19:04:22 +02:00
mafiesto4 6985bd6375 Merge branch 'skeleton_mask_editor' of https://github.com/cristhofermarques/FlaxEngine into cristhofermarques-skeleton_mask_editor 2022-10-12 19:00:59 +02:00
mafiesto4 b0f4f8d636 Code style fix 2022-10-12 18:55:24 +02:00
Cristhofer Marques 0b8a176ff8 Revert "Update SkeletonMaskWindow.cs" 
This reverts commit b626d3047d.
 2022-10-11 14:05:30 -03:00
Cristhofer Marques b626d3047d Update SkeletonMaskWindow.cs 2022-10-11 13:08:52 -03:00
Cristhofer Marques 2af285e972 feature added 2022-10-11 11:49:32 -03:00
Tryibion 95e60ea68e Added scene panel to seperate the tree from the search bar and made the tree not able to scroll when renaming 2022-10-10 15:38:30 -05:00
Tryibion 020351e56b Simplified enabling and disabling scrolling and implimented the stop scrolling functionality when renaming in the content tree panel as well 2022-10-06 00:03:38 -05:00
Tryibion 656fcf9847 Changed the content window do the search bars do not scroll with the content. 2022-09-30 09:22:36 -05:00
mafiesto4 10d66fb871 Fix displaying Game and Editor plugins to be batched in Editor 2022-09-12 14:48:52 +02:00
mafiesto4 74ce1028ae Fix displaying Game and Editor plugins to be batched in Editor 2022-09-09 15:29:55 +02:00
mafiesto4 9a77517cb4 Add Cook&Run and Run cooked game utilities to Game menu list for multilayer games testing 2022-09-07 11:52:11 +02:00
mafiesto4 69a2d10c57 Add additive scene opening in Editor via drag&drop into Scene Tree window 2022-08-25 20:58:30 +02:00
mafiesto4 20ebe3ac85 Fix game ticking in editor during cut-scene rendering at edit time 2022-08-25 19:42:00 +02:00
mafiesto4 a545520d6b Add playback speed option for Scene Animation rendering 2022-08-25 19:41:59 +02:00
mafiesto4 698545006f Add auto-selecting new item created in Content window 2022-08-18 15:21:32 +02:00
mafiesto4 7953f6cb83 Add Engine.FocusGameViewport to implement game menu with camera focus gather 2022-08-01 16:17:34 +02:00
mafiesto4 1d7e88635f Allow content finder in game window during edit time 2022-08-01 11:38:41 +02:00
mafiesto4 3b52914416 Add **Nested Animations** for compositing animation clips 2022-07-31 15:53:09 +02:00
mafiesto4 bdb69d57dd Refactor Plugins system to support plugins in C++ scripts 2022-07-28 21:05:03 +02:00
mafiesto4 6f35b27c29 Fix fullscreen game window F22 regression 2022-07-27 22:13:23 +02:00
mafiesto4 bfec5d6a8d Improve displaying tris/vert count in GPU profiler if value is large 2022-07-27 16:24:49 +02:00
mafiesto4 e4079f011d Improve initial name for static model collision data asset 2022-07-22 10:20:13 +02:00
mafiesto4 1019550d4a Change search boxes in Editor to stick to the top of the panel 2022-07-19 15:37:10 +02:00
mafiesto4 9f7f764359 Format code 2022-07-18 22:38:01 +02:00
mafiesto4 25790bd0c9 Fix selecting Debug Log window entries with left-mouse button 2022-07-17 17:06:26 +02:00
mafiesto4 7f3a32a69b Improve cursor clipping logic (fix after alt+tab and confine to game window in Editor) 
#691
 2022-07-17 00:09:59 +02:00
mafiesto4 0d8ebd332e Add Global Illumination sampling option to transparent materials (eg. particles) 2022-07-14 14:28:42 +02:00
mafiesto4 85f351663b Add Transparent Lighting Modes for material with option to use non-directional shading 2022-07-14 09:22:32 +02:00
mafiesto4 89688f93e1 Add GPU Dispatch calls in GPU profiler draw calls collumn 2022-07-13 21:45:43 +02:00
mafiesto4 f221bc6361 Minor improvements 2022-07-07 15:34:15 +02:00
mafiesto4 02dbd07506 Add utility buttons to check/uncheck all Material Instance parameters overrides in Editor window 2022-07-06 09:29:25 +02:00