mafiesto4
dae5b416ca
Minor tweaks #4130
2026-09-18 13:08:16 +02:00
Andrei Gagua
3ba1f5192f
Fix discarding unsaved asset editor changes
...
- clear cached JsonAsset managed instances on discard,
- restore MaterialInstance parameter values and override flags,
- reload model assets from disk when model edits are discarded.
2026-05-30 23:54:52 +03:00
mafiesto4
9c3fd052cd
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
mafiesto4
d879b8e064
Add utility GetInstance method to Json Asset refs in csharp
...
#2774
2024-07-18 15:14:26 +02:00
mafiesto4
859c420d76
Update year in copyright note
2024-02-26 19:00:48 +01:00
mafiesto4
5a66e90b56
Merge remote-tracking branch 'origin/master' into 1.6
...
# Conflicts:
# .github/workflows/tests.yml
# Source/Engine/Content/JsonAsset.cs
2023-05-07 19:46:29 +02:00
mafiesto4
37e8fa7b76
Fix creating localization table on blank project
...
#1060
2023-05-05 14:54:42 +02:00
mafiesto4
59ba9102a6
Merge branch 'dotnet7' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-dotnet7
2023-01-12 15:15:40 +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
GoaLitiuM
9f76e9e230
Hide types in unloaded scripting assemblies
2023-01-09 15:20:24 +02:00
GoaLitiuM
2227642c13
Fix JsonAsset instantiation after script reload
2022-11-27 14:47:02 +02:00
mafiesto4
7559cb4d99
Add support for editing JsonAsset data at runtime (eg. modify game settings on the fly)
2022-09-07 11:52:46 +02:00
mafiesto4
4ac9406b90
Revert 017492dbfa
2022-04-14 23:10:01 +02:00
mafiesto4
9fb4624b03
Add JsonAsset.Instance for C# asset object
2022-04-13 21:18:35 +02:00
mafiesto4
017492dbfa
Optimize C# types searching with typename
2022-04-13 19:48:39 +02:00
mafiesto4
8c2241c6dc
Update copyright year
2022-01-14 13:31:12 +01:00
jb-perrier
03eb39afe6
Bumping all copyright headers to 2021.
2021-01-02 14:28:49 +01:00
mafiesto4
6fb9eee74c
You're breathtaking!
2020-12-07 23:40:54 +01:00
mafiesto4
Andrei Gagua
GoaLitiuM
jb-perrier