Brad Davis ae1c9603b9 Merge remote-tracking branch 'upstream/master' into overlay		2015-06-17 15:13:04 -07:00
..
animation
audio	Incorporate ctrlaltdavid's changes.	2015-06-17 11:59:15 -07:00
audio-client	Incorporate ctrlaltdavid's changes.	2015-06-17 11:59:15 -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	Merge remote-tracking branch 'upstream/master' into overlay	2015-06-17 15:13:04 -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	Working on mirror and overlay	2015-06-17 12:01:39 -07:00
model	CR feedback	2015-06-17 10:02:02 -07:00
networking	fix for path handling on return of place info	2015-06-17 11:18:43 -07:00
octree	Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod	2015-06-03 19:47:51 +02:00
physics	fix some warnings	2015-06-17 14:26:36 -07:00
render	Add post-scale to view matrix when in mirror mode	2015-06-12 13:05:10 -07:00
render-utils	Merge remote-tracking branch 'upstream/master' into overlay	2015-06-17 15:13:04 -07:00
script-engine	Signal Audio.disconnected, and use new hello/goodbye sounds in resources.	2015-06-11 20:33:30 -07:00
shared	Merge remote-tracking branch 'upstream/master' into overlay	2015-06-17 15:13:04 -07:00
ui	Merge remote-tracking branch 'upstream/master' into overlay	2015-06-17 15:13:04 -07:00