GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity
Files
19d77f0d810416556cc11be3b69e0d8a19829679
FlaxEngine/Source/Editor
History
Wojtek Figat 74758f5380 Merge remote-tracking branch 'origin/master' into 1.6 
# Conflicts:
#	Source/Tools/Flax.Build/Build/Builder.Projects.cs
#	Source/Tools/Flax.Build/Build/Plugins/NetworkingPlugin.cs
2023-03-14 11:52:41 +01:00
..
Analytics
Merge branch 'master' into 1.5
2023-01-10 15:37:55 +01:00
Content
Merge remote-tracking branch 'origin/master' into 1.6
2023-03-14 11:52:41 +01:00
Cooker
Merge remote-tracking branch 'origin/master' into 1.6
2023-03-14 11:52:41 +01:00
CustomEditors
Merge remote-tracking branch 'origin/master' into dotnet7
2023-02-19 15:04:02 +01:00
Gizmo
Updated transform Gizmos #340
2023-02-16 15:23:18 +01:00
GUI
Merge remote-tracking branch 'origin/master' into dotnet7
2023-03-01 19:50:22 +01:00
History
Update copyright year
2023-01-10 15:29:37 +01:00
Managed
Merge remote-tracking branch 'origin/master' into dotnet7
2023-02-13 10:05:51 +01:00
Modules
Merge remote-tracking branch 'origin/master' into dotnet7
2023-02-16 09:54:22 +01:00
Options
Refactor widowing on macOS to support screen scale and highDpi mode
2023-03-12 10:58:55 +01:00
Plugins
Merge branch 'dotnet7' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-dotnet7
2023-01-12 15:15:40 +01:00
Progress
Merge branch '1.5' into dotnet7
2023-01-17 11:52:52 +01:00
SceneGraph
Merge remote-tracking branch 'origin/master' into 1.6
2023-03-14 11:52:41 +01:00
Scripting
Add vscode detection on macOS
2023-02-28 18:49:32 +01:00
States
Merge remote-tracking branch 'origin/master' into dotnet7
2023-02-13 10:05:51 +01:00
Surface
Merge remote-tracking branch 'origin/master' into 1.6
2023-03-14 11:52:41 +01:00
Tools
Merge remote-tracking branch 'origin/master' into dotnet7
2023-02-16 09:54:22 +01:00
Undo
Update copyright year
2023-01-10 15:29:37 +01:00
Utilities
Merge remote-tracking branch 'origin/master' into dotnet7
2023-02-19 15:04:02 +01:00
Viewport
Merge remote-tracking branch 'origin/master' into 1.6
2023-03-14 11:52:41 +01:00
Windows
Merge remote-tracking branch 'origin/master' into 1.6
2023-03-14 11:52:41 +01:00
CustomEditorWindow.cs
Update copyright year
2023-01-10 15:29:37 +01:00
Editor.Build.cs
Merge remote-tracking branch 'origin/master' into dotnet7
2023-03-01 19:50:22 +01:00
Editor.cpp
Update copyright year
2023-01-10 15:29:37 +01:00
Editor.cs
Code style fix
2023-03-01 19:48:48 +01:00
Editor.h
Update copyright year
2023-01-10 15:29:37 +01:00
EditorAssets.cs
Update copyright year
2023-01-10 15:29:37 +01:00
EditorIcons.cs
Update copyright year
2023-01-10 15:29:37 +01:00
IEditable.cs
Update copyright year
2023-01-10 15:29:37 +01:00
ProjectInfo.cpp
Update copyright year
2023-01-10 15:29:37 +01:00
ProjectInfo.cs
Merge branch '1.5' into dotnet7
2023-01-10 15:49:44 +01:00
ProjectInfo.h
Update copyright year
2023-01-10 15:29:37 +01:00
ViewportDebugDrawData.cs
Merge branch '1.5' into dotnet7
2023-01-10 15:49:44 +01:00