Sam Gateau 72e01a7929 Merge branch 'master' of https://github.com/highfidelity/hifi into blue		2015-05-07 13:49:48 -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	wire up new zone properties, fix bug in group proprties decode	2015-05-07 13:05:00 -07:00
entities-renderer	Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones	2015-05-07 19:58:26 +02:00
environment	wire up atmosphere.hasStars property	2015-05-04 14:19:13 -07:00
fbx	Merge pull request #4780 from samcake/blue	2015-05-06 14:41:06 -07:00
gpu	merging	2015-05-07 11:35:58 -07:00
model	merging	2015-05-07 11:35:58 -07:00
networking	added skybox group properties to zones	2015-05-05 14:12:02 -07:00
octree	Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones	2015-05-07 10:13:59 +02:00
physics	Quiet compiler	2015-05-04 16:49:33 +02:00
render-utils	merging	2015-05-07 11:35:58 -07:00
script-engine	Skybox kind of working	2015-05-07 11:23:11 -07:00
shared	Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones	2015-05-07 19:58:26 +02:00
ui	removing commented out old implementation.	2015-05-06 12:03:47 -07:00