Browse Source

Refactor: Moving the engine C# scripting bits into 'bsf' itself

BearishSun 6 years ago
parent
commit
307abcf830
100 changed files with 110 additions and 125 deletions
  1. 1 0
      .gitignore
  2. 6 44
      CMakeLists.txt
  3. 3 0
      Documentation/GitHub/features.md
  4. 2 2
      Source/Banshee3D/CMakeLists.txt
  5. 8 35
      Source/EditorCore/BsEditorApplication.cpp
  6. 1 10
      Source/EditorCore/BsEditorApplication.h
  7. 1 0
      Source/EditorCore/BsEditorPrerequisites.h
  8. 1 1
      Source/EditorCore/Build/BsBuildManager.cpp
  9. 1 1
      Source/EditorCore/Build/BsPlatformInfo.cpp
  10. 15 15
      Source/EditorCore/CMakeSources.cmake
  11. 7 6
      Source/EditorCore/CodeEditor/BsCodeEditor.cpp
  12. 2 1
      Source/EditorCore/CodeEditor/BsCodeEditor.h
  13. 1 1
      Source/EditorCore/EditorWindow/BsDockManagerLayout.cpp
  14. 1 1
      Source/EditorCore/EditorWindow/BsEditorWidgetLayout.cpp
  15. 1 1
      Source/EditorCore/GUI/BsGUIWindowFrameWidget.cpp
  16. 1 1
      Source/EditorCore/Library/BsProjectLibraryEntries.cpp
  17. 1 1
      Source/EditorCore/Library/BsProjectResourceMeta.cpp
  18. 0 0
      Source/EditorCore/Private/Linux/BsLinuxBrowseDialogs.cpp
  19. 0 0
      Source/EditorCore/Private/RTTI/BsBuildDataRTTI.h
  20. 0 0
      Source/EditorCore/Private/RTTI/BsDockManagerLayoutRTTI.h
  21. 0 0
      Source/EditorCore/Private/RTTI/BsEditorSettingsRTTI.h
  22. 0 0
      Source/EditorCore/Private/RTTI/BsEditorWidgetLayoutRTTI.h
  23. 0 0
      Source/EditorCore/Private/RTTI/BsGUIWindowFrameWidgetRTTI.h
  24. 0 0
      Source/EditorCore/Private/RTTI/BsPlatformInfoRTTI.h
  25. 0 0
      Source/EditorCore/Private/RTTI/BsProjectLibraryEntriesRTTI.h
  26. 0 0
      Source/EditorCore/Private/RTTI/BsProjectResourceMetaRTTI.h
  27. 0 0
      Source/EditorCore/Private/RTTI/BsProjectSettingsRTTI.h
  28. 0 0
      Source/EditorCore/Private/RTTI/BsSettingsRTTI.h
  29. 0 0
      Source/EditorCore/Private/Win32/BsVSCodeEditor.cpp
  30. 0 0
      Source/EditorCore/Private/Win32/BsVSCodeEditor.h
  31. 0 0
      Source/EditorCore/Private/Win32/BsWin32BrowseDialogs.cpp
  32. 0 0
      Source/EditorCore/Private/Win32/Setup.Configuration.h
  33. 0 0
      Source/EditorCore/Private/Win32/dte80a.tlh
  34. 0 0
      Source/EditorCore/Private/macOS/BsMacOSBrowseDialogs.mm
  35. 1 1
      Source/EditorCore/Settings/BsEditorSettings.cpp
  36. 1 1
      Source/EditorCore/Settings/BsProjectSettings.cpp
  37. 1 1
      Source/EditorCore/Settings/BsSettings.cpp
  38. 22 0
      Source/EditorManaged/CMakeLists.txt
  39. 0 0
      Source/EditorManaged/GUI/EditorStyles.cs
  40. 0 0
      Source/EditorManaged/GUI/GUIColorDistributionField.cs
  41. 0 0
      Source/EditorManaged/GUI/GUIColorField.cs
  42. 0 0
      Source/EditorManaged/GUI/GUIColorGradient.cs
  43. 0 0
      Source/EditorManaged/GUI/GUIColorGradientField.cs
  44. 0 0
      Source/EditorManaged/GUI/GUICurvesField.cs
  45. 0 0
      Source/EditorManaged/GUI/GUIDictionaryField.cs
  46. 0 0
      Source/EditorManaged/GUI/GUIEnumField.cs
  47. 0 0
      Source/EditorManaged/GUI/GUIFloatDistributionField.cs
  48. 0 0
      Source/EditorManaged/GUI/GUIFloatField.cs
  49. 0 0
      Source/EditorManaged/GUI/GUIGameObjectField.cs
  50. 0 0
      Source/EditorManaged/GUI/GUIIntField.cs
  51. 0 0
      Source/EditorManaged/GUI/GUIListBoxField.cs
  52. 0 0
      Source/EditorManaged/GUI/GUIListField.cs
  53. 0 0
      Source/EditorManaged/GUI/GUIResourceField.cs
  54. 0 0
      Source/EditorManaged/GUI/GUISceneTreeView.cs
  55. 0 0
      Source/EditorManaged/GUI/GUISliderField.cs
  56. 0 0
      Source/EditorManaged/GUI/GUITextField.cs
  57. 0 0
      Source/EditorManaged/GUI/GUITextureField.cs
  58. 0 0
      Source/EditorManaged/GUI/GUIToggleField.cs
  59. 0 0
      Source/EditorManaged/GUI/GUIVector2DistributionField.cs
  60. 0 0
      Source/EditorManaged/GUI/GUIVector2Field.cs
  61. 0 0
      Source/EditorManaged/GUI/GUIVector3DistributionField.cs
  62. 0 0
      Source/EditorManaged/GUI/GUIVector3Field.cs
  63. 0 0
      Source/EditorManaged/GUI/GUIVector4Field.cs
  64. 0 0
      Source/EditorManaged/GUI/LocEdString.cs
  65. 0 0
      Source/EditorManaged/General/EditorApplication.cs
  66. 0 0
      Source/EditorManaged/General/EditorPersistentData.cs
  67. 0 0
      Source/EditorManaged/General/IGlobalShortcuts.cs
  68. 0 0
      Source/EditorManaged/General/Program.cs
  69. 0 0
      Source/EditorManaged/General/Selection.cs
  70. 2 0
      Source/EditorManaged/Generated/CurveDrawInfo.generated.cs
  71. 4 1
      Source/EditorManaged/Generated/CurveDrawOption.generated.cs
  72. 2 0
      Source/EditorManaged/Generated/GUIColorDistributionField.generated.cs
  73. 2 0
      Source/EditorManaged/Generated/GUIColorGradient.generated.cs
  74. 2 0
      Source/EditorManaged/Generated/GUIColorGradientField.generated.cs
  75. 2 0
      Source/EditorManaged/Generated/GUICurves.generated.cs
  76. 2 0
      Source/EditorManaged/Generated/GUICurvesField.generated.cs
  77. 2 0
      Source/EditorManaged/Generated/GUIFloatDistributionField.generated.cs
  78. 2 0
      Source/EditorManaged/Generated/GUIGraphTicks.generated.cs
  79. 4 1
      Source/EditorManaged/Generated/GUITickStepType.generated.cs
  80. 2 0
      Source/EditorManaged/Generated/GUITimeline.generated.cs
  81. 2 0
      Source/EditorManaged/Generated/GUIVector2DistributionField.generated.cs
  82. 2 0
      Source/EditorManaged/Generated/GUIVector3DistributionField.generated.cs
  83. 2 0
      Source/EditorManaged/Generated/ProjectResourceIcons.generated.cs
  84. 0 0
      Source/EditorManaged/Input/EditorInput.cs
  85. 0 0
      Source/EditorManaged/Input/EditorVirtualInput.cs
  86. 0 0
      Source/EditorManaged/Inspectors/AnimationClipInspector.cs
  87. 0 0
      Source/EditorManaged/Inspectors/AnimationInspector.cs
  88. 0 0
      Source/EditorManaged/Inspectors/AudioClipInspector.cs
  89. 0 0
      Source/EditorManaged/Inspectors/AudioListenerInspector.cs
  90. 0 0
      Source/EditorManaged/Inspectors/AudioSourceInspector.cs
  91. 0 0
      Source/EditorManaged/Inspectors/BoneInspector.cs
  92. 0 0
      Source/EditorManaged/Inspectors/BoxColliderInspector.cs
  93. 0 0
      Source/EditorManaged/Inspectors/CameraInspector.cs
  94. 0 0
      Source/EditorManaged/Inspectors/CapsuleColliderInspector.cs
  95. 0 0
      Source/EditorManaged/Inspectors/CharacterControllerInspector.cs
  96. 0 0
      Source/EditorManaged/Inspectors/ColliderInspector.cs
  97. 0 0
      Source/EditorManaged/Inspectors/D6JointInspector.cs
  98. 0 0
      Source/EditorManaged/Inspectors/DistanceJointInspector.cs
  99. 0 0
      Source/EditorManaged/Inspectors/FixedJointInspector.cs
  100. 0 0
      Source/EditorManaged/Inspectors/FontInspector.cs

