Sam Gateau 9c27106435 Merge branch 'master' of https://github.com/highfidelity/hifi into blue		2015-05-10 18:04:53 -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	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	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	Using the skybox cubemap for ambient lighting	2015-05-09 11:40:46 -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	fixing file	2015-05-09 11:48:30 -07:00
render-utils	fixing file	2015-05-09 11:43:21 -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