Bradley Austin Davis 0751443a01 Merge branch 'master' into scale		2015-05-08 15:03:24 -07:00
..
animation	remove use of include_dependency_includes and use cmake	2015-02-18 14:12:05 -08:00
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	try again without macro	2015-04-07 09:59:04 -07:00
entities	set default atmosphere properties to match the default atmosphere	2015-05-08 10:03:24 -07:00
entities-renderer	Cleaning code	2015-05-07 17:15:45 -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	THese is not final but we have a basic working framework so let's try to share	2015-05-07 17:06:15 -07:00
model	Cleaning code	2015-05-07 17:15:45 -07:00
networking	added skybox group properties to zones	2015-05-05 14:12:02 -07:00
octree	fix name of settings key for max octree pps	2015-05-07 16:00:30 -07:00
physics	fix for glitchy physics updates	2015-05-08 09:06:31 -07:00
render-utils	Merge branch 'master' into scale	2015-05-08 15:03:24 -07:00
script-engine	Skybox kind of working	2015-05-07 11:23:11 -07:00
shared	Merge branch 'master' into scale	2015-05-08 15:03:24 -07:00
ui	Fixing scale resolution issues	2015-05-07 12:01:56 -07:00