GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
c7c339957bfc2ffab570bfab5d1b2e835bb8dfcf
FlaxEngine/Source/Editor
History
Wojtek Figat c7c339957b Merge remote-tracking branch 'origin/1.1' into 1.2 
# Conflicts:
#	Source/Editor/Editor.Build.cs
2021-03-15 09:38:58 +01:00
..
Analytics
Merge remote-tracking branch 'origin/1.1' into linux-editor
2021-02-23 22:32:17 +01:00
Content
Merge branch 'patch-declarationSort' of git://github.com/honzapatCZ/FlaxEngine into honzapatCZ-patch-declarationSort
2021-03-14 19:29:02 +01:00
Cooker
Fix binaries deploy in cooker
2021-03-13 12:49:13 +01:00
CustomEditors
Fix code style and optimize
2021-03-14 19:35:50 +01:00
Gizmo
Merge remote-tracking branch 'origin/1.1' into linux-editor
2021-02-23 22:32:17 +01:00
GUI
Merge branch 'ui-fixes' of git://github.com/stefnotch/FlaxEngine into stefnotch-ui-fixes
2021-03-08 22:36:46 +01:00
History
Fixed Typos and padding
2021-01-17 10:18:30 +01:00
Managed
Fix UTF-8 and UTF-16 encoding support usage in Json resources
2021-03-07 21:30:01 +01:00
Modules
Merge branch 'fix-per-window-dpi' of git://github.com/stefnotch/FlaxEngine into stefnotch-fix-per-window-dpi
2021-03-08 20:50:31 +01:00
Options
Fix code style and optimize
2021-03-14 19:35:50 +01: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
Merge remote-tracking branch 'origin/1.1' into linux-editor
2021-02-23 22:32:17 +01:00
Scripting
Fix code style and optimize
2021-03-14 19:35:50 +01:00
States
Add Build Actions option to editor settings for build button configuration
2021-02-16 15:54:22 +01:00
Surface
Merge remote-tracking branch 'origin/1.1' into 1.2
2021-03-15 09:38:58 +01: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
Merge branch 'fix-per-window-dpi' of git://github.com/stefnotch/FlaxEngine into stefnotch-fix-per-window-dpi
2021-03-08 20:50:31 +01:00
Viewport
Fix various memory leaks on exit
2021-03-14 23:58:03 +01:00
Windows
Merge branch 'ortho' of git://github.com/jb-perrier/FlaxEngine into jb-perrier-ortho
2021-03-14 19:24:24 +01: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
Merge branch 'fix-per-window-dpi' of git://github.com/stefnotch/FlaxEngine into stefnotch-fix-per-window-dpi
2021-03-08 20:50:31 +01: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