Wojtek Figat
|
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 |
|
Wojtek Figat
|
c47907c0c3
|
Fix C# serialization of reference to self (eg. script sub-object referencing owning script)
#55
|
2023-05-06 17:36:17 +02:00 |
|
Wojtek Figat
|
2affebd375
|
Fix C# serialization of scene objects when property throws and exception
#88
|
2023-05-06 14:57:44 +02: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
|
9626e9bbb6
|
Update copyright year
|
2023-01-10 15:29:37 +01:00 |
|
Wojciech Figat
|
84a68c5977
|
Update Newtonsoft.Json to 13.0.2 and .Net 7
|
2022-12-17 13:38:30 +01:00 |
|
Wojciech Figat
|
889eb7d846
|
Revert "Implement JSON difference serialization"
This reverts commit 6bfb0205fd.
|
2022-12-17 13:06:16 +01:00 |
|
|
|
6bfb0205fd
|
Implement JSON difference serialization
|
2022-11-26 13:55:18 +02:00 |
|
Wojtek Figat
|
5d0c27dff3
|
Remove FlaxException
|
2022-03-27 23:57:36 +02:00 |
|
Wojciech Figat
|
8c2241c6dc
|
Update copyright year
|
2022-01-14 13:31:12 +01:00 |
|
Wojtek Figat
|
0f9f3905ed
|
Add json serialization utils for objects to save/load from raw bytes
|
2022-01-08 15:06:15 +01:00 |
|
Wojtek Figat
|
a8c7705c3b
|
Fix null values handling in C# Json serialization
It didn't replace prefab object reference if replaced with null in the prefab instance.
|
2021-08-19 13:06:18 +02:00 |
|
Wojtek Figat
|
22d547e87b
|
Refactor Variant type ManagedObject serialization to be usable for Visual Scripting
|
2021-07-29 22:56:11 +02:00 |
|
Wojtek Figat
|
88902bdb5d
|
Add JsonSerializer.ParseID with return value
|
2021-07-20 16:29:34 +02:00 |
|
Wojtek Figat
|
983190b9a0
|
Add LocalizedString
|
2021-04-19 16:24:14 +02:00 |
|
Wojtek Figat
|
25a9dcad8a
|
Move JsonConverters to a separate file
|
2021-04-07 14:46:49 +02:00 |
|
Wojtek Figat
|
c4d457d7b7
|
Fix control Offsets margin diff deserialziation
|
2021-03-17 17:01:10 +01:00 |
|
Wojtek Figat
|
a2be4bb74a
|
Fix deserialization of UTF-8 string for C# object properties
Closes #320
|
2021-03-12 13:50:03 +01:00 |
|
Wojtek Figat
|
191694725a
|
Add SoftObjectReference for lazy references to assets and objects
|
2021-02-10 11:12:05 +01:00 |
|
Wojtek Figat
|
2c2c1af97f
|
Add NavAgentMask
|
2021-01-15 11:59:04 +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 |
|
