Thijs Wenker fd7d186ffb Merge branch 'master' of https://github.com/worklist/hifi into 20638		2015-08-19 20:23:45 +02:00
..
animation	Merge pull request #5573 from howard-stearns/sync-eyes-and-vectors	2015-08-17 16:56:01 -07:00
audio
audio-client	Fix https://app.asana.com/0/32622044445063/43589567731045	2015-08-02 21:46:39 -07:00
auto-updater
avatars	Merge branch 'master' of https://github.com/highfidelity/hifi into recapitate	2015-08-13 15:56:13 -07:00
display-plugins	Fixing bad success macro for the Oculus SDK on windows	2015-08-11 14:06:35 -07:00
embedded-webserver
entities	Merge pull request #5578 from sethalves/polyvox	2015-08-19 10:31:13 -07:00
entities-renderer	Merge pull request #5578 from sethalves/polyvox	2015-08-19 10:31:13 -07:00
environment
fbx	back out the more controversial changes	2015-08-17 12:40:56 -07:00
gpu	Merge pull request #5551 from sethalves/quiet-compiler	2015-08-18 09:54:29 -07:00
input-plugins	Revert "Updating to the new version of the sixense library"	2015-08-19 09:44:51 -07:00
model	Merge remote-tracking branch 'upstream/master' into core	2015-08-01 20:01:59 -07:00
networking	No symbolic names for non-entity contants.	2015-08-12 16:40:00 -07:00
octree	no longer returning early on NaN	2015-08-07 16:15:51 -07:00
physics	Merge pull request #5551 from sethalves/quiet-compiler	2015-08-18 09:54:29 -07:00
plugins	Decouple Application and plugin definitions, cleanup container usage	2015-08-08 17:51:16 -07:00
render	Merge branch 'master' into plugins	2015-08-06 11:03:37 -07:00
render-utils	This assert causes dev builds to fail when starting interface.	2015-08-19 10:24:31 -07:00
script-engine	new style qt connectors	2015-08-19 20:00:06 +02:00
shared	Merge pull request #5551 from sethalves/quiet-compiler	2015-08-18 09:54:29 -07:00
ui	QML framerate improvments	2015-08-12 16:24:34 -07:00