+ 1 - 0
.gitignore

@@ -30,3 +30,4 @@ Documentation/html
 *.opendb
 Source/Experimental
 .vs/*
+Source/EditorManaged/MBansheeEditor.csproj

+ 6 - 44
CMakeLists.txt

@@ -31,12 +31,9 @@ set (BS_SRC_DEPENDENCIES_VERSION 15)
 set (BS_BUILTIN_ASSETS_VERSION 14)
 
 # Options
-set(GENERATE_SCRIPT_BINDINGS OFF CACHE BOOL "If true, script binding files will be generated. Script bindings are required for the project to build properly, however they take a while to generate. If you are sure the script bindings are up to date, you can turn off their generation (temporarily) to speed up the build.")
+set(SCRIPT_BINDING_GENERATION OFF CACHE BOOL "If true, script binding generation will be supported through a specialized build target. Enable this if you plan on modifying the scripting API. Requires the SBGen tool dependency. Only relevant if you have selected a SCRIPT_API other than \"None\".")
 
 # Ensure dependencies are up to date
-## Check prebuilt dependencies that are downloaded in a .zip
-check_and_update_binary_deps(Banshee ${PROJECT_SOURCE_DIR}/Dependencies/ ${BS_PREBUILT_DEPENDENCIES_VERSION})
-
 ## Check data dependencies
 check_and_update_builtin_assets(Banshee ${PROJECT_SOURCE_DIR}/Data/Raw Raw ${BS_BUILTIN_ASSETS_VERSION} NO)
 		
@@ -51,56 +48,21 @@ set(BANSHEE_COMPILED_ASSETS_VERSION_FILE ${PROJECT_SOURCE_DIR}/Data/.reqversion)
 file (STRINGS ${BANSHEE_COMPILED_ASSETS_VERSION_FILE} BANSHEE_COMPILED_ASSETS_VERSION)
 check_and_update_builtin_assets(BansheeCompiled ${PROJECT_SOURCE_DIR}/Data Data ${BANSHEE_COMPILED_ASSETS_VERSION} NO)
 		
-# Generate script bindings
-include(${BSF_SOURCE_DIR}/CMake/GenerateScriptBindings.cmake)
-	
 # Sub-directories
 add_subdirectory(Source/EditorCore)
 
 ## Script interop
-add_subdirectory(${BSF_SOURCE_DIR}/Plugins/bsfMono)
-add_subdirectory(Source/Scripting/SBansheeEngine)
-add_subdirectory(Source/Scripting/SBansheeEditor)
+add_subdirectory(Source/EditorScript)
+add_subdirectory(Source/EditorManaged)
 
 ## Executables
 add_subdirectory(Source/Banshee3D)
 add_subdirectory(Source/Game)
 
-## Managed projects
-set(CS_ENGINE_PROJ ${PROJECT_SOURCE_DIR}/Source/Scripting/MBansheeEngine/MBansheeEngine.csproj)
-set(CS_EDITOR_PROJ ${PROJECT_SOURCE_DIR}/Source/Scripting/MBansheeEditor/MBansheeEditor.csproj)
+## Managed project dependencies
+add_dependencies(Banshee3D MBansheeEngine MBansheeEditor)
+add_dependencies(Game MBansheeEngine)
 
 if(MSVC)
-	include_external_msproject(MBansheeEngine ${CS_ENGINE_PROJ})
-	include_external_msproject(MBansheeEditor ${CS_EDITOR_PROJ})
-	
-	set_target_properties(MBansheeEngine PROPERTIES
-	  MAP_IMPORTED_CONFIG_RELEASE OptimizedDebug
-	)
-	set_target_properties(MBansheeEditor PROPERTIES
-	  MAP_IMPORTED_CONFIG_RELEASE OptimizedDebug
-	)
-	
-	set_property(TARGET MBansheeEngine PROPERTY FOLDER Script)
-	set_property(TARGET MBansheeEditor PROPERTY FOLDER Script)
-
-	add_dependencies(Banshee3D MBansheeEngine MBansheeEditor)
-	add_dependencies(Game MBansheeEngine)
-
 	set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT Banshee3D)
-else()
-	find_package(mcs)
-
-	if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
-		set(CS_PROJ_CONFIG Debug)
-	else()
-		set(CS_PROJ_CONFIG Release)
-	endif()
-
-	add_custom_target(BuildManaged
-			COMMAND xbuild /p:Configuration=${CS_PROJ_CONFIG} ${CS_EDITOR_PROJ}
-			COMMENT "Building managed assemblies")
-
-	add_dependencies(Banshee3D BuildManaged)
-	add_dependencies(Game BuildManaged)
 endif()

+ 3 - 0
Documentation/GitHub/features.md

@@ -24,6 +24,9 @@
   * Scripts and data transparently reloaded after compilation so changes may be tested immediately
   * Pause and frame-step to better test and debug your game
   * Analyze and modify scene while playing
+* __Animation__
+  * Built-in animation editor
+  * Generic property animation (Animate any script property)
 * __Fully extensible__
   * Specialized scripting API only for editor extensions
   * Easy to use without needing to know about engine internals

+ 2 - 2
Source/Banshee3D/CMakeLists.txt

@@ -23,7 +23,7 @@ set_property(TARGET Banshee3D PROPERTY FOLDER Executable)
 
 # Plugin dependencies
 add_engine_dependencies(Banshee3D)
-add_dependencies(Banshee3D bsfFBXImporter bsfFontImporter bsfFreeImgImporter SBansheeEditor MonoExec)
+add_dependencies(Banshee3D bsfFBXImporter bsfFontImporter bsfFreeImgImporter EditorScript MonoExec)
 
 # Compiler flags
 if(MSVC)
@@ -31,4 +31,4 @@ if(MSVC)
 endif()
 
 # Make sure `bsf` dlls are copied to our folders
-copyBsfBinaries(Banshee3D ${BSF_DIRECTORY})
+install_dll_on_build(Banshee3D ${BSF_DIRECTORY})

+ 8 - 35
Source/EditorCore/BsEditorApplication.cpp

@@ -72,7 +72,7 @@ namespace bs
 	}
 
 	EditorApplication::EditorApplication()
-		:Application(createStartupDesc()), mIsProjectLoaded(false), mSBansheeEditorPlugin(nullptr)
+		:Application(createStartupDesc()), mIsProjectLoaded(false), mEditorScriptPlugin(nullptr)
 	{
 
 	}
@@ -163,8 +163,8 @@ namespace bs
 	void EditorApplication::loadScriptSystem()
 	{
 		loadPlugin("bsfMono", &mMonoPlugin);
-		loadPlugin("SBansheeEngine", &mSBansheeEnginePlugin);
-		loadPlugin("SBansheeEditor", &mSBansheeEditorPlugin);
+		loadPlugin("bsfScript", &mScriptPlugin);
+		loadPlugin("EditorScript", &mEditorScriptPlugin);
 	}
 
 	void EditorApplication::unloadScriptSystem()
@@ -172,11 +172,11 @@ namespace bs
 		// These plugins must be unloaded before any other script plugins, because
 		// they will cause finalizers to trigger and various modules those finalizers
 		// might reference must still be active
-		if(mSBansheeEditorPlugin != nullptr)
-			unloadPlugin(mSBansheeEditorPlugin);
+		if(mEditorScriptPlugin != nullptr)
+			unloadPlugin(mEditorScriptPlugin);
 
-		if(mSBansheeEnginePlugin != nullptr)
-			unloadPlugin(mSBansheeEnginePlugin);
+		if(mScriptPlugin != nullptr)
+			unloadPlugin(mScriptPlugin);
 
 		if(mMonoPlugin != nullptr)
 			unloadPlugin(mMonoPlugin);
@@ -227,39 +227,12 @@ namespace bs
 	{
 		typedef void(*QuitRequestedFunc)();
 
-		QuitRequestedFunc quitRequestedCall = (QuitRequestedFunc)mSBansheeEditorPlugin->getSymbol("quitRequested");
+		QuitRequestedFunc quitRequestedCall = (QuitRequestedFunc)mEditorScriptPlugin->getSymbol("quitRequested");
 
 		if (quitRequestedCall != nullptr)
 			quitRequestedCall();
 	}
 
-	Path EditorApplication::getEditorAssemblyPath() const
-	{
-		Path assemblyPath = getBuiltinAssemblyFolder();
-		assemblyPath.append(String(EDITOR_ASSEMBLY) + ".dll");
-
-		return assemblyPath;
-	}
-
-	Path EditorApplication::getEditorScriptAssemblyPath() const
-	{
-		Path assemblyPath = getScriptAssemblyFolder();
-		assemblyPath.append(String(SCRIPT_EDITOR_ASSEMBLY) + ".dll");
-
-		return assemblyPath;
-	}
-
-	Path EditorApplication::getScriptAssemblyFolder() const
-	{
-		if (!isProjectLoaded())
-			return Path::BLANK;
-
-		Path assemblyFolder = getProjectPath();
-		assemblyFolder.append(INTERNAL_ASSEMBLY_PATH);
-
-		return assemblyFolder;
-	}
-
 	void EditorApplication::saveProject()
 	{
 		if (!isProjectLoaded())

+ 1 - 10
Source/EditorCore/BsEditorApplication.h

@@ -34,15 +34,6 @@ namespace bs
 		/**	Returns the absolute path where the builtin editor assets are located. */
 		Path getDataPath() const { return mBuiltinDataPath; }
 
