Merge branch 'ueberengine-dev' into ueberengine-master

Engine/source/T3D/decal/decalData.cpp

@@ -284,6 +284,7 @@ void DecalData::unpackData( BitStream *stream )
    Parent::unpackData( stream );
 
    stream->read( &lookupName );
+   assignName(lookupName);
    stream->read( &size );  
    stream->read( &materialName );
    _updateMaterial();

Engine/source/T3D/fps/guiCrossHairHud.cpp

@@ -118,7 +118,8 @@ void GuiCrossHairHud::onRender(Point2I offset, const RectI &updateRect)
    if (!conn)
       return;
    ShapeBase* control = dynamic_cast<ShapeBase*>(conn->getControlObject());
-   if (!control || !(control->getTypeMask() & ObjectMask) || !conn->isFirstPerson())
+   //if (!control || !(control->getTypeMask() & ObjectMask) || !conn->isFirstPerson()) //original
+   if   (!control || !(control->getTypeMask() & ObjectMask)) //Duion: Modified to show crosshair in third person
       return;
 
    // Parent render.

Engine/source/app/version.h

@@ -42,10 +42,10 @@
 /// code version, the game name, and which type of game it is (TGB, TGE, TGEA, etc.).
 ///
 /// Version number is major * 1000 + minor * 100 + revision * 10.
-#define TORQUE_GAME_ENGINE          1030
+#define TORQUE_GAME_ENGINE          1040
 
 /// Human readable engine version string.
-#define TORQUE_GAME_ENGINE_VERSION_STRING  "1.0.3.0"
+#define TORQUE_GAME_ENGINE_VERSION_STRING  "1.0.4.0"
 
 /// Gets the engine version number.  The version number is specified as a global in version.cc
 U32 getVersionNumber();

Engine/source/gfx/gfxTextureManager.cpp

@@ -42,9 +42,9 @@ using namespace Torque;
 
 S32 GFXTextureManager::smTextureReductionLevel = 0;
 
-String GFXTextureManager::smMissingTexturePath("core/art/missingTexture");
-String GFXTextureManager::smUnavailableTexturePath("core/art/unavailable");
-String GFXTextureManager::smWarningTexturePath("core/art/warnmat");
+String GFXTextureManager::smMissingTexturePath("art/core/missingTexture");
+String GFXTextureManager::smUnavailableTexturePath("art/core/unavailable");
+String GFXTextureManager::smWarningTexturePath("art/core/warnMat");
 
 GFXTextureManager::EventSignal GFXTextureManager::smEventSignal;
 

Engine/source/platformSDL/menus/menuBarSDL.cpp

@@ -39,7 +39,7 @@
 
 // class PlatformMenuBarData
 // {
-// 
+//
 // };
 
 Map<GuiMenuBar::Menu*, PopupMenu*> PlatformPopupMenuData::mMenuMap;
@@ -91,8 +91,8 @@ GuiPlatformGenericMenuBar* _FindMenuBarCtrl()
    GuiControl* control;
    Sim::findObject("PlatformGenericMenubar", control);
    AssertFatal(control, "");
-   if( !control )      
-      return NULL;   
+   if( !control )
+      return NULL;
 
    GuiPlatformGenericMenuBar* menuBar;
    menuBar = dynamic_cast<GuiPlatformGenericMenuBar*>( control->findObjectByInternalName(  StringTable->insert("menubar"), true) );
@@ -104,7 +104,7 @@ GuiPlatformGenericMenuBar* _FindMenuBarCtrl()
 void MenuBar::updateMenuBar(PopupMenu *popupMenu /* = NULL */)
 {
    //if(! isAttachedToCanvas())
-   //   return;   
+   //   return;
 
    if(!popupMenu)
       return;
@@ -156,7 +156,7 @@ void MenuBar::attachToCanvas(GuiCanvas *owner, S32 pos)
    mCanvas = owner;
 
    PlatformWindowSDL *pWindow = dynamic_cast<PlatformWindowSDL*>(owner->getPlatformWindow());
-   if(pWindow == NULL) 
+   if(pWindow == NULL)
       return;
 
    // Setup the native menu bar
@@ -168,15 +168,15 @@ void MenuBar::attachToCanvas(GuiCanvas *owner, S32 pos)
    {
       pWindow->setMenuHandle( hWindowMenu );
       GuiControl *base = hWindowMenu->getParent();
-         
+
       while( base->getParent() )
       {
          base = base->getParent();
-      }         
+      }
 
       mCanvas->setMenuBar( base );
    }
-
+#ifndef TORQUE_DEDICATED
    for (S32 i = 0; i < size(); ++i)
    {
       PopupMenu *mnu = dynamic_cast<PopupMenu *>(at(i));
@@ -191,7 +191,7 @@ void MenuBar::attachToCanvas(GuiCanvas *owner, S32 pos)
 
       mnu->attachToMenuBar(owner, pos + i);
    }
-   
+#endif
 }
 
 void MenuBar::removeFromCanvas()
@@ -201,6 +201,7 @@ void MenuBar::removeFromCanvas()
 
    //_FindMenuBarCtrl()->clearMenus();
 
+#ifndef TORQUE_DEDICATED
    // Add the items
    for (S32 i = 0; i < size(); ++i)
    {
@@ -215,6 +216,7 @@ void MenuBar::removeFromCanvas()
    }
 
    mCanvas->setMenuBar(NULL);
+#endif
 
    mCanvas = NULL;
 }

Engine/source/ts/tsShapeConstruct.cpp

@@ -74,9 +74,9 @@ EndImplementEnumType;
 
 //-----------------------------------------------------------------------------
 
-String TSShapeConstructor::smCapsuleShapePath("core/art/shapes/unit_capsule.dts");
-String TSShapeConstructor::smCubeShapePath("core/art/shapes/unit_cube.dts");
-String TSShapeConstructor::smSphereShapePath("core/art/shapes/unit_sphere.dts");
+String TSShapeConstructor::smCapsuleShapePath("art/core/shapes/unit_capsule.dts");
+String TSShapeConstructor::smCubeShapePath("art/core/shapes/unit_cube.dts");
+String TSShapeConstructor::smSphereShapePath("art/core/shapes/unit_sphere.dts");
 
 ResourceRegisterPostLoadSignal< TSShape > TSShapeConstructor::_smAutoLoad( &TSShapeConstructor::_onTSShapeLoaded );
 ResourceRegisterUnloadSignal< TSShape > TSShapeConstructor::_smAutoUnload( &TSShapeConstructor::_onTSShapeUnloaded );

Tools/CMake/modules/module_dedicated.cmake

@@ -0,0 +1,29 @@
+# -----------------------------------------------------------------------------
+# Copyright (c) 2014 GarageGames, LLC
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+# -----------------------------------------------------------------------------
+
+option(TORQUE_DEDICATED "Dedicated Server" OFF)
+mark_as_advanced(TORQUE_DEDICATED)
+
+if(TORQUE_DEDICATED)
+    # Project defines
+    addDef( "TORQUE_DEDICATED" )
+endif()

Tools/CMake/torque3d.cmake

@@ -80,7 +80,6 @@ if(WIN32)
 	#mark_as_advanced(TORQUE_OPENGL)
 else()
 	set(TORQUE_OPENGL ON) # we need OpenGL to render on Linux/Mac
-	option(TORQUE_DEDICATED "Torque dedicated" OFF)
 endif()
 
 ###############################################################################