GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,940 Commits 14 Branches 0 Tags
c5520f27770a0ae10e0b4cb88219ec00e374e5ce
Commit Graph

92 Commits

Author SHA1 Message Date
Wojtek Figat
53bd576ade Fix game settings serialization bug 2024-02-28 02:05:26 +01:00
Wojtek Figat
14902dc29e Merge remote-tracking branch 'origin/master' into 1.8 
# Conflicts:
#	Flax.flaxproj
 2024-02-26 19:49:39 +01:00
Wojtek Figat
859c420d76 Update year in copyright note 2024-02-26 19:00:48 +01:00
Wojtek Figat
10180de9c6 Merge remote-tracking branch 'origin/master' into 1.8 
# Conflicts:
#	Source/Editor/Utilities/EditorUtilities.cpp
#	Source/Editor/Utilities/EditorUtilities.h
 2024-02-19 22:26:16 +01:00
Wojtek Figat
a2b8312fba Cleanup stuff in #2019 2024-02-18 19:48:43 +01:00
Wojtek Figat
45aa0e1b65 Merge branch 'master' of https://github.com/HydrogenC/FlaxEngine into HydrogenC-master 2024-02-18 16:11:31 +01:00
Wojtek Figat
6cd9895427 Merge remote-tracking branch 'origin/master' into 1.8 2024-02-07 09:40:45 +01:00
Chandler Cox
9874b753cb Merge branch 'master' into collection-ui 2024-01-26 09:54:03 -06:00
ExMatics HydrogenC
6ab1663a14 Add missing xml annotations 2023-12-03 15:18:27 +08:00
ExMatics HydrogenC
23b71e7d3e Make font fallbacking the default option 2023-12-03 15:11:47 +08:00
ExMatics HydrogenC
29eb3954c5 Create global settings for font fallback 2023-12-02 17:48:51 +08:00
Wojtek Figat
640f380237 Add OutputName to Build Settings for game output exe/package renaming 
#1174
 2023-11-16 10:29:58 +01:00
Wojtek Figat
eaafb72ca9 Optimize some includes and use automatic serializers for platform settings 2023-11-13 23:54:07 +01:00
Chandler Cox
0f5a177be2 Improve collection editor. 2023-10-14 21:32:58 -05:00
Wojtek Figat
702356f1e4 Missing change for c01614b8f5 and regression from 88eca13eb3 2023-10-13 16:58:02 +02:00
Wojtek Figat
88eca13eb3 Add default font bundling (optional) and setup UI Style to match editor logic 
#641
 2023-10-12 22:28:40 +02:00
Wojtek Figat
03b16875c7 Add SkipUnusedDotnetLibsPackaging to build settings for optional whole C# stdlib packaging 2023-04-03 18:03:28 +02:00
Wojtek Figat
a25eae5d10 Move dotnet7 native interop, wrappers and marshalers into FlaxEngine.Interop namespace 2023-03-28 13:20:18 +02:00
Wojtek Figat
0ba261d338 Add iOS platform (refactor Mac into shared Apple platform impl) 2023-03-15 20:58:23 +01:00
Wojtek Figat
e00bf92f05 Add .Net Runtime deployment for cooked game 2023-03-13 10:23:42 +01:00
Wojtek Figat
0cf40729fa Merge remote-tracking branch 'origin/master' into dotnet7 2023-02-19 15:04:02 +01:00
Wojtek Figat
d5cdbdb808 Fix typo 2ea468d5da 2023-02-17 01:13:23 +01:00
Wojtek Figat
2ea468d5da Ignore constant error due to missing Game Settings in Editor (log once) 2023-02-17 01:01:32 +01:00
Wojtek Figat
ac59cc4633 Merge remote-tracking branch 'origin/master' into dotnet7 2023-02-13 10:05:51 +01:00
Wojtek Figat
7fae0d9fb6 Fix to ignore warning due to missing NDA consoles packages 2023-02-08 23:41:24 +01:00
Wojciech Figat
f3366178ea Refactor manually written managed bindings to use C-style exported P/Invoke 2023-01-23 18:14:38 +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
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
8918c71312 Update old header usage 2022-12-22 19:31:01 +01:00
Wojciech Figat
9a5c105db9 Merge branch '1.5' into dotnet7 2022-12-21 10:35:58 +01:00
Wojtek Figat
a570d6d178 Refactor **Actor tags into hierarchical reusable Tags** system for better gameplay scripting 2022-12-20 21:11:38 +01:00
Wojciech Figat
eae8fd7ef9 Add AdditionalScenes to BuildSettings 2022-12-02 10:05:32 +01:00
Ari Vuollet
96dc279ebd Implement .NET 7 runtime support and bindings generation 2022-11-26 14:37:07 +02:00
Wojciech Figat
e115aa2c4e Merge remote-tracking branch 'origin/master' into 1.5 
# Conflicts:
#	Source/Engine/Content/JsonAsset.cpp
 2022-10-19 13:36:46 +02:00
Wojtek Figat
607afeee50 Add proper deserialization of old values pre-renaming 
#767
 2022-10-12 20:38:59 +02:00
Cristhofer Marques
187e56c6ba typo fix in graphics settings 2022-10-11 13:34:46 -03: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
94cacc8abc Add game settings assets loading (not only objects) 2022-09-06 13:33:17 +02:00
Wojciech Figat
9ad4665270 Add Network Settings 2022-09-03 12:54:37 +02:00
Wojciech Figat
c9726ab05b Compact graphics settings 2022-09-02 14:10:04 +02:00
Wojtek Figat
bbb5b68e91 Refactor FlaxTests to run as Editor with all engine services initialized 2022-07-26 23:10:02 +02:00
Wojciech Figat
0af86d8cb8 Add HDR env probes support 2022-07-19 10:33:52 +02:00
Wojciech Figat
a8579cadcc Move DefaultProbeResolution from Graphics to GraphicsSettings only (not runtime option) 
#728
 2022-07-14 15:37:54 +02:00
Wojciech Figat
e210e58644 Merge branch 'master' of https://github.com/whocares77/FlaxEngine into whocares77-master 2022-07-14 14:49:04 +02:00
Wojciech Figat
9cbaeb21f5 Add GI probes spacing setting 2022-06-20 10:09:09 +02:00
artkez
e548dbfb19 EnvironmentProbe selectable resolution 2022-06-16 10:28:57 +03:00
Wojciech Figat
2522d84a21 Add default Post Process options to Graphics Settings 2022-06-14 12:01:16 +02:00
Wojciech Figat
78afe60343 Add Global Surface Atlas resolution setting 2022-06-13 12:38:01 +02:00