Commit Graph

23 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
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
969053a240 Add JsonAsset.Save to fix saving new tag
#885
2023-02-16 14:32:52 +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
Wojtek Figat
8918c71312 Update old header usage 2022-12-22 19:31:01 +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
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
b49e5e9984 Format more engine code 2022-06-14 20:17:00 +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
76a4d0652f Add JsonAsset::GetInstance<T> for easier access to C++ json asset data 2021-09-23 13:47:44 +02:00
Wojtek Figat
312e4ad010 Merge branch 'master' into 1.1
# Conflicts:
#	Source/Engine/Content/JsonAsset.h
#	Source/Engine/Core/Config/Settings.h
2021-02-15 10:40:59 +01:00
intolerantape
633357cc9b Added FLAXENGINE_API macro to class JsonAsset. 2021-02-06 09:52:30 -08: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
6fb9eee74c You're breathtaking! 2020-12-07 23:40:54 +01:00