TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-20 04:34:48 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'ueberengine-dev' of https://github.com/Duion/Torque3D.git into ueberengine-dev

Browse source
This commit is contained in:
Duion 2016-01-13 02:36:03 +01:00
parent b37bbf2d05 03d6ca749b
commit d1d1d4fdd8
4 changed files with 9 additions and 7 deletions
Show stats 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.

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;

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