TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-17 19:31:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'ueberengine-dev' into ueberengine-master

Browse source
This commit is contained in:
Duion 2016-01-15 02:32:16 +01:00
commit 8cf2deb300
8 changed files with 51 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Engine/source/T3D/decal/decalData.cpp
View file

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

3
Engine/source/T3D/fps/guiCrossHairHud.cpp
View file

@ -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.

4
Engine/source/app/version.h
View file

@ -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();

6
Engine/source/gfx/gfxTextureManager.cpp
View file

@ -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;

20
Engine/source/platformSDL/menus/menuBarSDL.cpp
View file

@ -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;
}

6
Engine/source/ts/tsShapeConstruct.cpp
View file

@ -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 );