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

357 Commits

Author SHA1 Message Date
mafiesto4 a7e428a21c Merge branch 'master' into 1.5 
# Conflicts:
#	Content/Shaders/GI/DDGI.flax
#	Content/Shaders/GI/GlobalSurfaceAtlas.flax
#	Content/Shaders/TAA.flax
#	Content/Shaders/VolumetricFog.flax
#	Source/Editor/CustomEditors/Editors/ActorTagEditor.cs
#	Source/Engine/Core/Config/GraphicsSettings.cpp
#	Source/Engine/Engine/PostProcessEffect.cs
#	Source/Engine/Graphics/GPUResourcesCollection.cpp
#	Source/Engine/Graphics/GPUResourcesCollection.h
#	Source/Engine/Graphics/PostProcessBase.h
#	Source/FlaxEngine.Gen.cs
 2023-01-10 15:37:55 +01:00
mafiesto4 9626e9bbb6 Update copyright year 2023-01-10 15:29:37 +01:00
mafiesto4 59568fb5c8 Minor editor tweaks 2023-01-01 23:17:23 +01:00
mafiesto4 7184566b4b Merge branch 'master' into 1.5 2022-12-29 23:04:18 +01:00
Tryibion 4eb2ac854e Fixed more CMs that shouldnt close 2022-12-28 13:00:58 -06:00
mafiesto4 c35a267cd3 Merge branch 'CM-closing-fix' of https://github.com/Tryibion/FlaxEngine into Tryibion-CM-closing-fix 2022-12-28 19:22:50 +01:00
mafiesto4 6e403abf75 Merge branch 'patch-1' of https://github.com/Withaust/FlaxEngine into Withaust-patch-1 2022-12-28 17:27:32 +01:00
mafiesto4 8762e8ad15 Merge branch 'master' into 1.5 
# Conflicts:
#	Content/Shaders/GI/DDGI.flax
#	Content/Shaders/GI/GlobalSurfaceAtlas.flax
#	Content/Shaders/TAA.flax
#	Content/Shaders/VolumetricFog.flax
#	Source/Editor/Utilities/Utils.cs
 2022-12-28 16:59:11 +01:00
Wiktor Kocielski 163abb107c GPUResource Name property glu e generation fix 
This fixes the issue when compiling the editor in the `Release`
 2022-12-28 16:23:54 +03:00
mafiesto4 85f7d81ce4 Merge branch 'cancel-search-button' of https://github.com/Tryibion/FlaxEngine into Tryibion-cancel-search-button 2022-12-27 21:53:47 +01:00
mafiesto4 3fdbfab98b Merge branch 'add-author' of https://github.com/Tryibion/FlaxEngine into Tryibion-add-author 2022-12-27 20:00:15 +01:00
Tryibion fc0befd773 Fixed some CM buttons that shouldnt close when clicked. 2022-12-23 11:08:14 -06:00
Tryibion 1a11238808 Added name as author 2022-12-21 13:47:38 -06:00
Tryibion e725533ba7 Changed all search boxes to new class. 2022-12-15 21:18:49 -06:00
Tryibion 1b919b9fae Created new SearchBox class with button to clear the search. 2022-12-15 20:45:51 -06:00
mafiesto4 c17477abff Add RenderingUpscaleLocation for customizing upscaler location in render pipeline 2022-12-13 11:52:52 +01:00
Tryibion 7eab3fe5b3 Added back sorting sub project directories. 2022-12-12 18:18:48 -06:00
Tryibion 8d9e3ded74 Remove sorting children in convtent view treeand make it so the game is on top, plugins in the middle, and engine at the bottom of the tree. This is for better UX. 2022-12-12 16:55:12 -06:00
mafiesto4 359e7d68d4 Add simplified collider for in-built primitive meshes 2022-12-12 11:22:15 +01:00
mafiesto4 ed700cb070 Add **Assets profiler** to Editor 2022-12-09 15:46:01 +01:00
mafiesto4 e5742772ae Add more features to GPU Memory profiler tab 2022-12-09 11:28:53 +01:00
mafiesto4 9c2104391b Add profile events to editor profiler window 2022-12-08 16:30:51 +01:00
mafiesto4 df82a0f5d0 Add **GPU Memory profiler** to Editor 2022-12-08 16:30:37 +01:00
mafiesto4 3017010ef4 Minor adjustments to the profiling tools code 2022-12-07 15:27:40 +01:00
mafiesto4 a0a087fc91 Mark UWP platform as deprecated 2022-12-03 13:21:06 +01:00
mafiesto4 b85d58db85 Mark UWP platform as deprecated 2022-12-03 13:17:24 +01:00
mafiesto4 7486bc640f Add network profiler tab with network driver data sent/received 2022-11-30 22:05:58 +01:00
mafiesto4 f5ed9292e7 Merge branch 'master' into 1.5 2022-11-29 23:19:01 +01:00
mafiesto4 7cfde78198 Code style fix 2022-11-27 21:05:20 +01:00
mafiesto4 8e52e2fb10 Merge branch 'master' into 1.5 2022-11-27 12:11:50 +01:00
Ruan Lucas 66ce8abe01 Adds side mouse button shortcuts to the Content window 2022-11-24 23:58:24 -04:00
mafiesto4 76c1045444 Code cleanup after #823 2022-11-23 19:18:30 +01:00
mafiesto4 b581bf7bac Merge branch 'Better-Actor-Toolbox' of https://github.com/Tryibion/FlaxEngine into Tryibion-Better-Actor-Toolbox 2022-11-23 19:02:26 +01:00
mafiesto4 2ad6eb0c72 Merge branch 'master' into 1.5 2022-11-22 19:58:53 +01:00
mafiesto4 5a6f6d97a7 Minor code adjustments 
#810
 2022-11-21 18:55:33 +01:00
mafiesto4 af244718be Merge branch 'organized-content-new-cm' of https://github.com/Tryibion/FlaxEngine into Tryibion-organized-content-new-cm 2022-11-21 16:15:04 +01:00
mafiesto4 93c0dd704e Merge branch 'master' into 1.5 
# Conflicts:
#	Source/Engine/Serialization/Stream.cpp
 2022-11-21 15:51:57 +01:00
Tryibion 6c26cbe9ba Removed adding inherited types 2022-11-11 17:11:25 -06:00
Tryibion 6b4da88ef0 Added the ability to specify the name of the actor in the toolbox, works in searching as well. 2022-11-11 17:03:04 -06:00
Tryibion 62cd59549d removed some old code 2022-11-11 16:38:34 -06:00
Tryibion 4515844219 changed how the actor toolbox is created. Allows fo user to enter their own tabs and actors with an attribute 2022-11-11 16:37:45 -06: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 de4d3d97f2 removed not needed variable 2022-11-04 07:10:24 -05:00
Tryibion 2dca30305f added shader source and removed unused variables/includes 2022-11-03 08:12:40 -05:00
Tryibion 7487b468d3 added extra checks 2022-11-02 18:37:11 -05:00
Tryibion a1e4400994 changed to use attribute to add items to the content context menu, this also allows users to add their own items to the CM 2022-11-02 17:57:40 -05: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