-		/**	Returns the absolute path to the built-in managed editor assembly file. */
-		Path getEditorAssemblyPath() const;
-
-		/**	Returns the absolute path of the managed editor script assembly file. */
-		Path getEditorScriptAssemblyPath() const;
-
-		/** @copydoc	Application::getScriptAssemblyFolder */
-		Path getScriptAssemblyFolder() const override;
-
 		/** Returns a set of serializable editor settings that contain every globally customizable editor property. */
 		SPtr<EditorSettings> getEditorSettings() const { return mEditorSettings; }
 
@@ -151,7 +142,7 @@ namespace bs
 		Timer mSplashScreenTimer;
 		bool mSplashScreenShown = true;
 
-		DynLib* mSBansheeEditorPlugin;
+		DynLib* mEditorScriptPlugin;
 	};
 
 	/**	Easy way to access EditorApplication. */

+ 1 - 0
Source/EditorCore/BsEditorPrerequisites.h

@@ -192,6 +192,7 @@ namespace bs
 
 	static constexpr const char* EDITOR_ASSEMBLY = "MBansheeEditor";
 	static constexpr const char* SCRIPT_EDITOR_ASSEMBLY = "MScriptEditor";
+	static constexpr const char* EDITOR_NS = "BansheeEditor";
 	static const Path PROJECT_INTERNAL_DIR = u8"Internal/";
 	static const Path INTERNAL_ASSEMBLY_PATH = PROJECT_INTERNAL_DIR + "Assemblies/";
 

