15 commits

Author	SHA1	Message	Date
Stephen Birarda	3df81cc92a	resolve conflicts on merge with upstream master	2013-04-25 16:41:35 -07:00
Stephen Birarda	cdb8b1b144	Merge remote-tracking branch 'upstream/master' into agentlist-array	2013-04-25 16:40:20 -07:00
Stephen Birarda	7e0dab6224	spacing fixes in Avatar class	2013-04-25 16:18:17 -07:00
Stephen Birarda	215efe3b78	bunch of const changes for glm::vec3 in Avatar and Orientation	2013-04-25 16:10:55 -07:00
Stephen Birarda	8370fd2d19	spacing fixes in Avatar class	2013-04-25 16:04:08 -07:00
Stephen Birarda	be37237b84	fix indent in Avatar class	2013-04-25 15:58:42 -07:00
Stephen Birarda	114f949a6e	spacing cleanup in Avatar class	2013-04-25 15:58:03 -07:00
Stephen Birarda	625a963918	prefer -> notation to (*TYPE) for AgentList iterator	2013-04-25 15:49:25 -07:00
Stephen Birarda	dac660efda	resolve conflicts after merge with upstream master	2013-04-25 15:30:57 -07:00
Stephen Birarda	5ddd9a9f4f	Merge remote-tracking branch 'upstream/master' into agentlist-array	2013-04-25 15:27:40 -07:00
Philip Rosedale	9e62728c33	Changed velocity to be dvec3	2013-04-25 10:18:30 -07:00
Philip Rosedale	b9fb888073	Small speed/cleanup to thrust setting	2013-04-25 10:02:14 -07:00
Philip Rosedale	ba55175870	Gravity is ON near origin, off in space, and a gravity field can be created with getGravity()	2013-04-25 09:50:35 -07:00
Jeffrey Ventrella	72e6e18992	fixed avatar collisions	2013-04-24 17:54:09 -07:00
Jeffrey Ventrella	2163976f06	adding the files	2013-04-24 17:01:59 -07:00