GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
a7e428a21c5c18b4442b9f30e1d7919bb146e664
FlaxEngine/Source/Editor/Modules
History
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
..
SourceCodeEditing
Update copyright year
2023-01-10 15:29:37 +01:00
ContentDatabaseModule.cs
Merge branch 'master' into 1.5
2023-01-10 15:37:55 +01:00
ContentEditingModule.cs
Update copyright year
2023-01-10 15:29:37 +01:00
ContentFindingModule.cs
Merge branch 'master' into 1.5
2023-01-10 15:37:55 +01:00
ContentImportingModule.cs
Update copyright year
2023-01-10 15:29:37 +01:00
EditorModule.cs
Update copyright year
2023-01-10 15:29:37 +01:00
PrefabsModule.cs
Update copyright year
2023-01-10 15:29:37 +01:00
ProgressReportingModule.cs
Update copyright year
2023-01-10 15:29:37 +01:00
ProjectCacheModule.cs
Update copyright year
2023-01-10 15:29:37 +01:00
SceneEditingModule.cs
Merge branch 'master' into 1.5
2023-01-10 15:37:55 +01:00
SceneModule.cs
Update copyright year
2023-01-10 15:29:37 +01:00
SimulationModule.cs
Update copyright year
2023-01-10 15:29:37 +01:00
UIModule.cs
Merge branch 'master' into 1.5
2023-01-10 15:37:55 +01:00
WindowsModule.cs
Merge branch 'master' into 1.5
2023-01-10 15:37:55 +01:00