Howard Stearns cdef09c9dd Add comment (and force previous change to the right branch).		2015-05-11 10:12:03 -07:00
..
animation
audio	resolve conflicts on merge with upstream/master	2015-05-04 10:05:44 -07:00
audio-client	resolve conflicts on merge with upstream/master	2015-05-04 10:05:44 -07:00
avatars	move number constants out of SharedUtil to NumericalConstants	2015-05-01 10:26:53 -07:00
embedded-webserver
entities	set default atmosphere properties to match the default atmosphere	2015-05-08 10:03:24 -07:00
entities-renderer	Fix "simple inline/"direct code injection" entity scripts fail to load" (https://app.asana.com/0/32622044445063/33562012389754)	2015-05-09 13:34:35 -07:00
environment	wire up atmosphere.hasStars property	2015-05-04 14:19:13 -07:00
fbx	Handle empty face groups, such as in the rama cyclinder that crashed the Friday meeting (http://headache.hungry.com/~seth/hifi/stickCollisionModel.obj).	2015-05-09 13:16:34 -07:00
gpu	quiet compiler	2015-05-10 17:03:42 -07:00
model	Cleaning code	2015-05-07 17:15:45 -07:00
networking	Add comment (and force previous change to the right branch).	2015-05-11 10:12:03 -07:00
octree	undo mistaken change of setting name	2015-05-09 17:59:45 -07:00
physics	clear MotionState pointer in body on delete	2015-05-08 14:18:44 -07:00
render-utils	CR	2015-05-11 14:31:22 +02:00
script-engine	Skybox kind of working	2015-05-07 11:23:11 -07:00
shared	Merge pull request #4791 from jherico/scale	2015-05-08 15:54:24 -07:00
ui	Fixing scale resolution issues	2015-05-07 12:01:56 -07:00