Commit graph

14 commits

Author SHA1 Message Date
Daniel Buckmaster 84e8cbb4ee Revert recent style cleanup changes. 2015-03-04 11:58:36 +11:00
Azaezel c84051fc60 typofix for void ColladaAppMesh::lockMesh(F32 t, const MatrixF& objOffset) which was preventing level load. 2015-03-02 00:25:40 -06: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
Thomas Fischer cd978039ac Merge pull request #635 from just-bank/engine-fixes
Various engine fixes
2014-05-23 14:09:00 +02:00
bank 9aeb4389f3 Rename all member variables to follow the style guidelines (prefixed with the 'm') - ColladaExtensions 2014-05-13 11:40:56 +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
bank a53580ca60 Rename all member variables to follow the style guidelines (prefixed with the 'm') - class MeshStreams 2014-05-12 18:41:30 +04:00
bank 7c1544317b Rename all member variables to follow the style guidelines (prefixed with the 'm') - class ColladaAppMesh 2014-05-12 18:37:22 +04:00
bank 9e3eab7551 Rename all member variables to follow the style guidelines (prefixed with the 'm') - struct VertTuple (used in class ColladaAppMesh) 2014-05-12 18:32:39 +04:00
bank aefa796056 Rename all member variables to follow the style guidelines (prefixed with the 'm') - class AppMesh 2014-05-12 18:20:59 +04:00
bank 6d176cf8db Rename local variable to prevent confusion with member variable. 2014-05-06 15:39:21 +04:00
cpusci 4c35fd37af Simple pass over the codebase to standardize the platform types. 2013-08-04 16:26:01 -05:00
DavidWyand-GG 05b3a32e2c Fix for Issue #118 for Collada Importer Materials 2012-11-07 19:09:51 -05:00
DavidWyand-GG 7dbfe6994d Engine directory for ticket #1 2012-09-19 11:15:01 -04:00