Sam Gateau dd84bf010b Merge branch 'master' of https://github.com/highfidelity/hifi into daft		2015-06-10 00:32:22 -07:00
..
animation
audio	Merge branch 'master' of https://github.com/highfidelity/hifi into restartable-non-local-sound	2015-06-08 15:45:30 -07:00
audio-client	add a sound once first AM packet received	2015-06-08 11:30:12 -07:00
avatars	Undo the merge with the broken master checking. What could go wrong?	2015-05-28 13:48:27 -07:00
embedded-webserver	try again without macro	2015-04-07 09:59:04 -07:00
entities	Reduce qDebug calls	2015-06-09 15:26:41 +02:00
entities-renderer	Merge pull request #5087 from Atlante45/debug	2015-06-09 07:54:21 -07:00
environment	wire up atmosphere.hasStars property	2015-05-04 14:19:13 -07:00
fbx	first take on the materialKey	2015-06-09 12:17:10 -07:00
gpu	first take on the materialKey	2015-06-09 12:17:10 -07:00
model	first take on the materialKey	2015-06-09 12:17:10 -07:00
networking	quiet compiler, fix some whitespace	2015-06-08 21:19:37 -07:00
octree	Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod	2015-06-03 19:47:51 +02:00
physics	merge from upstream	2015-06-05 11:56:33 -07:00
render	Merge branch 'master' of https://github.com/highfidelity/hifi into daft	2015-06-10 00:32:22 -07:00
render-utils	Merge branch 'master' of https://github.com/highfidelity/hifi into daft	2015-06-10 00:32:22 -07:00
script-engine	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching	2015-06-08 13:50:50 -07:00
shared	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching	2015-06-08 13:50:50 -07:00
ui	Add new address bar dialog error message	2015-06-01 09:01:11 -07:00