GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
ace8295ab7d16ed2402f46c1355e5401d39bb883
FlaxEngine/Source/Editor
History
Wojtek Figat ace8295ab7 Merge remote-tracking branch 'origin/master' into localization 
# Conflicts:
#	Source/Platforms/DotNet/Newtonsoft.Json.dll
#	Source/Platforms/DotNet/Newtonsoft.Json.pdb
#	Source/Platforms/UWP/Binaries/Newtonsoft.Json.dll
#	Source/Platforms/XboxOne/Binaries/Newtonsoft.Json.dll
2021-04-22 16:10:36 +02:00
..
Analytics
Merge remote-tracking branch 'origin/1.1' into linux-editor
2021-02-23 22:32:17 +01:00
Content
Fix json proxy regression for Generic json assets
2021-04-22 10:58:52 +02:00
Cooker
Merge remote-tracking branch 'origin/master' into localization
2021-04-22 16:10:36 +02:00
CustomEditors
Merge remote-tracking branch 'origin/master' into localization
2021-04-22 16:10:36 +02:00
Gizmo
Tweaks for prefabs first selection
2021-03-21 14:00:23 +01:00
GUI
Merge branch 'master' into 1.2
2021-04-13 09:52:03 +02:00
History
Fixed Typos and padding
2021-01-17 10:18:30 +01:00
Managed
Add support for importing assets into custom formats with AssetsImportingManager
2021-04-15 16:48:01 +02:00
Modules
Add LocalizationSettings
2021-04-16 15:46:42 +02:00
Options
Add error message box on Editor Options saving error
2021-04-21 23:47:27 +02:00
Plugins
Bumping all copyright headers to 2021.
2021-01-02 14:28:49 +01:00
Progress
Merge remote-tracking branch 'origin/master' into 1.1
2021-01-22 11:31:22 +01:00
SceneGraph
Fix duplicating spline
2021-04-12 21:06:34 +02:00
Scripting
Fix picking game binaries target when EditorTarget is not SetupTargetEnvironment
2021-03-28 23:25:52 +02:00
States
Add Build Actions option to editor settings for build button configuration
2021-02-16 15:54:22 +01:00
Surface
Fix "This" node output type.
2021-04-11 12:16:03 +02:00
Tools
Merge remote-tracking branch 'origin/1.1' into linux-editor
2021-02-23 22:32:17 +01:00
Undo
Final Changes
2021-02-21 14:38:01 +01:00
Utilities
Add WriteVariant support.
2021-04-08 19:00:03 +02:00
Viewport
Merge remote-tracking branch 'origin/master' into localization
2021-04-22 16:10:36 +02:00
Windows
Add undo support for Json Asset editor window
2021-04-22 14:21:07 +02:00
CustomEditorWindow.cs
Bumping all copyright headers to 2021.
2021-01-02 14:28:49 +01:00
Editor.Build.cs
Merge remote-tracking branch 'origin/1.1' into 1.2
2021-03-15 09:38:58 +01:00
Editor.cpp
Merge remote-tracking branch 'origin/1.1' into linux-editor
2021-02-23 22:32:17 +01:00
Editor.cs
Add support for importing assets into custom formats with AssetsImportingManager
2021-04-15 16:48:01 +02:00
Editor.h
Remove ProjectInfo.h include from Editor.h
2021-02-19 09:36:23 +01:00
EditorAssets.cs
Add Sprite Render actor for sprites drawing
2021-02-23 13:23:22 +01:00
EditorIcons.cs
Bumping all copyright headers to 2021.
2021-01-02 14:28:49 +01:00
IEditable.cs
Bumping all copyright headers to 2021.
2021-01-02 14:28:49 +01:00
ProjectInfo.cpp
Merge remote-tracking branch 'origin/1.1' into linux-editor
2021-02-16 18:54:25 +01:00
ProjectInfo.cs
Bumping all copyright headers to 2021.
2021-01-02 14:28:49 +01:00
ProjectInfo.h
Bumping all copyright headers to 2021.
2021-01-02 14:28:49 +01:00
ViewportDebugDrawData.cs
Bumping all copyright headers to 2021.
2021-01-02 14:28:49 +01:00