87 commits

Author	SHA1	Message	Date
Brad Davis	28103cf5ef	Migrate composition of the overlay and pointer to the present thread	2016-03-07 17:14:41 -08:00
Brad Hefta-Gaub	a25581c656	clean up reticle scripting to be exposed through Reticle object (implemented int ApplicationCompositor)	2016-02-16 12:11:58 -08:00
Sam Gateau	7ac2030862	Preparing for first pr	2015-07-22 10:43:50 -07:00
ZappoMan	65a79cfefb	fix a bunch of warnings	2015-07-20 15:58:25 -07:00
ZappoMan	648d0f6d43	fix a bunch of warnings	2015-07-20 15:12:27 -07:00
Brad Davis	0056208565	Another whack at GL headers	2015-07-18 17:04:44 -07:00
ZappoMan	98c078d995	move audio scope to the back	2015-07-17 17:44:29 -07:00
ZappoMan	398075e45a	hacking on more naked GL	2015-07-16 16:26:28 -07:00
Brad Davis	012b0973b9	removing cruft	2015-06-21 14:26:19 -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	9bef5f011b	Reverting mirror functionality	2015-06-19 00:03:46 -07:00
Brad Davis	1e90aaf9c3	Working on overlays still, mirror rendering and overlay order	2015-06-17 11:35:30 -07:00
Brad Davis	659fa2387c	Working on overlays / stats	2015-06-16 21:00:13 -07:00
Brad Davis	02d33f6086	Working on overlay rendering	2015-06-16 12:14:42 -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
Brad Davis	737e418878	Revert "Revert "Merge pull request #5106 from jherico/render_cursor"" ... This reverts commit 0cdc2b53fe.	2015-06-13 10:02:54 -07:00
ZappoMan	0cdc2b53fe	Revert "Merge pull request #5106 from jherico/render_cursor" ... This reverts commit 4d18bd7cec, reversing changes made to 24fda9a733.	2015-06-12 12:57:24 -07:00
Brad Davis	9148b866bb	Merge branch 'render_cursor' into cursor_manager ... Conflicts: interface/src/ui/ApplicationOverlay.cpp	2015-06-11 16:19:57 -07:00
Brad Davis	bc206633f5	Fixing overlay rendering in HMD	2015-06-11 14:56:21 -07:00
Brad Davis	ac0fc5d974	Working on oculus overlay code	2015-06-11 00:57:58 -07:00
Sam Gateau	1f62fb4b6f	Adding standard vertex and pixel shaders for drawing texture in applicationOverlay	2015-06-10 15:24:29 -07:00
Brad Davis	ca1af77763	Working on cursor manager	2015-06-10 13:24:56 -07:00
Brad Davis	7374fb84e8	Working on fixing overlays with team-teaching merge	2015-06-10 09:36:14 -07:00
ZappoMan	a0e51469d3	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching	2015-05-28 12:36:34 -07:00
Brad Davis	e5bec42512	Fix mouse emulation picking and pointer positioning for the hydra	2015-05-27 23:36:00 -07:00
Ryan Huffman	3f22b5f8b3	Add RenderArgs to more render methods	2015-05-22 15:25:53 -07:00
Ryan Huffman	5ac02f66ca	Remove const from ApplicationOverlay::renderOverlay	2015-05-22 09:58:20 -07:00
Ryan Huffman	4a4c9c75fc	Add gpu::context to RenderArgs and start using RenderArgs in place of the flags	2015-05-22 09:50:51 -07:00
Brad Davis	6797174b97	Fix picking in the HMD	2015-05-14 19:15:47 -07:00
Bradley Austin Davis	fc73676b4d	Merge branch 'master' into plugins_pt1	2015-05-06 11:43:25 -07:00
Brad Davis	302aa9db47	Removing access to the gl widget and display managers	2015-05-02 00:49:52 -07:00
David Rowe	bc05159504	Add face tracking toggle button beside microphone toggle button	2015-04-30 23:14:22 -07:00
Brad Davis	aba2b395a6	Working on testing the QML ui	2015-04-15 12:35:30 -07:00
Brad Davis	d14d5f3d29	Working on new-UI implementations of address bar and login	2015-04-15 00:36:04 -07:00
Atlante45	1cc4384404	Add new frame of reference for cursor	2015-04-07 17:13:30 +02:00
ZappoMan	6cff99f9d6	menu and display tweaks	2015-03-26 16:36:46 -07:00
Thijs Wenker	46618db697	Merge branch 'master' of https://github.com/worklist/hifi into 20224 ... Conflicts: interface/src/ui/ApplicationOverlay.h	2015-01-28 19:35:17 +01:00
Atlante45	229791a9f2	Move Oculus UI ratio to ApplicationOverlay	2015-01-17 19:45:48 -08:00
Thijs Wenker	74d56fb754	Merge branch 'master' of https://github.com/worklist/hifi into 20224	2015-01-13 22:42:02 +01:00
Atlante45	cf7089e145	Move constant back to Menu	2015-01-12 18:49:05 -08:00
Thijs Wenker	3da5677aaf	added HMD interface to toggle magnifier	2015-01-13 00:43:16 +01:00
ZappoMan	a9b7367fa9	more work on eliminating immediate mode calls	2015-01-05 20:51:05 -08:00
ZappoMan	be137534b5	first cut at registered quads to reduce copies of constantly changing quads	2014-12-30 12:38:16 -08:00
Atlante45	299389ccef	Fixed typo	2014-12-08 09:59:33 -08:00
Atlante45	1bb08ef30f	Centered reticule	2014-12-05 17:10:58 -08:00
Atlante45	90d4e7bae9	Comments	2014-12-04 19:38:39 -08:00
Atlante45	7026af7b9a	Centrilized Oculus interference in pickRay	2014-12-04 17:26:14 -08:00
Atlante45	3b6936b47d	Changed Mag and reticules data representation	2014-12-04 11:16:01 -08:00
Atlante45	bd39688c62	Magnifiy window tweaks	2014-12-03 17:04:26 -08:00