+ 1 - 1
Source/EditorCore/Build/BsBuildManager.cpp

@@ -1,7 +1,7 @@
 //********************************** Banshee Engine (www.banshee3d.com) **************************************************//
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
 #include "Build/BsBuildManager.h"
-#include "RTTI/BsBuildDataRTTI.h"
+#include "Private/RTTI/BsBuildDataRTTI.h"
 #include "Serialization/BsFileSerializer.h"
 #include "FileSystem/BsFileSystem.h"
 #include "BsEditorApplication.h"

+ 1 - 1
Source/EditorCore/Build/BsPlatformInfo.cpp

@@ -1,7 +1,7 @@
 //********************************** Banshee Engine (www.banshee3d.com) **************************************************//
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
 #include "Build/BsPlatformInfo.h"
-#include "RTTI/BsPlatformInfoRTTI.h"
+#include "Private/RTTI/BsPlatformInfoRTTI.h"
 
 namespace bs
 {

+ 15 - 15
Source/EditorCore/CMakeSources.cmake

@@ -127,16 +127,16 @@ set(BS_BANSHEEEDITOR_INC_UNDOREDO
 )
 
 set(BS_BANSHEEEDITOR_INC_RTTI
-	"RTTI/BsPlatformInfoRTTI.h"
-	"RTTI/BsBuildDataRTTI.h"
-	"RTTI/BsDockManagerLayoutRTTI.h"
-	"RTTI/BsEditorWidgetLayoutRTTI.h"
-	"RTTI/BsProjectLibraryEntriesRTTI.h"
-	"RTTI/BsProjectResourceMetaRTTI.h"
-	"RTTI/BsEditorSettingsRTTI.h"
-	"RTTI/BsSettingsRTTI.h"
-	"RTTI/BsProjectSettingsRTTI.h"
-	"RTTI/BsGUIWindowFrameWidgetRTTI.h"
+	"Private/RTTI/BsPlatformInfoRTTI.h"
+	"Private/RTTI/BsBuildDataRTTI.h"
+	"Private/RTTI/BsDockManagerLayoutRTTI.h"
+	"Private/RTTI/BsEditorWidgetLayoutRTTI.h"
+	"Private/RTTI/BsProjectLibraryEntriesRTTI.h"
+	"Private/RTTI/BsProjectResourceMetaRTTI.h"
+	"Private/RTTI/BsEditorSettingsRTTI.h"
+	"Private/RTTI/BsSettingsRTTI.h"
+	"Private/RTTI/BsProjectSettingsRTTI.h"
+	"Private/RTTI/BsGUIWindowFrameWidgetRTTI.h"
 )
 
 set(BS_BANSHEEEDITOR_SRC_NOFILTER
@@ -255,20 +255,20 @@ set(BS_BANSHEEEDITOR_SRC_CODEEDITOR
 )
 
 set(BS_BANSHEEEDITOR_INC_WIN32
-	"Win32/BsVSCodeEditor.h"
+	"Private/Win32/BsVSCodeEditor.h"
 )
 
 set(BS_BANSHEEEDITOR_SRC_WIN32
-	"Win32/BsVSCodeEditor.cpp"
-	"Win32/BsWin32BrowseDialogs.cpp"
+	"Private/Win32/BsVSCodeEditor.cpp"
+	"Private/Win32/BsWin32BrowseDialogs.cpp"
 )
 
 set(BS_BANSHEEEDITOR_SRC_LINUX
-	"Linux/BsLinuxBrowseDialogs.cpp"
+	"Private/Linux/BsLinuxBrowseDialogs.cpp"
 )
 
 set(BS_BANSHEEEDITOR_SRC_MACOS
-	"MacOS/BsMacOSBrowseDialogs.mm"
+	"Private/MacOS/BsMacOSBrowseDialogs.mm"
 	)
 
 if(WIN32)

+ 7 - 6
Source/EditorCore/CodeEditor/BsCodeEditor.cpp

@@ -9,7 +9,7 @@
 #include "CodeEditor/BsMDCodeEditor.h"
 
 #if BS_PLATFORM == BS_PLATFORM_WIN32
-#include "Win32/BsVSCodeEditor.h"
+#include "Private/Win32/BsVSCodeEditor.h"
 #else
 // Add implementations for code editors on other platforms.
 #endif
@@ -82,7 +82,8 @@ namespace bs
 		mActiveEditor->openFile(getSolutionPath(), filePath, lineNumber);
 	}
 
-	void CodeEditorManager::syncSolution() const
+	void CodeEditorManager::syncSolution(const String& gameProjectName, const CodeProjectReference& engineAssemblyRef, 
+			const CodeProjectReference& editorAssemblyRef) const
 	{
 		if (mActiveEditor == nullptr)
 			return;
@@ -105,11 +106,11 @@ namespace bs
 
 		// Game project
 		CodeProjectData& gameProject = slnData.projects[0];
-		gameProject.name = String(SCRIPT_GAME_ASSEMBLY);
+		gameProject.name = gameProjectName;
 		gameProject.defines = BuildManager::instance().getDefines(activePlatform);
 		
 		//// Add references
-		gameProject.assemblyReferences.push_back(CodeProjectReference{ String(ENGINE_ASSEMBLY), gApplication().getEngineAssemblyPath() });
+		gameProject.assemblyReferences.push_back(engineAssemblyRef);
 		for (auto& assemblyName : frameworkAssemblies)
 			gameProject.assemblyReferences.push_back(CodeProjectReference{ assemblyName, Path::BLANK });
 
@@ -118,8 +119,8 @@ namespace bs
 		editorProject.name = String(SCRIPT_EDITOR_ASSEMBLY);
 
 		//// Add references
-		editorProject.assemblyReferences.push_back(CodeProjectReference{ String(ENGINE_ASSEMBLY), gApplication().getEngineAssemblyPath() });
-		editorProject.assemblyReferences.push_back(CodeProjectReference{ String(EDITOR_ASSEMBLY), gEditorApplication().getEditorAssemblyPath() });
+		editorProject.assemblyReferences.push_back(engineAssemblyRef);
+		editorProject.assemblyReferences.push_back(editorAssemblyRef);
 		for (auto& assemblyName : frameworkAssemblies)
 			gameProject.assemblyReferences.push_back(CodeProjectReference{ assemblyName, Path::BLANK });
 

+ 2 - 1
Source/EditorCore/CodeEditor/BsCodeEditor.h

@@ -79,7 +79,8 @@ namespace bs
 		 * Synchronizes all code files and assemblies in the active project and updates the project solution for the active
 		 * editor. Each project can only have one solution per editor.
 		 */
-		void syncSolution() const;
+		void syncSolution(const String& gameProjectName, const CodeProjectReference& engineAssemblyRef, 
+			const CodeProjectReference& editorAssemblyRef) const;
 
 	private:
 		/**	Returns the absolute path at which the external editor solution file should be stored. */

+ 1 - 1
Source/EditorCore/EditorWindow/BsDockManagerLayout.cpp

@@ -1,7 +1,7 @@
 //********************************** Banshee Engine (www.banshee3d.com) **************************************************//
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
 #include "EditorWindow/BsDockManagerLayout.h"
-#include "RTTI/BsDockManagerLayoutRTTI.h"
+#include "Private/RTTI/BsDockManagerLayoutRTTI.h"
 #include "EditorWindow/BsEditorWidgetManager.h"
 
 namespace bs

+ 1 - 1
Source/EditorCore/EditorWindow/BsEditorWidgetLayout.cpp

@@ -1,7 +1,7 @@
 //********************************** Banshee Engine (www.banshee3d.com) **************************************************//
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
 #include "EditorWindow/BsEditorWidgetLayout.h"
-#include "RTTI/BsEditorWidgetLayoutRTTI.h"
+#include "Private/RTTI/BsEditorWidgetLayoutRTTI.h"
 
 namespace bs
 {

+ 1 - 1
Source/EditorCore/GUI/BsGUIWindowFrameWidget.cpp

@@ -1,7 +1,7 @@
 //********************************** Banshee Engine (www.banshee3d.com) **************************************************//
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
 #include "GUI/BsGUIWindowFrameWidget.h"
-#include "RTTI/BsGUIWindowFrameWidgetRTTI.h"
+#include "Private/RTTI/BsGUIWindowFrameWidgetRTTI.h"
 #include "GUI/BsGUIPanel.h"
 #include "GUI/BsCGUIWidget.h"
 #include "GUI/BsGUILayout.h"

+ 1 - 1
Source/EditorCore/Library/BsProjectLibraryEntries.cpp

@@ -1,7 +1,7 @@
 //********************************** Banshee Engine (www.banshee3d.com) **************************************************//
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
 #include "Library/BsProjectLibraryEntries.h"
-#include "RTTI/BsProjectLibraryEntriesRTTI.h"
+#include "Private/RTTI/BsProjectLibraryEntriesRTTI.h"
 
 namespace bs
 {

+ 1 - 1
Source/EditorCore/Library/BsProjectResourceMeta.cpp

@@ -1,7 +1,7 @@
 //********************************** Banshee Engine (www.banshee3d.com) **************************************************//
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
 #include "Library/BsProjectResourceMeta.h"
-#include "RTTI/BsProjectResourceMetaRTTI.h"
+#include "Private/RTTI/BsProjectResourceMetaRTTI.h"
 #include "String/BsUnicode.h"
 
 namespace bs

+ 0 - 0
Source/EditorCore/Linux/BsLinuxBrowseDialogs.cpp → Source/EditorCore/Private/Linux/BsLinuxBrowseDialogs.cpp


+ 0 - 0
Source/EditorCore/RTTI/BsBuildDataRTTI.h → Source/EditorCore/Private/RTTI/BsBuildDataRTTI.h


+ 0 - 0
Source/EditorCore/RTTI/BsDockManagerLayoutRTTI.h → Source/EditorCore/Private/RTTI/BsDockManagerLayoutRTTI.h


+ 0 - 0
Source/EditorCore/RTTI/BsEditorSettingsRTTI.h → Source/EditorCore/Private/RTTI/BsEditorSettingsRTTI.h


+ 0 - 0
Source/EditorCore/RTTI/BsEditorWidgetLayoutRTTI.h → Source/EditorCore/Private/RTTI/BsEditorWidgetLayoutRTTI.h


+ 0 - 0
Source/EditorCore/RTTI/BsGUIWindowFrameWidgetRTTI.h → Source/EditorCore/Private/RTTI/BsGUIWindowFrameWidgetRTTI.h


+ 0 - 0
Source/EditorCore/RTTI/BsPlatformInfoRTTI.h → Source/EditorCore/Private/RTTI/BsPlatformInfoRTTI.h


+ 0 - 0
Source/EditorCore/RTTI/BsProjectLibraryEntriesRTTI.h → Source/EditorCore/Private/RTTI/BsProjectLibraryEntriesRTTI.h


+ 0 - 0
Source/EditorCore/RTTI/BsProjectResourceMetaRTTI.h → Source/EditorCore/Private/RTTI/BsProjectResourceMetaRTTI.h


+ 0 - 0
Source/EditorCore/RTTI/BsProjectSettingsRTTI.h → Source/EditorCore/Private/RTTI/BsProjectSettingsRTTI.h


+ 0 - 0
Source/EditorCore/RTTI/BsSettingsRTTI.h → Source/EditorCore/Private/RTTI/BsSettingsRTTI.h


+ 0 - 0
Source/EditorCore/Win32/BsVSCodeEditor.cpp → Source/EditorCore/Private/Win32/BsVSCodeEditor.cpp


+ 0 - 0
Source/EditorCore/Win32/BsVSCodeEditor.h → Source/EditorCore/Private/Win32/BsVSCodeEditor.h


+ 0 - 0
Source/EditorCore/Win32/BsWin32BrowseDialogs.cpp → Source/EditorCore/Private/Win32/BsWin32BrowseDialogs.cpp


+ 0 - 0
Source/EditorCore/Win32/Setup.Configuration.h → Source/EditorCore/Private/Win32/Setup.Configuration.h


+ 0 - 0
Source/EditorCore/Win32/dte80a.tlh → Source/EditorCore/Private/Win32/dte80a.tlh


+ 0 - 0
Source/EditorCore/MacOS/BsMacOSBrowseDialogs.mm → Source/EditorCore/Private/macOS/BsMacOSBrowseDialogs.mm


+ 1 - 1
Source/EditorCore/Settings/BsEditorSettings.cpp

@@ -1,7 +1,7 @@
 //********************************** Banshee Engine (www.banshee3d.com) **************************************************//
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
 #include "Settings/BsEditorSettings.h"
-#include "RTTI/BsEditorSettingsRTTI.h"
+#include "Private/RTTI/BsEditorSettingsRTTI.h"
 
 namespace bs
 {

+ 1 - 1
Source/EditorCore/Settings/BsProjectSettings.cpp

@@ -1,7 +1,7 @@
 //********************************** Banshee Engine (www.banshee3d.com) **************************************************//
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
 #include "Settings/BsProjectSettings.h"
-#include "RTTI/BsProjectSettingsRTTI.h"
+#include "Private/RTTI/BsProjectSettingsRTTI.h"
 
 namespace bs
 {

+ 1 - 1
Source/EditorCore/Settings/BsSettings.cpp

@@ -1,7 +1,7 @@
 //********************************** Banshee Engine (www.banshee3d.com) **************************************************//
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
 #include "Settings/BsSettings.h"
-#include "RTTI/BsSettingsRTTI.h"
+#include "Private/RTTI/BsSettingsRTTI.h"
 
 namespace bs
 {

+ 22 - 0
Source/EditorManaged/CMakeLists.txt

@@ -0,0 +1,22 @@
+# Generate the CS project file
+generate_csharp_project(${PROJECT_SOURCE_DIR}/Source/EditorManaged MBansheeEditor BansheeEditor MBansheeEditor)
+
+# Include the CS project in the build
+set(BS_CS_PROJ "MBansheeEditor.csproj")
+
+if(MSVC)
+	include_external_msproject(MBansheeEditor ${CMAKE_CURRENT_SOURCE_DIR}/${BS_CS_PROJ})
+	set_property(TARGET MBansheeEditor PROPERTY FOLDER Script)
+else()
+	find_package(mcs)
+
+	if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
+		set(CS_PROJ_CONFIG Debug)
+	else()
+		set(CS_PROJ_CONFIG Release)
+	endif()
+
+	add_custom_target(MBansheeEditor
+			COMMAND xbuild /p:Configuration=${CS_PROJ_CONFIG} ${BS_CS_PROJ}
+			COMMENT "Building managed assembly \"MBansheeEditor\"")
+endif()

+ 0 - 0
Source/Scripting/MBansheeEditor/GUI/EditorStyles.cs → Source/EditorManaged/GUI/EditorStyles.cs


+ 0 - 0
Source/Scripting/MBansheeEditor/GUI/GUIColorDistributionField.cs → Source/EditorManaged/GUI/GUIColorDistributionField.cs


+ 0 - 0
Source/Scripting/MBansheeEditor/GUI/GUIColorField.cs → Source/EditorManaged/GUI/GUIColorField.cs


+ 0 - 0
Source/Scripting/MBansheeEditor/GUI/GUIColorGradient.cs → Source/EditorManaged/GUI/GUIColorGradient.cs


+ 0 - 0
Source/Scripting/MBansheeEditor/GUI/GUIColorGradientField.cs → Source/EditorManaged/GUI/GUIColorGradientField.cs


+ 0 - 0
Source/Scripting/MBansheeEditor/GUI/GUICurvesField.cs → Source/EditorManaged/GUI/GUICurvesField.cs


+ 0 - 0
Source/Scripting/MBansheeEditor/GUI/GUIDictionaryField.cs → Source/EditorManaged/GUI/GUIDictionaryField.cs


+ 0 - 0
Source/Scripting/MBansheeEditor/GUI/GUIEnumField.cs → Source/EditorManaged/GUI/GUIEnumField.cs


+ 0 - 0
Source/Scripting/MBansheeEditor/GUI/GUIFloatDistributionField.cs → Source/EditorManaged/GUI/GUIFloatDistributionField.cs


+ 0 - 0
Source/Scripting/MBansheeEditor/GUI/GUIFloatField.cs → Source/EditorManaged/GUI/GUIFloatField.cs


+ 0 - 0
Source/Scripting/MBansheeEditor/GUI/GUIGameObjectField.cs → Source/EditorManaged/GUI/GUIGameObjectField.cs


+ 0 - 0
Source/Scripting/MBansheeEditor/GUI/GUIIntField.cs → Source/EditorManaged/GUI/GUIIntField.cs


+ 0 - 0
Source/Scripting/MBansheeEditor/GUI/GUIListBoxField.cs → Source/EditorManaged/GUI/GUIListBoxField.cs


+ 0 - 0
Source/Scripting/MBansheeEditor/GUI/GUIListField.cs → Source/EditorManaged/GUI/GUIListField.cs


+ 0 - 0
Source/Scripting/MBansheeEditor/GUI/GUIResourceField.cs → Source/EditorManaged/GUI/GUIResourceField.cs


+ 0 - 0
Source/Scripting/MBansheeEditor/GUI/GUISceneTreeView.cs → Source/EditorManaged/GUI/GUISceneTreeView.cs


+ 0 - 0
Source/Scripting/MBansheeEditor/GUI/GUISliderField.cs → Source/EditorManaged/GUI/GUISliderField.cs


+ 0 - 0
Source/Scripting/MBansheeEditor/GUI/GUITextField.cs → Source/EditorManaged/GUI/GUITextField.cs


+ 0 - 0
Source/Scripting/MBansheeEditor/GUI/GUITextureField.cs → Source/EditorManaged/GUI/GUITextureField.cs


+ 0 - 0
Source/Scripting/MBansheeEditor/GUI/GUIToggleField.cs → Source/EditorManaged/GUI/GUIToggleField.cs


+ 0 - 0
Source/Scripting/MBansheeEditor/GUI/GUIVector2DistributionField.cs → Source/EditorManaged/GUI/GUIVector2DistributionField.cs


+ 0 - 0
Source/Scripting/MBansheeEditor/GUI/GUIVector2Field.cs → Source/EditorManaged/GUI/GUIVector2Field.cs


+ 0 - 0
Source/Scripting/MBansheeEditor/GUI/GUIVector3DistributionField.cs → Source/EditorManaged/GUI/GUIVector3DistributionField.cs


+ 0 - 0
Source/Scripting/MBansheeEditor/GUI/GUIVector3Field.cs → Source/EditorManaged/GUI/GUIVector3Field.cs


+ 0 - 0
Source/Scripting/MBansheeEditor/GUI/GUIVector4Field.cs → Source/EditorManaged/GUI/GUIVector4Field.cs


+ 0 - 0
Source/Scripting/MBansheeEditor/GUI/LocEdString.cs → Source/EditorManaged/GUI/LocEdString.cs


+ 0 - 0
Source/Scripting/MBansheeEditor/General/EditorApplication.cs → Source/EditorManaged/General/EditorApplication.cs


+ 0 - 0
Source/Scripting/MBansheeEditor/General/EditorPersistentData.cs → Source/EditorManaged/General/EditorPersistentData.cs


+ 0 - 0
Source/Scripting/MBansheeEditor/General/IGlobalShortcuts.cs → Source/EditorManaged/General/IGlobalShortcuts.cs


+ 0 - 0
Source/Scripting/MBansheeEditor/General/Program.cs → Source/EditorManaged/General/Program.cs


+ 0 - 0
Source/Scripting/MBansheeEditor/General/Selection.cs → Source/EditorManaged/General/Selection.cs


+ 2 - 0
Source/Scripting/MBansheeEditor/Generated/CurveDrawInfo.generated.cs → Source/EditorManaged/Generated/CurveDrawInfo.generated.cs

@@ -1,3 +1,5 @@
+//********************************** Banshee Engine (www.banshee3d.com) **************************************************//
+//************** Copyright (c) 2016-2019 Marko Pintera ([email protected]). All rights reserved. *******************//
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

+ 4 - 1
Source/Scripting/MBansheeEngine/Generated/CurveDrawOption.generated.cs → Source/EditorManaged/Generated/CurveDrawOption.generated.cs

@@ -1,8 +1,11 @@
+//********************************** Banshee Engine (www.banshee3d.com) **************************************************//
+//************** Copyright (c) 2016-2019 Marko Pintera ([email protected]). All rights reserved. *******************//
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using BansheeEngine;
 
-namespace BansheeEngine
+namespace BansheeEditor
 {
 	/** @addtogroup GUIEditor
 	 *  @{

+ 2 - 0
Source/Scripting/MBansheeEditor/Generated/GUIColorDistributionField.generated.cs → Source/EditorManaged/Generated/GUIColorDistributionField.generated.cs

@@ -1,3 +1,5 @@
+//********************************** Banshee Engine (www.banshee3d.com) **************************************************//
+//************** Copyright (c) 2016-2019 Marko Pintera ([email protected]). All rights reserved. *******************//
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

+ 2 - 0
Source/Scripting/MBansheeEditor/Generated/GUIColorGradient.generated.cs → Source/EditorManaged/Generated/GUIColorGradient.generated.cs

@@ -1,3 +1,5 @@
+//********************************** Banshee Engine (www.banshee3d.com) **************************************************//
+//************** Copyright (c) 2016-2019 Marko Pintera ([email protected]). All rights reserved. *******************//
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

+ 2 - 0
Source/Scripting/MBansheeEditor/Generated/GUIColorGradientField.generated.cs → Source/EditorManaged/Generated/GUIColorGradientField.generated.cs

@@ -1,3 +1,5 @@
+//********************************** Banshee Engine (www.banshee3d.com) **************************************************//
+//************** Copyright (c) 2016-2019 Marko Pintera ([email protected]). All rights reserved. *******************//
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

+ 2 - 0
Source/Scripting/MBansheeEditor/Generated/GUICurves.generated.cs → Source/EditorManaged/Generated/GUICurves.generated.cs

@@ -1,3 +1,5 @@
+//********************************** Banshee Engine (www.banshee3d.com) **************************************************//
+//************** Copyright (c) 2016-2019 Marko Pintera ([email protected]). All rights reserved. *******************//
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

+ 2 - 0
Source/Scripting/MBansheeEditor/Generated/GUICurvesField.generated.cs → Source/EditorManaged/Generated/GUICurvesField.generated.cs

@@ -1,3 +1,5 @@
+//********************************** Banshee Engine (www.banshee3d.com) **************************************************//
+//************** Copyright (c) 2016-2019 Marko Pintera ([email protected]). All rights reserved. *******************//
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

+ 2 - 0
Source/Scripting/MBansheeEditor/Generated/GUIFloatDistributionField.generated.cs → Source/EditorManaged/Generated/GUIFloatDistributionField.generated.cs

@@ -1,3 +1,5 @@
+//********************************** Banshee Engine (www.banshee3d.com) **************************************************//
+//************** Copyright (c) 2016-2019 Marko Pintera ([email protected]). All rights reserved. *******************//
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

+ 2 - 0
Source/Scripting/MBansheeEditor/Generated/GUIGraphTicks.generated.cs → Source/EditorManaged/Generated/GUIGraphTicks.generated.cs

@@ -1,3 +1,5 @@
+//********************************** Banshee Engine (www.banshee3d.com) **************************************************//
+//************** Copyright (c) 2016-2019 Marko Pintera ([email protected]). All rights reserved. *******************//
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

+ 4 - 1
Source/Scripting/MBansheeEngine/Generated/GUITickStepType.generated.cs → Source/EditorManaged/Generated/GUITickStepType.generated.cs

@@ -1,8 +1,11 @@
+//********************************** Banshee Engine (www.banshee3d.com) **************************************************//
+//************** Copyright (c) 2016-2019 Marko Pintera ([email protected]). All rights reserved. *******************//
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using BansheeEngine;
 
-namespace BansheeEngine
+namespace BansheeEditor
 {
 	/** @addtogroup GUIEditor
 	 *  @{

+ 2 - 0
Source/Scripting/MBansheeEditor/Generated/GUITimeline.generated.cs → Source/EditorManaged/Generated/GUITimeline.generated.cs

@@ -1,3 +1,5 @@
+//********************************** Banshee Engine (www.banshee3d.com) **************************************************//
+//************** Copyright (c) 2016-2019 Marko Pintera ([email protected]). All rights reserved. *******************//
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

+ 2 - 0
Source/Scripting/MBansheeEditor/Generated/GUIVector2DistributionField.generated.cs → Source/EditorManaged/Generated/GUIVector2DistributionField.generated.cs

@@ -1,3 +1,5 @@
+//********************************** Banshee Engine (www.banshee3d.com) **************************************************//
+//************** Copyright (c) 2016-2019 Marko Pintera ([email protected]). All rights reserved. *******************//
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

+ 2 - 0
Source/Scripting/MBansheeEditor/Generated/GUIVector3DistributionField.generated.cs → Source/EditorManaged/Generated/GUIVector3DistributionField.generated.cs

@@ -1,3 +1,5 @@
+//********************************** Banshee Engine (www.banshee3d.com) **************************************************//
+//************** Copyright (c) 2016-2019 Marko Pintera ([email protected]). All rights reserved. *******************//
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

+ 2 - 0
Source/Scripting/MBansheeEditor/Generated/ProjectResourceIcons.generated.cs → Source/EditorManaged/Generated/ProjectResourceIcons.generated.cs

@@ -1,3 +1,5 @@
+//********************************** Banshee Engine (www.banshee3d.com) **************************************************//
+//************** Copyright (c) 2016-2019 Marko Pintera ([email protected]). All rights reserved. *******************//
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

+ 0 - 0
Source/Scripting/MBansheeEditor/Input/EditorInput.cs → Source/EditorManaged/Input/EditorInput.cs


+ 0 - 0
Source/Scripting/MBansheeEditor/Input/EditorVirtualInput.cs → Source/EditorManaged/Input/EditorVirtualInput.cs


+ 0 - 0
Source/Scripting/MBansheeEditor/Inspectors/AnimationClipInspector.cs → Source/EditorManaged/Inspectors/AnimationClipInspector.cs


+ 0 - 0
Source/Scripting/MBansheeEditor/Inspectors/AnimationInspector.cs → Source/EditorManaged/Inspectors/AnimationInspector.cs


+ 0 - 0
Source/Scripting/MBansheeEditor/Inspectors/AudioClipInspector.cs → Source/EditorManaged/Inspectors/AudioClipInspector.cs


+ 0 - 0
Source/Scripting/MBansheeEditor/Inspectors/AudioListenerInspector.cs → Source/EditorManaged/Inspectors/AudioListenerInspector.cs


+ 0 - 0
Source/Scripting/MBansheeEditor/Inspectors/AudioSourceInspector.cs → Source/EditorManaged/Inspectors/AudioSourceInspector.cs


+ 0 - 0
Source/Scripting/MBansheeEditor/Inspectors/BoneInspector.cs → Source/EditorManaged/Inspectors/BoneInspector.cs


+ 0 - 0
Source/Scripting/MBansheeEditor/Inspectors/BoxColliderInspector.cs → Source/EditorManaged/Inspectors/BoxColliderInspector.cs


+ 0 - 0
Source/Scripting/MBansheeEditor/Inspectors/CameraInspector.cs → Source/EditorManaged/Inspectors/CameraInspector.cs


+ 0 - 0
Source/Scripting/MBansheeEditor/Inspectors/CapsuleColliderInspector.cs → Source/EditorManaged/Inspectors/CapsuleColliderInspector.cs


+ 0 - 0
Source/Scripting/MBansheeEditor/Inspectors/CharacterControllerInspector.cs → Source/EditorManaged/Inspectors/CharacterControllerInspector.cs


+ 0 - 0
Source/Scripting/MBansheeEditor/Inspectors/ColliderInspector.cs → Source/EditorManaged/Inspectors/ColliderInspector.cs


+ 0 - 0
Source/Scripting/MBansheeEditor/Inspectors/D6JointInspector.cs → Source/EditorManaged/Inspectors/D6JointInspector.cs


+ 0 - 0
Source/Scripting/MBansheeEditor/Inspectors/DistanceJointInspector.cs → Source/EditorManaged/Inspectors/DistanceJointInspector.cs


+ 0 - 0
Source/Scripting/MBansheeEditor/Inspectors/FixedJointInspector.cs → Source/EditorManaged/Inspectors/FixedJointInspector.cs


+ 0 - 0
Source/Scripting/MBansheeEditor/Inspectors/FontInspector.cs → Source/EditorManaged/Inspectors/FontInspector.cs


Some files were not shown because too many files changed in this diff