New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Style cleanup #1054

Merged
merged 20 commits into from Mar 1, 2015

Conversation

Projects
None yet
3 participants
@crabmusket
Contributor

crabmusket commented Dec 15, 2014

#637 with latest development code.

just-bank and others added some commits May 12, 2014

Rename all member variables to follow the style guidelines (prefixed …
…with the 'm') - struct VertTuple (used in class ColladaAppMesh)
Rename all member variables to follow the style guidelines (prefixed …
…with the 'm') - class _SourceReader (ColladaUtils)
Rename all member variables to follow the style guidelines (prefixed …
…with the 'm') - ColladaUtils (struct AnimChannels, struct AnimData, struct AnimatedElement)
Rename all member variables to follow the style guidelines (prefixed …
…with the 'm') - struct ImportOptions (ColladaUtils)
Rename all member variables to follow the style guidelines (prefixed …
…with the 'm') - class TSStaticPolysoupConvex
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

@crabmusket crabmusket added the Defect label Dec 15, 2014

@crabmusket crabmusket added this to the 3.7 milestone Dec 15, 2014

@crabmusket

This comment has been minimized.

Show comment
Hide comment
@crabmusket

crabmusket Dec 21, 2014

Contributor

Since this keeps getting broken by other PRs, I'll fix, merge and close this quickly near the end of the 3.7 cycle so that we don't need to ask as many people to fix their PRs.

Contributor

crabmusket commented Dec 21, 2014

Since this keeps getting broken by other PRs, I'll fix, merge and close this quickly near the end of the 3.7 cycle so that we don't need to ask as many people to fix their PRs.

@LuisAntonRebollo

This comment has been minimized.

Show comment
Hide comment
@LuisAntonRebollo

LuisAntonRebollo Dec 21, 2014

Contributor

👍

Contributor

LuisAntonRebollo commented Dec 21, 2014

👍

@crabmusket crabmusket merged commit 33ff180 into GarageGames:development Mar 1, 2015

1 check was pending

default Build triggered.

@crabmusket crabmusket deleted the crabmusket:style-cleanup branch Mar 1, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment