Seth Alves e6023c59c1 if _reply is NULL, it doesn't make sense to worry about if it's finished loading or not.		2015-05-10 17:15:48 -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 zone:nothing bug	2015-05-08 14:03:58 -07:00
environment	wire up atmosphere.hasStars property	2015-05-04 14:19:13 -07:00
fbx	Merge branch 'master' of https://github.com/highfidelity/hifi into objReader-tweak	2015-05-07 16:41:52 -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	if _reply is NULL, it doesn't make sense to worry about if it's finished loading or not.	2015-05-10 17:15:48 -07:00
octree	fix name of settings key for max octree pps	2015-05-07 16:00:30 -07:00
physics	clear MotionState pointer in body on delete	2015-05-08 14:18:44 -07:00
render-utils	Merge pull request #4791 from jherico/scale	2015-05-08 15:54:24 -07: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