GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
8f7da81621134fa2e2d0bee1502178f406e97ff9
FlaxEngine/Source/Editor
History
Wojtek Figat 8f7da81621 Merge remote-tracking branch 'origin/master' into 1.6 
# Conflicts:
#	Flax.flaxproj
#	Source/Editor/Content/Items/AssetItem.cs
2023-06-13 15:41:07 +02:00
..
Analytics
Optimize text formatting in various places
2023-05-09 13:44:32 +02:00
Content
Merge remote-tracking branch 'origin/master' into 1.6
2023-06-13 15:41:07 +02:00
Cooker
Add iOS app exporting
2023-06-10 23:05:52 +02:00
CustomEditors
Merge remote-tracking branch 'origin/master' into 1.6
2023-06-13 15:41:07 +02:00
Gizmo
fix for #1002
2023-06-08 11:52:00 -04:00
GUI
Add iOS and Apple icons
2023-06-12 14:34:31 +02:00
History
Update copyright year
2023-01-10 15:29:37 +01:00
Managed
Refactor various Editor APIs to use auto-generated bindings instead of manual code
2023-06-12 14:34:07 +02:00
Modules
Add iOS and Apple icons
2023-06-12 14:34:31 +02:00
Options
Follow up #1085 with expendable type description for content items
2023-05-10 10:29:59 +02: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-06-13 15:41:07 +02:00
Scripting
Fix creating C# scripts in Editor with private ctor method
2023-05-12 13:58:39 +02:00
States
Merge remote-tracking branch 'origin/master' into 1.6
2023-04-13 12:12:33 +02:00
Surface
Merge remote-tracking branch 'origin/master' into 1.6
2023-05-28 16:34:38 +02:00
Tools
Merge remote-tracking branch 'origin/master' into dotnet7
2023-02-16 09:54:22 +01:00
Undo
Optimize default C# stdlib references to prevent using jit-ed features in a game assembly
2023-04-01 23:34:05 +02:00
Utilities
Merge remote-tracking branch 'origin/master' into 1.6
2023-06-13 15:41:07 +02:00
Viewport
Merge remote-tracking branch 'origin/master' into 1.6
2023-05-08 22:22:32 +02:00
Windows
Merge remote-tracking branch 'origin/master' into 1.6
2023-06-13 15:41:07 +02:00
CustomEditorWindow.cs
Update copyright year
2023-01-10 15:29:37 +01:00
Editor.Build.cs
Upgrade Editor analytics from deprecated Universal Analytics to the latest GA4
2023-05-08 11:40:20 +02:00
Editor.cpp
Refactor various Editor APIs to use auto-generated bindings instead of manual code
2023-06-12 14:34:07 +02:00
Editor.cs
Refactor various Editor APIs to use auto-generated bindings instead of manual code
2023-06-12 14:34:07 +02: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
Add iOS and Apple icons
2023-06-12 14:34:31 +02: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