Flax/FlaxEngine
3
0
Fork 0
Code Issues Pull Requests Releases Activity
9,153 Commits 15 Branches 23 Tags
d0ec3fa2e2bf64a35fb9fa6c75bcc820cfdde400
Commit Graph

766 Commits

Author SHA1 Message Date
Tryibion 1a2eb48705 Added updating the main menu shortcut keys on editor options saved. Also adds an action that can be used to update plugin short keys if needed. 2023-03-16 20:54:56 -05:00
mafiesto4 74758f5380 Merge remote-tracking branch 'origin/master' into 1.6 
# Conflicts:
#	Source/Tools/Flax.Build/Build/Builder.Projects.cs
#	Source/Tools/Flax.Build/Build/Plugins/NetworkingPlugin.cs
 2023-03-14 11:52:41 +01:00
mafiesto4 086c2f155d Fix error when using nested Visject Surface context during State Machines editing in Anim Graph 2023-03-13 15:39:36 +01:00
mafiesto4 34629d46f3 Add **Physics Statistics and profiler** 2023-03-13 12:31:51 +01:00
mafiesto4 c60b2cb4d7 Merge commit '0112f70c05ddfb9c91dacb0829594ab2f285c248' into dotnet7 2023-03-12 11:04:17 +01:00
mafiesto4 2c70b74814 Refactor widowing on macOS to support screen scale and highDpi mode 2023-03-12 10:58:55 +01:00
mafiesto4 a7c5397641 Fix content window auto scrolling regression 
656fcf9847
 2023-03-01 22:47:52 +01:00
mafiesto4 0112f70c05 Merge remote-tracking branch 'origin/master' into dotnet7 2023-03-01 19:50:22 +01:00
mafiesto4 12b330e4ec Add support for building Android app on Linux or Mac 2023-02-28 15:49:34 +01:00
mafiesto4 30fa911832 Merge remote-tracking branch 'origin/master' into dotnet7 
# Conflicts:
#	README.md
 2023-02-16 09:54:22 +01:00
mafiesto4 0031d9174d Fix scroll on selection change 2023-02-13 22:10:45 +01:00
mafiesto4 8184d513e3 Fix performance when using scene search field 2023-02-13 20:04:35 +01:00
mafiesto4 ac59cc4633 Merge remote-tracking branch 'origin/master' into dotnet7 2023-02-13 10:05:51 +01:00
mafiesto4 82823d6945 Various improvements and fixes 2023-02-09 20:05:46 +01:00
mafiesto4 73ac1c5d43 Merge branch 'scale-lock' of https://github.com/Tryibion/FlaxEngine into Tryibion-scale-lock 2023-02-09 09:42:16 +01:00
mafiesto4 d09dfd1f61 Add **Canvas Scaler** control for resolution-independent UI 
#448 #525
 2023-02-08 19:51:16 +01:00
mafiesto4 0270772463 Merge remote-tracking branch 'origin/master' into dotnet7 2023-02-06 10:02:13 +01:00
Tryibion d5d5fb698f Small name changes 2023-02-05 20:17:21 -06:00
Tryibion e4afc49ac6 Added saving the users choice in the properties window and adding link and unlink to the scale context menu. 2023-02-05 15:07:12 -06:00
Tryibion 03f299bc3b Added apply across actors. 2023-02-04 22:20:18 -06:00
mafiesto4 a0c6add732 Add ViewFlags::Sky for conditional sky/skybox rendering 2023-01-31 15:58:02 +01:00
mafiesto4 e779c3ca17 Merge commit '997baa3b774ac4dea739e15a55070519b0863afc' into dotnet7 2023-01-25 20:13:34 +01:00
mafiesto4 29815e0dd6 Merge branch 'actor-org' of https://github.com/Tryibion/FlaxEngine into Tryibion-actor-org 2023-01-24 19:20:23 +01:00
mafiesto4 38fcfee9a4 Merge branch '1.5' into dotnet7 2023-01-23 14:47:12 +01:00
Tryibion ff3277edc7 Change CM attributes to not check inhereted class. 2023-01-22 21:33:08 -06:00
Tryibion e21c8e5fe9 Organize physics actors a little better in CM, added wheeled vehicle to list. minor change in CM to not add actors that have a parent with the attribute (more selective). 2023-01-22 18:52:28 -06:00
mafiesto4 31e27e84a9 Minor fix 2023-01-20 11:48:53 +01:00
Tryibion f110926288 Moved into function in Asset Window. 2023-01-19 16:10:17 -06:00
mafiesto4 eaa63e679e Fix selected UI control outline when using custom Game viewport aspect 
#897
 2023-01-18 15:36:42 +01:00
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
GoaLitiuM ee5a7cf1ef Update authors 2023-01-16 18:14:17 +02: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