14 commits

Author	SHA1	Message	Date
Seth Alves	7c26641560	Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire	2015-06-25 17:40:27 -07:00
Brad Davis	fb2fb06371	Fixing misplaced UI on scale resolution, PC edition	2015-06-23 15:42:32 -07:00
Seth Alves	cc3854be8a	quiet compiler	2015-06-22 19:55:43 -07:00
Brad Hefta-Gaub	ee85ad8bf8	Merge pull request #5185 from jherico/mouse_flicker ... Removing flickering mouse cursor in HMD	2015-06-22 17:23:40 -07:00
Brad Davis	8c9deb9d16	Removing flickering mouse cursor in HMD	2015-06-22 12:04:55 -07:00
Brad Davis	4cd1c52987	Fixing HMD position offset bug in picking & stereo rendering in HMD	2015-06-22 11:20:48 -07:00
Brad Davis	99c217184b	Fixing the mic/camera buttons and the mirror UI buttons	2015-06-19 14:46:39 -07:00
Brad Davis	48b27acc79	Merge remote-tracking branch 'upstream/master' into overlay ... Conflicts: interface/src/Application.cpp interface/src/ui/ApplicationOverlay.cpp	2015-06-18 18:17:59 -07:00
Brad Davis	edfb25bfe2	Removing debug define for VR overlay	2015-06-18 15:05:32 -07:00
Brad Davis	a83a4fb0a1	Merge remote-tracking branch 'upstream/master' into overlay ... Conflicts: interface/src/Application.cpp interface/src/devices/OculusManager.cpp interface/src/ui/ApplicationOverlay.cpp	2015-06-17 19:53:31 -07:00
Brad Davis	8a1b519071	Working on overlays	2015-06-17 16:06:06 -07:00
Brad Davis	659fa2387c	Working on overlays / stats	2015-06-16 21:00:13 -07:00
Brad Davis	ba13b7820c	Working on overlay refactor	2015-06-16 09:58:03 -07:00
Brad Davis	00d8fe75ab	Breaking up overlay into rendering and compositing classes	2015-06-13 17:36:08 -07:00