From df37c29002f139d4a2f3a8cf4f6d2e4acce04c02 Mon Sep 17 00:00:00 2001 From: Victor Chelaru Date: Mon, 1 Dec 2014 19:24:18 +0000 Subject: [PATCH] Fixed filename error. Fixed add to manager issuue in Gum. --- ContentLibrary/ContentLibrary.csproj | 11 +++++++++++ ...ameObjectManager.RepresentationCreation.cs | 9 +++++++++ InputLibrary/InputLibrary.csproj | 18 ++++++++++++++++++ RenderingLibrary/RenderingLibrary.csproj | 18 ++++++++++++++++++ ToolsUtilities/FileManager.cs | 2 +- ToolsUtilities/ToolsUtilities.csproj | 19 +++++++++++++++++++ XnaAndWinforms/XnaAndWinforms.csproj | 18 ++++++++++++++++++ 7 files changed, 94 insertions(+), 1 deletion(-) diff --git a/ContentLibrary/ContentLibrary.csproj b/ContentLibrary/ContentLibrary.csproj index a5648765..45cb3dab 100644 --- a/ContentLibrary/ContentLibrary.csproj +++ b/ContentLibrary/ContentLibrary.csproj @@ -43,6 +43,17 @@ x86 true + + true + bin\x86\AutomatedBuild\ + DEBUG;TRACE;WINDOWS + true + full + x86 + false + prompt + MinimumRecommendedRules.ruleset + False diff --git a/Gum/Wireframe/WireframeObjectManager.RepresentationCreation.cs b/Gum/Wireframe/WireframeObjectManager.RepresentationCreation.cs index de7cbd3d..eb111d5e 100644 --- a/Gum/Wireframe/WireframeObjectManager.RepresentationCreation.cs +++ b/Gum/Wireframe/WireframeObjectManager.RepresentationCreation.cs @@ -184,6 +184,15 @@ private GraphicalUiElement CreateIpsoForElement(ElementSave elementSave) if (rootIpso != null) { rootIpso.AddToManagers(); + + if (rootIpso.ElementSave is ScreenSave) + { + // If it's a screen and it hasn't been added yet, we need to add it. + foreach (var item in rootIpso.ContainedElements.Where(candidate=>candidate.Managers == null)) + { + item.AddToManagers(); + } + } } return rootIpso; diff --git a/InputLibrary/InputLibrary.csproj b/InputLibrary/InputLibrary.csproj index 7c35b73d..c2ff0eb9 100644 --- a/InputLibrary/InputLibrary.csproj +++ b/InputLibrary/InputLibrary.csproj @@ -48,6 +48,24 @@ x86 prompt + + true + bin\AutomatedBuild\ + DEBUG;TRACE + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + + + true + bin\x86\AutomatedBuild\ + DEBUG;TRACE + full + x86 + prompt + MinimumRecommendedRules.ruleset + diff --git a/RenderingLibrary/RenderingLibrary.csproj b/RenderingLibrary/RenderingLibrary.csproj index e1e0011c..8ce9ec45 100644 --- a/RenderingLibrary/RenderingLibrary.csproj +++ b/RenderingLibrary/RenderingLibrary.csproj @@ -68,6 +68,24 @@ x86 prompt + + true + bin\AutomatedBuild\ + TRACE;DEBUG;RENDERING_LIB_SUPPORTS_TGA + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + + + true + bin\x86\AutomatedBuild\ + DEBUG;TRACE + full + x86 + prompt + MinimumRecommendedRules.ruleset + diff --git a/ToolsUtilities/FileManager.cs b/ToolsUtilities/FileManager.cs index 82b444e5..89839712 100644 --- a/ToolsUtilities/FileManager.cs +++ b/ToolsUtilities/FileManager.cs @@ -196,7 +196,7 @@ public static bool FileExists(string fileName, bool ignoreExtensions) #if ANDROID try { - var filename = Standardize(fileName); + fileName = Standardize(fileName); if(fileName.StartsWith(".\\")) { fileName = fileName.Substring(2); diff --git a/ToolsUtilities/ToolsUtilities.csproj b/ToolsUtilities/ToolsUtilities.csproj index 36a9cf02..6464e0f9 100644 --- a/ToolsUtilities/ToolsUtilities.csproj +++ b/ToolsUtilities/ToolsUtilities.csproj @@ -50,6 +50,25 @@ false false + + true + bin\AutomatedBuild\ + DEBUG;TRACE + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + + + true + bin\x86\AutomatedBuild\ + DEBUG;TRACE + full + x86 + prompt + MinimumRecommendedRules.ruleset + false + diff --git a/XnaAndWinforms/XnaAndWinforms.csproj b/XnaAndWinforms/XnaAndWinforms.csproj index c53df3ad..ac370b0b 100644 --- a/XnaAndWinforms/XnaAndWinforms.csproj +++ b/XnaAndWinforms/XnaAndWinforms.csproj @@ -50,6 +50,24 @@ true true + + true + bin\AutomatedBuild\ + DEBUG;TRACE + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + + + true + bin\x86\AutomatedBuild\ + DEBUG;TRACE + full + x86 + prompt + MinimumRecommendedRules.ruleset +