Commit graph

15 commits

Author SHA1 Message Date
Azaezel cbce2ee805 Merge branch 'development' of https://github.com/GarageGames/Torque3D into memberMess
# Conflicts:
#	Engine/source/console/consoleFunctions.cpp
2018-03-28 15:42:34 -05:00
Azaezel 1c62080f7f cleaned up member::radius 2018-03-13 15:31:00 -05:00
Azaezel c98f257cae more compiler compliant cleanups plus a full set of tsMesh::foo to tsmesh::mFoo class var conversions for consistency 2018-03-13 14:53:23 -05:00
Azaezel 654fc29dc2 bounds to mBounds conflict avoidance 2018-03-13 01:05:15 -05:00
Areloch 49639a908f Expanded mesh baking functionality, now supporting baking of LODs and Collision meshes 2018-03-01 01:51:18 -06:00
James Urquhart a46779fad6 Defer re-init'ing the shape when TSShapeConstructor is loading a shape 2016-09-03 10:41:25 +01:00
Daniel Buckmaster 84e8cbb4ee Revert recent style cleanup changes. 2015-03-04 11:58:36 +11:00
Daniel Buckmaster 33ff180593 Merge branch 'development' into style-cleanup
Conflicts:
	Engine/source/console/astNodes.cpp
	Engine/source/console/codeBlock.cpp
	Engine/source/console/compiledEval.cpp
	Engine/source/ts/collada/colladaAppMesh.cpp
	Engine/source/ts/tsShape.cpp
	Engine/source/ts/tsShapeConstruct.cpp
2014-12-15 12:15:55 +11:00
bank f3fc84738b Use fixed buffer size var when allocating return buffer from console.
Conflicts:
	Engine/source/T3D/missionArea.cpp
	Engine/source/gui/editor/guiDebugger.cpp
2014-06-11 13:09:55 +04:00
bank 69dbaf5b85 Rename all member variables to follow the style guidelines (prefixed with the 'm') - class TSShape 2014-05-13 14:08:42 +04:00
bank e2545c359c Rename all member variables to follow the style guidelines (prefixed with the 'm') - class TSMesh 2014-05-13 12:43:01 +04:00
bank 733347fd61 Rename all member variables to follow the style guidelines (prefixed with the 'm') - struct ImportOptions (ColladaUtils) 2014-05-12 19:23:25 +04:00
DavidWyand-GG bfec2dfd79 Fix texture and object console paths
- Be sure to delete all prefs.cs files following this change.
- Changes the console types of the missing, unavailable and warning
texture paths.  The old type was causing string corruption when saving
preferences.
- Changes the console type of the TSShapeConstructor collision shapes.
The old type was causing string corruption when saving preferences.
- Changed missing texture reference in ProcessedMaterial from String to
const char*.
2013-04-09 10:05:57 -04:00
DavidWyand-GG 4b1334db9f Removed hard coded directory paths
- Removed references to core directory.
- Switch some references to tools directory
- Added preferences variables where appropriate
2013-03-07 18:56:53 -05:00
DavidWyand-GG 7dbfe6994d Engine directory for ticket #1 2012-09-19 11:15:01 -04:00