Sam Gateau 2fb4ed06c0 Merge branch 'master' of https://github.com/highfidelity/hifi into daft		2015-06-23 10:18:56 +02:00
..
animation
audio	Merge branch 'master' of https://github.com/highfidelity/hifi into refactor-playSound	2015-06-19 14:22:04 -07:00
audio-client	Merge pull request #5161 from PhilipRosedale/master	2015-06-22 12:09:08 -07:00
auto-updater	typo	2015-06-16 14:49:55 -06:00
avatars	Make renderDisplayName const	2015-06-18 15:22:49 +02:00
embedded-webserver	try again without macro	2015-04-07 09:59:04 -07:00
entities	Merge remote-tracking branch 'upstream/master' into overlay	2015-06-18 18:17:59 -07:00
entities-renderer	Merge pull request #5160 from ctrlaltdavid/addressbar-tidy	2015-06-22 12:08:33 -07:00
environment	wire up atmosphere.hasStars property	2015-05-04 14:19:13 -07:00
fbx	fix syntax	2015-06-19 17:13:29 +02:00
gpu	Merge branch 'master' of https://github.com/highfidelity/hifi into daft	2015-06-22 20:00:48 +02:00
model	merge from upstream	2015-06-18 15:03:09 -07:00
networking	fix for double store on index path lookup	2015-06-22 11:26:17 -07:00
octree	Merge pull request #5165 from ctrlaltdavid/20582	2015-06-22 17:02:38 -07:00
physics	Merge pull request #5147 from sethalves/more-actions	2015-06-18 17:35:50 -07:00
render	Fix the cookie cutter problem in stereo, the alphaThreshold wasn 't assigned correctly for opaque	2015-06-19 16:30:48 +02:00
render-utils	Merge branch 'master' of https://github.com/highfidelity/hifi into daft	2015-06-23 10:18:56 +02:00
script-engine	Merge pull request #5183 from birarda/ac-scripts	2015-06-22 17:22:56 -07:00
shared	Merge remote-tracking branch 'upstream/master' into overlay	2015-06-18 18:17:59 -07:00
ui	Merge remote-tracking branch 'upstream/master' into overlay	2015-06-17 15:13:04 -07:00