Seth Alves f5cea57a48 Merge branch 'master' of github.com:highfidelity/hifi into polyvox		2015-06-17 07:20:15 -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	Signal Audio.disconnected, and use new hello/goodbye sounds in resources.	2015-06-11 20:33:30 -07:00
auto-updater	typo	2015-06-16 14:49:55 -06:00
avatars	Undo the merge with the broken master checking. What could go wrong?	2015-05-28 13:48:27 -07:00
embedded-webserver
entities	formatting	2015-06-15 16:22:06 -07:00
entities-renderer	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-06-17 07:20:15 -07:00
environment	wire up atmosphere.hasStars property	2015-05-04 14:19:13 -07:00
fbx	Merge branch 'master' of https://github.com/highfidelity/hifi into fix-attachments	2015-06-10 08:53:33 -07:00
gpu	Revert "Fix broken identity transforms on OSX"	2015-06-12 12:57:37 -07:00
model	Fixing the blackout when entering a zone with a skybox thatis not loaded yet or just a constant color skybox	2015-06-10 01:50:52 -07:00
networking	add missing bools to handleViewpoint call	2015-06-16 13:39:11 -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 branch 'master' of github.com:highfidelity/hifi into actions	2015-06-10 19:05:25 -07:00
render	Add post-scale to view matrix when in mirror mode	2015-06-12 13:05:10 -07:00
render-utils	fix warning	2015-06-16 16:01:01 -07:00
script-engine	Signal Audio.disconnected, and use new hello/goodbye sounds in resources.	2015-06-11 20:33:30 -07:00
shared	woops, forgot to include this in last commit	2015-06-10 12:41:15 -07:00
ui	Combining with new cursor render code	2015-06-11 16:55:23 -07:00