GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,941 Commits 14 Branches 0 Tags
5e85fa2c0c38d2829ec68f55dcafe1b830bda01a
Commit Graph

326 Commits

Author SHA1 Message Date
Wojtek Figat
698a9f1938 Add **Interruption options** to State Machine transition 2023-04-25 10:47:10 +02:00
Chandler Cox
5178caeda6 Add inputs to Random Range visject float nodes 2023-04-24 17:27:43 -05:00
Wojtek Figat
7158cfb5bf Add **Any State to Anim Graph state machines** 2023-04-24 20:20:27 +02:00
Chandler Cox
0b3259fcc3 Increase size of add node so that vector3 fits correctly 2023-04-24 11:02:44 -05:00
Wojtek Figat
390460907d Merge remote-tracking branch 'origin/master' into 1.6 
# Conflicts:
#	Source/Editor/Scripting/CodeEditors/VisualStudioCodeEditor.cpp
#	Source/Tools/Flax.Build/Deps/Dependencies/OpenAL.cs
 2023-04-22 18:59:41 +02:00
Wojtek Figat
1b278f5c56 Update Mathf.Map usage to Mathf.Remap 
#1008
 2023-04-19 13:11:52 +02:00
Wojtek Figat
91c017713c Merge remote-tracking branch 'origin/master' into 1.6 2023-04-13 12:12:33 +02:00
Wojtek Figat
01ced1cacd Fix Visject CM item search highlight placement and center CM title text 
#983
 2023-04-13 10:59:19 +02:00
Wojtek Figat
09ebd7462a Merge branch 'visjectCM-visual' of https://github.com/Tryibion/FlaxEngine into Tryibion-visjectCM-visual 2023-04-13 10:48:32 +02:00
Wojtek Figat
9e5a48af4b Fix bug when using material instance of material that uses GlobalSDF 2023-04-12 16:59:59 +02:00
Wojtek Figat
abf68328e6 Fix bug when using material instance of material that uses GlobalSDF 2023-04-12 16:59:03 +02:00
Chandler Cox
7b3152885d Remove animation time. 2023-04-08 19:01:55 -05:00
Chandler Cox
a82856176e Small fixes 2023-04-08 08:54:06 -05:00
Chandler Cox
4e3d5ad11c First pass on visject CM visual changes 2023-04-07 23:17:57 -05:00
Wojtek Figat
2475706df4 Merge remote-tracking branch 'origin/master' into 1.6 2023-04-04 18:08:25 +02:00
Wojtek Figat
12f4dc74d2 Optimize default C# stdlib references to prevent using jit-ed features in a game assembly 2023-04-01 23:34:05 +02:00
Wojtek Figat
4755c42d70 Fix .NET generic class typename to match old mono style without inlined assembly name and ver 2023-03-27 17:30:48 +02:00
Chandler Cox
98ebbf8b99 Fix double color change on animation state machine states 2023-03-16 21:03:36 -05:00
Wojtek Figat
0ba261d338 Add iOS platform (refactor Mac into shared Apple platform impl) 2023-03-15 20:58:23 +01:00
Wojtek Figat
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
Wojtek Figat
39c3b760ac Merge branch 'blend-with-mask-fix' of https://github.com/Tryibion/FlaxEngine into Tryibion-blend-with-mask-fix 2023-03-14 09:39:42 +01:00
Wojtek Figat
55a439645c Merge branch 'better-looking-states' of https://github.com/Tryibion/FlaxEngine into Tryibion-better-looking-states 2023-03-14 09:35:21 +01:00
Wojtek Figat
086c2f155d Fix error when using nested Visject Surface context during State Machines editing in Anim Graph 2023-03-13 15:39:36 +01:00
Chandler Cox
57014851a7 Fix visuals of the Blend with Mask node 2023-03-03 16:46:22 -06:00
Chandler Cox
38c027704e Better looking state machine states. 2023-03-03 12:31:13 -06:00
Wojtek Figat
30fa911832 Merge remote-tracking branch 'origin/master' into dotnet7 
# Conflicts:
#	README.md
 2023-02-16 09:54:22 +01:00
Wojtek Figat
835127ac21 Add **Animation Instance Data node to Anim Graph** for caching value per-model 2023-02-14 12:39:58 +01:00
Wojtek Figat
0709288eac Revert Depth Offset (wrong impl, can be done later) 2023-01-31 14:22:37 +01:00
Wojtek Figat
a219a3d2eb Add **Depth Offset to materials** 2023-01-29 22:09:51 +01:00
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
50fb39d238 Merge remote-tracking branch 'origin/master' into 1.5 2023-01-15 12:44:45 +01:00
Wojciech Figat
8e354cc36e Merge branch 'visject-cm-search-fix' of https://github.com/Tryibion/FlaxEngine into Tryibion-visject-cm-search-fix 2023-01-13 12:01:20 +01:00
Wojciech Figat
986fa13585 Reuse texture sampling code for procedural sampling node #872 2023-01-13 11:37:53 +01:00
Wojciech Figat
2d44ae3a4d Merge branch 'stochastic-sampling-node' of https://github.com/Swiggies/FlaxEngine into Swiggies-stochastic-sampling-node 2023-01-13 10:40:16 +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
Chandler Cox
0cd562c528 Fix in visject cm sometimes not populating all options once search box is cleared. 2023-01-08 16:04:55 -06:00
Wojciech Figat
d3cdca6b33 Merge remote-tracking branch 'origin/1.5' into dotnet7 2023-01-02 10:37:04 +01:00
Wojciech Figat
9acb597d5d Adjust scripting types visibility in editor 2023-01-02 10:36:24 +01:00
Wojtek Figat
9554636971 Add bigger input value boxes to Visject Surface 2023-01-01 18:30:15 +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
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
Olly Rybak
9099197a88 Added ability to change sample method 2022-12-27 22:26:01 +11:00
Olly Rybak
a2f52edd47 Updated description & comments 2022-12-26 20:44:53 +11:00
Olly Rybak
5022e05c25 Added Stochastic Sampling material node 2022-12-23 21:04:13 +11:00
Wojciech Figat
9a5c105db9 Merge branch '1.5' into dotnet7 2022-12-21 10:35:58 +01:00
Chandler Cox
e725533ba7 Changed all search boxes to new class. 2022-12-15 21:18:49 -06:00
Wojciech Figat
516e3fbc65 Fix Visject surface input box color for missing connection type but with type hint 2022-12-12 12:17:30 +01:00