ZappoMan 4654ed95ac Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api		2015-05-27 10:40:24 -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	simple entity payload	2015-05-26 16:27:00 -07:00
entities-renderer	some hacking	2015-05-27 10:40:07 -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	Add cache sync flag in Context::enqueueBatch	2015-05-22 15:34:05 -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	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching	2015-05-26 15:01:26 -07:00
physics	Merge pull request #4954 from ZappoMan/entitysmartpointers	2015-05-26 14:05:03 -07:00
render	Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api	2015-05-27 10:40:24 -07:00
render-utils	Update Model::endScene to require RenderArgs	2015-05-22 16:17:01 -07:00
script-engine	make EntityItemID a subclass of QUuid	2015-05-20 14:22:08 -07:00
shared	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching	2015-05-26 15:01:26 -07:00
ui	Merge remote-tracking branch 'upstream/master' into web-entity	2015-05-13 09:49:53 -07:00