Merge branch 'development' of https://github.com/vvv-yeaf/Torque3D into development

Engine/source/T3D/assets/ShapeAsset.cpp

@@ -207,8 +207,9 @@ void ShapeAsset::initializeAsset()
    //Ensure our path is expando'd if it isn't already
    mFilePath = getOwned() ? expandAssetFilePath(mFileName) : mFilePath;
 
-   mConstructorFilePath = getOwned() ? expandAssetFilePath(mConstructorFilePath) : mConstructorFilePath;
+   mConstructorFilePath = getOwned() ? expandAssetFilePath(mConstructorFileName) : mConstructorFilePath;
-
+   if (!Torque::FS::IsFile(mConstructorFilePath))
+      Con::errorf("ShapeAsset::initializeAsset (%s) could not find %s!", getAssetName(), mConstructorFilePath);
    mDiffuseImposterPath = getOwned() ? expandAssetFilePath(mDiffuseImposterFileName) : mDiffuseImposterFileName;
    if (mDiffuseImposterPath == StringTable->EmptyString())
    {

Templates/BaseGame/game/core/console/guis/console.gui

@@ -1,80 +1,214 @@
 //--- OBJECT WRITE BEGIN ---
 $guiContent = new GuiControl(ConsoleDlg) {
+   position = "0 0";
    extent = "1024 768";
    minExtent = "8 8";
+   horizSizing = "right";
+   vertSizing = "bottom";
    profile = "GuiConsoleProfile";
+   visible = "1";
+   active = "1";
    tooltipProfile = "GuiConsoleProfile";
+   hovertime = "1000";
    isContainer = "1";
+   canSave = "1";
    canSaveDynamicFields = "1";
       helpTag = "0";
 
    new GuiConsoleEditCtrl(ConsoleEntry) {
+      useSiblingScroller = "1";
       historySize = "40";
+      tabComplete = "0";
+      sinkAllKeyEvents = "1";
+      password = "0";
+      passwordMask = "*";
       maxLength = "255";
-      position = "0 751";
+      margin = "0 0 0 0";
-      extent = "1024 16";
+      padding = "0 0 0 0";
+      anchorTop = "1";
+      anchorBottom = "0";
+      anchorLeft = "1";
+      anchorRight = "0";
+      position = "0 750";
+      extent = "1024 18";
       minExtent = "8 8";
       horizSizing = "width";
       vertSizing = "top";
       profile = "ConsoleTextEditProfile";
+      visible = "1";
+      active = "1";
       altCommand = "ConsoleEntry::eval();";
       tooltipProfile = "GuiConsoleProfile";
+      hovertime = "1000";
+      isContainer = "1";
+      canSave = "1";
+      canSaveDynamicFields = "0";
+   };
+   new GuiContainer() {
+      margin = "0 0 0 0";
+      padding = "0 0 0 0";
+      anchorTop = "1";
+      anchorBottom = "0";
+      anchorLeft = "1";
+      anchorRight = "0";
+      position = "1 728";
+      extent = "1024 22";
+      minExtent = "8 2";
+      horizSizing = "width";
+      vertSizing = "top";
+      profile = "GuiDefaultProfile";
+      visible = "1";
+      active = "1";
+      tooltipProfile = "GuiToolTipProfile";
+      hovertime = "1000";
+      isContainer = "1";
+      canSave = "1";
+      canSaveDynamicFields = "0";
+
+      new GuiBitmapCtrl() {
+         bitmapAsset = "Core_GUI:hudFill";
+         color = "40 40 40 255";
+         wrap = "0";
+         position = "0 0";
+         extent = "1024 22";
+         minExtent = "8 2";
+         horizSizing = "width";
+         vertSizing = "bottom";
+         profile = "GuiDefaultProfile";
+         visible = "1";
+         active = "1";
+         tooltipProfile = "GuiToolTipProfile";
+         hovertime = "1000";
+         isContainer = "0";
+         canSave = "1";
+         canSaveDynamicFields = "0";
+      };
+      new GuiCheckBoxCtrl(ConsoleDlgErrorFilterBtn) {
+         text = "Errors";
+         groupNum = "-1";
+         buttonType = "ToggleButton";
+         useMouseEvents = "0";
+         position = "2 2";
+         extent = "113 20";
+         minExtent = "8 2";
+         horizSizing = "right";
+         vertSizing = "bottom";
+         profile = "GuiCheckBoxProfile";
+         visible = "1";
+         active = "1";
+         tooltipProfile = "GuiToolTipProfile";
+         hovertime = "1000";
+         isContainer = "0";
+         canSave = "1";
+         canSaveDynamicFields = "0";
+      };
+      new GuiCheckBoxCtrl(ConsoleDlgWarnFilterBtn) {
+         text = "Warnings";
+         groupNum = "-1";
+         buttonType = "ToggleButton";
+         useMouseEvents = "0";
+         position = "119 2";
+         extent = "113 20";
+         minExtent = "8 2";
+         horizSizing = "right";
+         vertSizing = "bottom";
+         profile = "GuiCheckBoxProfile";
+         visible = "1";
+         active = "1";
+         tooltipProfile = "GuiToolTipProfile";
+         hovertime = "1000";
+         isContainer = "0";
+         canSave = "1";
+         canSaveDynamicFields = "0";
+      };
+      new GuiCheckBoxCtrl(ConsoleDlgNormalFilterBtn) {
+         text = "Normal Messages";
+         groupNum = "-1";
+         buttonType = "ToggleButton";
+         useMouseEvents = "0";
+         position = "236 2";
+         extent = "113 20";
+         minExtent = "8 2";
+         horizSizing = "right";
+         vertSizing = "bottom";
+         profile = "GuiCheckBoxProfile";
+         visible = "1";
+         active = "1";
+         tooltipProfile = "GuiToolTipProfile";
+         hovertime = "1000";
+         isContainer = "0";
+         canSave = "1";
+         canSaveDynamicFields = "0";
+      };
+      new GuiSliderCtrl(ConsoleDlgBgAlphaSlider) {
+         range = "0 1";
+         ticks = "10";
+         snap = "0";
+         value = "0.65";
+         useFillBar = "0";
+         fillBarColor = "40 40 40 255";
+         renderTicks = "1";
+         position = "361 4";
+         extent = "106 14";
+         minExtent = "8 2";
+         horizSizing = "right";
+         vertSizing = "bottom";
+         profile = "GuiSliderProfile";
+         visible = "1";
+         active = "1";
+         command = "ConsoleDlg::setalpha(ConsoleDlgBgAlphaSlider, ConsoleDlgBgAlphaSlider.value);";
+         tooltipProfile = "GuiToolTipProfile";
+         hovertime = "1000";
+         isContainer = "0";
+         canSave = "1";
+         canSaveDynamicFields = "0";
+      };
    };
    new GuiScrollCtrl() {
-      position = "0 6";
+      willFirstRespond = "1";
-      extent = "1024 724";
+      hScrollBar = "alwaysOn";
+      vScrollBar = "alwaysOn";
+      lockHorizScroll = "0";
+      lockVertScroll = "0";
+      constantThumbHeight = "0";
+      childMargin = "0 0";
+      mouseWheelScrollSpeed = "-1";
+      margin = "0 0 0 0";
+      padding = "0 0 0 0";
+      anchorTop = "1";
+      anchorBottom = "0";
+      anchorLeft = "1";
+      anchorRight = "0";
+      position = "0 0";
+      extent = "1024 730";
       minExtent = "8 8";
       horizSizing = "width";
       vertSizing = "height";
       profile = "ConsoleScrollProfile";
+      visible = "1";
+      active = "1";
       tooltipProfile = "GuiConsoleProfile";
+      hovertime = "1000";
+      isContainer = "1";
       internalName = "Scroll";
+      canSave = "1";
+      canSaveDynamicFields = "0";
 
       new GuiConsole(ConsoleMessageLogView) {
-         position = "1 -6538";
+         position = "1 1";
-         extent = "1994 7248";
+         extent = "622 324";
+         minExtent = "8 2";
+         horizSizing = "right";
+         vertSizing = "bottom";
          profile = "GuiConsoleProfile";
+         visible = "1";
+         active = "1";
          tooltipProfile = "GuiConsoleProfile";
+         hovertime = "1000";
+         isContainer = "1";
+         canSave = "1";
+         canSaveDynamicFields = "0";
       };
    };
-   new GuiBitmapCtrl() {
-      BitmapAsset = "Core_GUI:hudfill";
-      color = "40 40 40 255";
-      position = "0 729";
-      extent = "1025 22";
-      horizSizing = "width";
-      profile = "GuiConsoleProfile";
-      tooltipProfile = "GuiConsoleProfile";
-   };
-   new GuiSliderCtrl(ConsoleDlgBgAlphaSlider) {
-      value = "0.65";
-      fillBarColor = "40 40 40 255";
-      position = "404 732";
-      extent = "106 14";
-      profile = "GuiSliderProfile";
-      command = "ConsoleDlg::setalpha(ConsoleDlgBgAlphaSlider, ConsoleDlgBgAlphaSlider.value);";
-      tooltipProfile = "GuiConsoleProfile";
-   };
-   new GuiCheckBoxCtrl(ConsoleDlgNormalFilterBtn) {
-      text = "(266) Messages";
-      position = "245 730";
-      extent = "113 20";
-      profile = "GuiCheckBoxProfile";
-      tooltipProfile = "GuiConsoleProfile";
-   };
-   new GuiCheckBoxCtrl(ConsoleDlgWarnFilterBtn) {
-      text = "(144) Warnings";
-      position = "117 730";
-      extent = "113 20";
-      profile = "GuiCheckBoxProfile";
-      tooltipProfile = "GuiConsoleProfile";
-   };
-   new GuiCheckBoxCtrl(ConsoleDlgErrorFilterBtn) {
-      text = "(43) Errors";
-      position = "10 730";
-      extent = "113 20";
-      profile = "GuiCheckBoxProfile";
-      tooltipProfile = "GuiConsoleProfile";
-   };
 };
-//--- OBJECT WRITE END ---
+//--- OBJECT WRITE END ---