Howard Stearns 3c718af43f Merge branch 'master' of https://github.com/highfidelity/hifi into remove-global-collision-and-update-examples		2015-05-26 13:26:02 -07:00
..
animation
audio	remove dependency of PacketHeaders on NodeList	2015-05-05 12:19:42 -07:00
audio-client	remove dependency of PacketHeaders on NodeList	2015-05-05 12:19:42 -07:00
avatars	cleanup of AvatarManger API	2015-05-19 16:53:30 -07:00
embedded-webserver	try again without macro	2015-04-07 09:59:04 -07:00
entities	Restore blank line for minimum diff.	2015-05-25 11:33:12 -07:00
entities-renderer	Fix typo that messed up the otherEntity for collisions.	2015-05-25 15:46:55 -07:00
environment	wire up atmosphere.hasStars property	2015-05-04 14:19:13 -07:00
fbx	don't allow buildModelMesh to spam logs when it encounters flawed models	2015-05-14 10:24:02 -07:00
gpu	Moving the load of the texture and the generation of the cube map irradiance in the same thread	2015-05-15 11:28:59 -07:00
model	fixes Sam made in my branch while trying to get a mesh to render	2015-05-21 18:20:52 -07:00
networking	merge upstream/master into andrew/bispinor	2015-05-22 11:35:02 -07:00
octree	Fix incorrect scale constants	2015-05-23 20:13:14 +02:00
physics	merge upstream/master into andrew/bispinor	2015-05-22 11:35:02 -07:00
render-utils	Fix indentation.	2015-05-18 14:25:35 -07:00
script-engine	Noop change with more declarations, in hopes of convincing MSVS how lambdas work.	2015-05-25 16:52:14 -07:00
shared	merge upstream/master into andrew/bispinor	2015-05-22 11:35:02 -07:00
ui	Merge remote-tracking branch 'upstream/master' into web-entity	2015-05-13 09:49:53 -07:00