Seiji Emery 374150a39f Merge https://github.com/highfidelity/hifi		2015-06-29 11:56:50 -07:00
..
animation
audio	Allow scripted audio injectors to have options set.	2015-06-23 21:01:34 -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
entities	Merge https://github.com/highfidelity/hifi	2015-06-29 11:56:50 -07:00
entities-renderer	Merge pull request #5213 from birarda/hyperlink-photo	2015-06-26 17:05: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 remote-tracking branch 'upstream/master' into overlay	2015-06-19 14:48:38 -07:00
model	merge from upstream	2015-06-18 15:03:09 -07:00
networking	add a forced failover for hanging STUN dns lookup	2015-06-26 17:35:14 -07:00
octree	Bug fixes for switching between head/body and full body avatars	2015-06-24 16:10:47 -07:00
physics	move function up so this builds in non-debug mode	2015-06-26 07:20:22 -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	fix some OS X warnings, add description to tooltip	2015-06-26 10:50:31 -07:00
script-engine	Merge branch 'master' into 20547	2015-06-26 13:05:51 -07:00
shared	don't try to convert a vec3 containing NaN to a script value	2015-06-26 17:53:28 -07:00
ui	Merge pull request #5219 from venkatn93/master	2015-06-29 10:51:16 -07:00