Bradley Austin Davis fb2c84484e Merge remote-tracking branch 'upstream/master' into plugins		2015-08-07 15:26:43 -07:00
..
animation	Merge pull request #5524 from howard-stearns/cleanup-jointstate	2015-08-07 13:50:02 -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' into plugins	2015-08-06 11:03:37 -07:00
display-plugins	Case sensitivity breaking ubuntu	2015-08-04 01:08:52 -07:00
embedded-webserver
entities	Merge pull request #5494 from sethalves/gzip-json-entity-persist-files	2015-08-05 10:56:03 -07:00
entities-renderer	Merge branch 'master' into plugins	2015-08-06 11:03:37 -07:00
environment
fbx	cleaning th ecode	2015-08-07 10:59:55 -07:00
gpu	Merge branch 'master' into plugins	2015-08-06 11:03:37 -07:00
input-plugins	switched vive buttons	2015-07-27 10:53:01 -07:00
model	Merge remote-tracking branch 'upstream/master' into core	2015-08-01 20:01:59 -07:00
networking	clean up formatting, make connectionUUID const in NodeList	2015-08-07 10:59:53 -07:00
octree	Fix warning and remove unused headers	2015-08-05 16:46:44 -07:00
physics
plugins	Ensure the app moves back to a non-rift screen if the saved geometry is bad	2015-07-30 17:09:08 -07:00
render	Merge branch 'master' into plugins	2015-08-06 11:03:37 -07:00
render-utils	Merge remote-tracking branch 'upstream/master' into plugins	2015-08-07 15:26:43 -07:00
script-engine	merge rig into cleanup (removal of legacy shapes)	2015-07-31 13:40:51 -07:00
shared	Merge branch 'master' into plugins	2015-08-06 11:03:37 -07:00
ui