GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity
4,610 Commits 14 Branches 0 Tags
eebc4951dec1015e608b62a050b07db7dff00ea8
Commit Graph

369 Commits

Author SHA1 Message Date
Wojciech Figat
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
Wojciech Figat
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
Wojciech Figat
9626e9bbb6 Update copyright year 2023-01-10 15:29:37 +01:00
Wojciech Figat
a6050e6f27 Add managed memory allocations profiling with dotnet7 2023-01-06 09:18:11 +01:00
Wojciech Figat
d3cdca6b33 Merge remote-tracking branch 'origin/1.5' into dotnet7 2023-01-02 10:37:04 +01:00
Wojtek Figat
59568fb5c8 Minor editor tweaks 2023-01-01 23:17:23 +01:00
Wojciech Figat
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
Wojtek Figat
7184566b4b Merge branch 'master' into 1.5 2022-12-29 23:04:18 +01:00
Chandler Cox
4eb2ac854e Fixed more CMs that shouldnt close 2022-12-28 13:00:58 -06:00
Wojtek Figat
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
Wojtek Figat
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
Wojtek Figat
6e403abf75 Merge branch 'patch-1' of https://github.com/Withaust/FlaxEngine into Withaust-patch-1 2022-12-28 17:27:32 +01:00
Wojtek Figat
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
Wojtek Figat
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
Wojtek Figat
3fdbfab98b Merge branch 'add-author' of https://github.com/Tryibion/FlaxEngine into Tryibion-add-author 2022-12-27 20:00:15 +01:00
Wojciech Figat
3e8e839cd1 Refactor Editor Windows layout serialization of splitter values to prevent invalid state when loading windows 2022-12-27 13:54:53 +01:00
Chandler Cox
fc0befd773 Fixed some CM buttons that shouldnt close when clicked. 2022-12-23 11:08:14 -06:00
Ari Vuollet
e03a819176 Replace usage of Utils.ExtractArrayFromList with Span 2022-12-22 19:54:59 +02:00
Chandler Cox
1a11238808 Added name as author 2022-12-21 13:47:38 -06:00
Wojciech Figat
9a5c105db9 Merge branch '1.5' into dotnet7 2022-12-21 10:35:58 +01:00
Wojciech Figat
eae38fa0c6 Merge branch 'dotnet7' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-dotnet7 2022-12-19 10:10:34 +01:00
Wojciech Figat
93f0b0e2e8 Fix type usage 2022-12-19 10:10:26 +01:00
Ari Vuollet
551c58db4f Fix incorrect array marshalling in few Editor methods 2022-12-17 15:38:55 +02:00
Chandler Cox
e725533ba7 Changed all search boxes to new class. 2022-12-15 21:18:49 -06:00
Chandler Cox
1b919b9fae Created new SearchBox class with button to clear the search. 2022-12-15 20:45:51 -06:00
Wojciech Figat
c17477abff Add RenderingUpscaleLocation for customizing upscaler location in render pipeline 2022-12-13 11:52:52 +01:00
Chandler Cox
7eab3fe5b3 Added back sorting sub project directories. 2022-12-12 18:18:48 -06:00
Chandler Cox
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
Wojciech Figat
359e7d68d4 Add simplified collider for in-built primitive meshes 2022-12-12 11:22:15 +01:00
Wojciech Figat
ed700cb070 Add **Assets profiler** to Editor 2022-12-09 15:46:01 +01:00
Wojciech Figat
e5742772ae Add more features to GPU Memory profiler tab 2022-12-09 11:28:53 +01:00
Wojciech Figat
9c2104391b Add profile events to editor profiler window 2022-12-08 16:30:51 +01:00
Wojciech Figat
df82a0f5d0 Add **GPU Memory profiler** to Editor 2022-12-08 16:30:37 +01:00
Wojciech Figat
3017010ef4 Minor adjustments to the profiling tools code 2022-12-07 15:27:40 +01:00
Wojtek Figat
a0a087fc91 Mark UWP platform as deprecated 2022-12-03 13:21:06 +01:00
Wojtek Figat
b85d58db85 Mark UWP platform as deprecated 2022-12-03 13:17:24 +01:00
Wojciech Figat
7486bc640f Add network profiler tab with network driver data sent/received 2022-11-30 22:05:58 +01:00
Wojtek Figat
f5ed9292e7 Merge branch 'master' into 1.5 2022-11-29 23:19:01 +01:00
Wojtek Figat
7cfde78198 Code style fix 2022-11-27 21:05:20 +01:00
Wojtek Figat
8e52e2fb10 Merge branch 'master' into 1.5 2022-11-27 12:11:50 +01:00
Ari Vuollet
96dc279ebd Implement .NET 7 runtime support and bindings generation 2022-11-26 14:37:07 +02:00
Ruan Lucas
66ce8abe01 Adds side mouse button shortcuts to the Content window 2022-11-24 23:58:24 -04:00
Wojtek Figat
76c1045444 Code cleanup after #823 2022-11-23 19:18:30 +01:00
Wojtek Figat
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
Wojtek Figat
2ad6eb0c72 Merge branch 'master' into 1.5 2022-11-22 19:58:53 +01:00
Wojtek Figat
5a6f6d97a7 Minor code adjustments 
#810
 2022-11-21 18:55:33 +01:00
Wojtek Figat
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
Wojtek Figat
93c0dd704e Merge branch 'master' into 1.5 
# Conflicts:
#	Source/Engine/Serialization/Stream.cpp
 2022-11-21 15:51:57 +01:00
Chandler Cox
6c26cbe9ba Removed adding inherited types 2022-11-11 17:11:25 -06:00