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

41 Commits

Author SHA1 Message Date
Wojtek Figat
86d1d29820 Fix deadlock regression from fd679f0af5 when applying Game Settings itself 2023-10-05 10:13:49 +02:00
Wojtek Figat
fd679f0af5 Add automatic game settings apply when saving json file in Editor 
#1440
 2023-10-04 23:11:38 +02:00
Wojtek Figat
534d2388f5 Fix crash when removing json instance for scene asset that is different 2023-06-12 17:07:24 +02: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
dadb9207b9 Fix Json asset cooking to properly serialize whole asset data even if modified at runtime 2023-03-13 16:00:27 +01:00
Wojtek Figat
0cf40729fa Merge remote-tracking branch 'origin/master' into dotnet7 2023-02-19 15:04:02 +01:00
Wojtek Figat
7dc83b5472 Fix compilation warning 2023-02-16 22:59:31 +01:00
Wojtek Figat
969053a240 Add JsonAsset.Save to fix saving new tag 
#885
 2023-02-16 14:32:52 +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
e48b642101 Minor code cleanup 2023-01-02 10:36:57 +01:00
Wojciech Figat
d4601ecb44 Add memory usage query for various asset types 2022-12-09 15:48:43 +01:00
Wojtek Figat
0e523204d5 Fix custom json asset usage for game settings if loaded before game scripting module is loaded 2022-09-14 21:13:58 +02:00
Wojciech Figat
66b452e90c Fix crash on shutdown due to custom JsonAsset C++ instance 2022-09-14 17:58:57 +02:00
Wojciech Figat
de1437102e Fix crash on shutdown due to custom JsonAsset C++ instance 2022-09-13 12:55:14 +02:00
Wojciech Figat
7559cb4d99 Add support for editing JsonAsset data at runtime (eg. modify game settings on the fly) 2022-09-07 11:52:46 +02:00
Wojtek Figat
cced83ca96 Add support for virtual Prefab assets created from code 2022-07-26 23:10:04 +02:00
Wojtek Figat
9fb4624b03 Add JsonAsset.Instance for C# asset object 2022-04-13 21:18:35 +02:00
Wojtek Figat
a9d66d6535 Various fixes for scripting runtime 2022-04-07 22:03:42 +02:00
Wojciech Figat
d0e37ba6ef Fix crash on native type in JsonAsset due to scripting hot-reload in Editor 2022-01-31 10:33:05 +01:00
Wojciech Figat
8c2241c6dc Update copyright year 2022-01-14 13:31:12 +01:00
Wojtek Figat
352abd1e41 Add option *Select actors using this asset* to content menu 2021-10-08 16:25:13 +02:00
Wojtek Figat
ba8f7c5ab4 Add improvements for native interfaces usage 2021-09-29 16:33:25 +02:00
Wojtek Figat
6d3170c665 Revert unwanted change 2021-09-24 20:16:03 +02:00
Wojtek Figat
76a4d0652f Add JsonAsset::GetInstance<T> for easier access to C++ json asset data 2021-09-23 13:47:44 +02:00
Wojtek Figat
6938821467 Add even more profiler events 2021-07-07 15:15:33 +02:00
Wojtek Figat
aa83af477a Add GetStringAnsiView to json value 2021-06-17 14:14:10 +02:00
Wojtek Figat
fdf6306060 Fix asset paths lookup in build 2021-05-14 10:33:08 +02:00
Wojtek Figat
c95e5b0611 Fix assets load error regression 2021-05-14 10:32:55 +02:00
Wojtek Figat
71fc8c63fe Fix compiler errors and warnings 2021-05-02 11:39:24 +02:00
Wojtek Figat
fd595863dc Fix asset paths to be from project rather than packages 2021-05-02 11:25:41 +02:00
Wojtek Figat
05f919c50f Optimization and tweaks 2021-05-02 11:25:33 +02:00
Wojtek Figat
a9ec4566e7 Add support for custom asset type factory in game code 2021-04-15 16:55:03 +02:00
Wojtek Figat
be319c446d Refactor settings types to use scripting API 2021-01-05 14:14:34 +01:00
Wojtek Figat
cc8e78b505 Merge remote-tracking branch 'origin/master' into navigation-features 
# Conflicts:
#	Source/Editor/Content/Settings/NavigationSettings.cs
#	Source/Engine/Engine/PhysicalMaterial.cs
#	Source/Tools/Flax.Build/Bindings/BindingsGenerator.Api.cs
 2021-01-04 14:31:56 +01:00
Wojtek Figat
c5568c8eae Add support for loading JsonAsset instance objects if they implement ISerializable interface 2021-01-04 14:19:51 +01:00
Jean-Baptiste Perrier
03eb39afe6 Bumping all copyright headers to 2021. 2021-01-02 14:28:49 +01:00
Wojtek Figat
3973452ec3 Add logging offset for Json parsing errors 2020-12-30 23:50:07 +01:00
Wojtek Figat
7798a7f6d5 Refactor PhysicalMaterial to use API bindings 2020-12-21 15:39:14 +01:00
Wojtek Figat
6fb9eee74c You're breathtaking! 2020-12-07 23:40:54 +01:00