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

275 Commits

Author SHA1 Message Date
Wojciech Figat
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
Wojtek Figat
eff24ed836 Add support for editing path to the asset within AssetRefEditor 2023-01-15 23:05:58 +01:00
Wojtek Figat
a2af46845d Merge branch 'master' into 1.5 
# Conflicts:
#	Source/Engine/Renderer/AmbientOcclusionPass.cpp
 2023-01-15 18:27:49 +01:00
Wojtek Figat
ed3dd93a17 Merge branch 'auto-size-popup-position-change' of https://github.com/Tryibion/FlaxEngine into Tryibion-auto-size-popup-position-change 2023-01-15 13:34:07 +01:00
Wojtek Figat
50fb39d238 Merge remote-tracking branch 'origin/master' into 1.5 2023-01-15 12:44:45 +01:00
Chandler Cox
87e69ca564 Changed interface for script compliation error 2023-01-13 18:02:10 -06:00
Chandler Cox
38fc43cada Moved where the position movement is called for more snappy movement and increase movement amount to account for longer progress bar label text. 2023-01-13 10:09:49 -06:00
Wojciech Figat
26c7d3dadc Merge branch 'auto-save-popup' of https://github.com/Tryibion/FlaxEngine into Tryibion-auto-save-popup 2023-01-13 11:39:07 +01:00
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
d3cdca6b33 Merge remote-tracking branch 'origin/1.5' into dotnet7 2023-01-02 10:37:04 +01:00
Wojtek Figat
bc7bf72660 Fix case when child context menu is already hidden and changed to other from code 2023-01-01 21:42:35 +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
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
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
Chandler Cox
8c78493a51 Simplified auto save poprup and moved it to be on the status bar for better UX. 2022-12-27 10:08:08 -06: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
Ari Vuollet
e03a819176 Replace usage of Utils.ExtractArrayFromList with Span 2022-12-22 19:54:59 +02:00
Chandler Cox
c5e558172d Added auto save reminder popup with an option to change the reminder time. 2022-12-22 11:40:10 -06:00
Chandler Cox
96ec28c9a8 Cleaned up and used cross sprite. 2022-12-21 15:07:27 -06:00
Wojciech Figat
9a5c105db9 Merge branch '1.5' into dotnet7 2022-12-21 10:35:58 +01:00
Wojtek Figat
0dd79fe10a Fix sub-context menu child popup still being open when parent context menu gets focused again by the user 2022-12-20 21:11:41 +01:00
Wojtek Figat
a570d6d178 Refactor **Actor tags into hierarchical reusable Tags** system for better gameplay scripting 2022-12-20 21:11:38 +01:00
Chandler Cox
e725533ba7 Changed all search boxes to new class. 2022-12-15 21:18:49 -06:00
Chandler Cox
1c85b30e9f Change color of button on hover. 2022-12-15 20:53:47 -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
e5742772ae Add more features to GPU Memory profiler tab 2022-12-09 11:28:53 +01:00
Chandler Cox
1a3bcc5d27 Changed default to true. 2022-12-08 16:21:10 -06:00
Wojciech Figat
df82a0f5d0 Add **GPU Memory profiler** to Editor 2022-12-08 16:30:37 +01:00
Chandler Cox
eab775b9a2 Added RstoreTextFromStart function and changed the calls. Renamed bool. 2022-12-08 08:02:57 -06:00
Chandler Cox
9b82860154 Allows user to left click to end editing text and right click to change text back to its original and end editing. 2022-12-08 08:02:57 -06:00
Chandler Cox
4a9a01a89e Moved check and ops to also fix issue #683 2022-11-27 14:23:01 -06:00
Ari Vuollet
96dc279ebd Implement .NET 7 runtime support and bindings generation 2022-11-26 14:37:07 +02:00
Tryibion
8707d658f1 Added ability to drag maximized panels. 2022-11-25 15:14:04 -06:00
Wojtek Figat
f9cb2ece6e Merge branch 'rename-on-click' of https://github.com/Tryibion/FlaxEngine into Tryibion-rename-on-click 2022-11-24 21:55:21 +01:00
Chandler Cox
4f38a87eed Changed using screen coords to using window points. 2022-11-19 16:33:09 -06:00
Chandler Cox
6c18ca3f45 changed to MouseButtonDown 2022-11-11 12:45:10 -06:00
Chandler Cox
eab45f0c48 renames item when clicking off of the popup and name is changed 2022-11-11 12:42:12 -06:00
Wojtek Figat
b7b31aad8e Code style fix 
#793
 2022-10-23 23:49:46 +02:00
Wojtek Figat
2b514cc10e Merge branch 'CM-fix-open-left' of https://github.com/Tryibion/FlaxEngine into Tryibion-CM-fix-open-left 2022-10-23 23:48:49 +02:00
Wojtek Figat
6f380a6f12 Code style fix 
#783
 2022-10-23 23:46:11 +02:00
Wojtek Figat
0ec76d678d Merge branch 'value-box-cursor-change' of https://github.com/Tryibion/FlaxEngine into Tryibion-value-box-cursor-change 2022-10-23 23:45:13 +02:00
Chandler Cox
1c44c42b52 fixed position of child CMs when having to open left 2022-10-21 14:14:13 -05:00
Chandler Cox
b20967559b added to not close the child context menu on click 2022-10-20 19:49:36 -05:00
Chandler Cox
78bd7713a9 value boxes now hide your slide and return your mouse to the original position. 2022-10-19 21:41:58 -05:00
Cristhofer Marques
527ba719f4 update to the new variable names 2022-10-13 09:15:04 -03:00
Cristhofer Marques
0e45f16b19 update timeline edge to use the mouse flipping info 2022-10-13 01:14:47 -03:00
Cristhofer Marques
f22a71509b fix value box sliding 2022-10-13 01:12:38 -03:00
Wojtek Figat
ebd88a407d Fix mouse leave event handling to restore cursor 
#759
 2022-10-10 18:47:38 +02:00