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

385 Commits

Author SHA1 Message Date
mafiesto4 7b20bc38a4 Merge branch '1.5' into dotnet7 
# Conflicts:
#	Content/Shaders/GI/DDGI.flax
#	Content/Shaders/GI/GlobalSurfaceAtlas.flax
#	Content/Shaders/TAA.flax
#	Content/Shaders/VolumetricFog.flax
#	Source/Tools/Flax.Build/Projects/VisualStudio/VCProjectGenerator.cs
 2023-01-17 11:52:52 +01:00
mafiesto4 5babe8df3f Add refreshing actively opened Layers And Tags asset editor when adding tags from popup 
#885
 2023-01-16 12:11:04 +01:00
mafiesto4 eff24ed836 Add support for editing path to the asset within AssetRefEditor 2023-01-15 23:05:58 +01:00
mafiesto4 a2af46845d Merge branch 'master' into 1.5 
# Conflicts:
#	Source/Engine/Renderer/AmbientOcclusionPass.cpp
 2023-01-15 18:27:49 +01:00
mafiesto4 e40cdc8a7f Codestyle cleanup and minor tweaks #879 2023-01-15 14:08:00 +01:00
mafiesto4 50100a74bb Merge branch 'custom-game-sizing' of https://github.com/Tryibion/FlaxEngine into Tryibion-custom-game-sizing 2023-01-15 13:48:50 +01:00
mafiesto4 eebc4951de Merge branch '1.5' into dotnet7 
# Conflicts:
#	Source/Platforms/DotNet/NUnit/agents/net40/nunit-agent.exe
#	Source/Platforms/DotNet/NUnit/agents/net40/nunit.engine.api.dll
#	Source/Platforms/DotNet/NUnit/agents/net40/nunit.engine.core.dll
#	Source/Platforms/DotNet/NUnit/agents/net7.0/nunit.agent.addins
#	Source/Platforms/DotNet/NUnit/nunit.engine.api.dll
#	Source/Platforms/DotNet/NUnit/nunit.engine.core.dll
#	Source/Platforms/DotNet/NUnit/nunit.engine.dll
#	Source/Platforms/DotNet/NUnit/nunit3-console.exe
#	Source/Platforms/DotNet/NUnit/nunit3-console.exe.config
#	Source/Platforms/DotNet/NUnit/testcentric.engine.metadata.dll
#	Source/Tools/Flax.Build/Deps/Downloader.cs
#	Source/Tools/Flax.Stats/CodeFrame.cs
#	Source/Tools/Flax.Stats/CodeFrameNode.cs
#	Source/Tools/Flax.Stats/Flax.Stats.Build.cs
#	Source/Tools/Flax.Stats/Languages.cs
#	Source/Tools/Flax.Stats/Program.cs
#	Source/Tools/Flax.Stats/TaskType.cs
#	Source/Tools/Flax.Stats/Tools.cs
#	Source/Tools/FlaxEngine.Tests/TestEditorUtils.cs
 2023-01-10 15:49:44 +01:00
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 a6050e6f27 Add managed memory allocations profiling with dotnet7 2023-01-06 09:18:11 +01:00
mafiesto4 d3cdca6b33 Merge remote-tracking branch 'origin/1.5' into dotnet7 2023-01-02 10:37:04 +01:00
mafiesto4 59568fb5c8 Minor editor tweaks 2023-01-01 23:17:23 +01:00
mafiesto4 af7b53814d Merge remote-tracking branch 'origin/1.5' into dotnet7 
# Conflicts:
#	Content/Shaders/GI/DDGI.flax
#	Content/Shaders/TAA.flax
 2022-12-30 09:24:10 +01:00
mafiesto4 7184566b4b Merge branch 'master' into 1.5 2022-12-29 23:04:18 +01:00
Tryibion 79562dc502 Renamed some variables to more match what they do/are. 2022-12-29 12:14:26 -06:00
Tryibion 0633ed6819 Small cleanup 2022-12-29 00:47:30 -06:00
Tryibion 6c3864983f small cleanup 2022-12-29 00:45:58 -06:00
Tryibion dc6f6e2b93 Clean up 2022-12-29 00:32:57 -06:00
Tryibion 63343d4224 2nd pass on viewport sizing CM. Added add menu and apply and delete. 2022-12-29 00:31:19 -06:00
Tryibion ca07c18b93 Fist pass on game viewport resizing menu 2022-12-28 15:53:17 -06:00
Tryibion b225b5a6e6 Simplified setting bounds 2022-12-28 15:53:17 -06:00
Tryibion 45564c940f Moved function 2022-12-28 15:53:17 -06:00
Tryibion 69d391d985 changed default 2022-12-28 15:53:16 -06:00
Tryibion c38da8cabf Added resizing to the game viewport. 2022-12-28 15:53:16 -06: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 c48a81a068 Merge branch '1.5' into dotnet7 
# Conflicts:
#	Source/Editor/Managed/ManagedEditor.Internal.cpp
#	Source/Engine/Core/Config/LayersAndTagsSettings.cs
 2022-12-28 18:49:14 +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
mafiesto4 3e8e839cd1 Refactor Editor Windows layout serialization of splitter values to prevent invalid state when loading windows 2022-12-27 13:54:53 +01:00
Tryibion fc0befd773 Fixed some CM buttons that shouldnt close when clicked. 2022-12-23 11:08:14 -06:00
GoaLitiuM e03a819176 Replace usage of Utils.ExtractArrayFromList with Span 2022-12-22 19:54:59 +02:00
Tryibion 1a11238808 Added name as author 2022-12-21 13:47:38 -06:00
mafiesto4 9a5c105db9 Merge branch '1.5' into dotnet7 2022-12-21 10:35:58 +01:00
mafiesto4 eae38fa0c6 Merge branch 'dotnet7' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-dotnet7 2022-12-19 10:10:34 +01:00
mafiesto4 93f0b0e2e8 Fix type usage 2022-12-19 10:10:26 +01:00
GoaLitiuM 551c58db4f Fix incorrect array marshalling in few Editor methods 2022-12-17 15:38:55 +02: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