Seth Alves f5f1d0829c Merge branch 'physics-lock-entity-tree' of github.com:sethalves/hifi into actions-over-wire		2015-06-26 07:20:51 -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	try again without macro	2015-04-07 09:59:04 -07:00
entities	Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire	2015-06-23 19:50:35 -07:00
entities-renderer	Merge pull request #5164 from ericrius1/lineBounds	2015-06-23 10:47:38 -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 github.com:highfidelity/hifi into actions-over-wire	2015-06-22 15:37:10 -07:00
model	merge from upstream	2015-06-18 15:03:09 -07:00
networking	Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire	2015-06-22 15:37:10 -07:00
octree	Bug fixes for switching between head/body and full body avatars	2015-06-24 16:10:47 -07:00
physics	Merge branch 'physics-lock-entity-tree' of github.com:sethalves/hifi into actions-over-wire	2015-06-26 07:20:51 -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 github.com:highfidelity/hifi into actions-over-wire	2015-06-25 17:40:27 -07:00
script-engine	Merge pull request #5203 from howard-stearns/set-injector-options-from-script	2015-06-24 16:54:11 -07:00
shared	Extend Extents	2015-06-24 15:44:48 -07:00
ui	Merge remote-tracking branch 'upstream/master' into overlay	2015-06-17 15:13:04 -07:00