Brad Davis 6147844f93 Merge branch 'master' into ovr6 ... Conflicts: interface/src/Application.cpp interface/src/avatar/SkeletonModel.cpp interface/src/devices/OculusManager.h		2015-06-09 00:44:06 -07:00
..
animation
audio	Merge branch 'master' of https://github.com/highfidelity/hifi into restartable-non-local-sound	2015-06-08 15:45:30 -07:00
audio-client	add a sound once first AM packet received	2015-06-08 11:30:12 -07:00
avatars	Undo the merge with the broken master checking. What could go wrong?	2015-05-28 13:48:27 -07:00
embedded-webserver
entities	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching	2015-06-08 12:29:32 -07:00
entities-renderer	Merge pull request #5062 from ZappoMan/team-teaching	2015-06-05 12:21:10 -07:00
environment	wire up atmosphere.hasStars property	2015-05-04 14:19:13 -07:00
fbx	don't allow buildModelMesh to spam logs when it encounters flawed models	2015-05-14 10:24:02 -07:00
gpu	FIxing the transparent rendering on Mac	2015-06-08 18:36:12 +02:00
model	Undo the merge with the broken master checking. What could go wrong?	2015-05-28 13:48:27 -07:00
networking	Some changes to constants	2015-06-05 15:36:42 -07:00
octree	Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod	2015-06-03 19:47:51 +02:00
physics	merge from upstream	2015-06-05 11:56:33 -07:00
render	use emplace_back and pre-reserved sizes for vectors	2015-06-08 12:45:39 -07:00
render-utils	Fixing the skinning issue	2015-06-08 11:22:16 -07:00
script-engine	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching	2015-06-08 13:50:50 -07:00
shared	Merge branch 'master' into ovr6	2015-06-09 00:44:06 -07:00
ui	Add new address bar dialog error message	2015-06-01 09:01:11 -07:00