261 commits

Author	SHA1	Message	Date
Brad Davis	e44b21ee0b	Working on functional overlays	2015-06-13 10:36:52 -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	09cfe004a1	Combining with new cursor render code	2015-06-11 16:55:23 -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	92f22bc6d5	Magic number and build errors	2015-06-11 15:40:16 -07:00
Brad Davis	d3cdbc389a	Code cleanup	2015-06-11 15:05:08 -07:00
Brad Davis	bc206633f5	Fixing overlay rendering in HMD	2015-06-11 14:56:21 -07:00
Brad Davis	ef52035300	Working on functional overlays	2015-06-11 02:20:51 -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
Brad Davis	78ab6a03af	Fixing broken cursor rendering from team-teaching merge	2015-06-09 11:47:19 -07:00
Brad Davis	c360dde71a	Merge branch 'master' into render_cursor ... Conflicts: interface/src/Application.cpp	2015-06-08 20:18:32 -07:00
Brad Davis	b3534210e4	Always use GL rendered cursor	2015-06-08 11:51:35 -07:00
ZappoMan	7c40b666e8	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching-scene-api	2015-06-03 09:52:40 -07:00
Seth Alves	0cf9afd8ec	attempt to save _created as an iso date in utc	2015-05-28 21:21:57 -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
Atlante45	76fc59675b	Merge branch 'team-teaching' into text-renderer	2015-05-26 20:01:26 +02:00
Atlante45	a44054f9db	Make TextureCache::getImageTexture static	2015-05-23 03:24:26 +02:00
Ryan Huffman	d1a5662ca7	Merge branch 'team-teaching' of github.com:highfidelity/hifi into ctx ... Conflicts: libraries/entities-renderer/src/EntityTreeRenderer.cpp	2015-05-22 15:33:40 -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
Atlante45	c6ce5e7680	PerformanceTimer deactivated when not in use	2015-05-22 18:54:40 +02: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
Brad Davis	e58976fe5a	Fix magnifier location	2015-05-11 13:56:49 -07:00
Philip Rosedale	c3828e4152	Merge pull request #4782 from ctrlaltdavid/20531 ... DO NOT MERGE - QA for #20531 - Don't flash whole screen when audio clips	2015-05-11 10:18:07 -07:00
David Rowe	c4e9807259	Merge branch 'master' into 20531 ... Conflicts: interface/src/ui/ApplicationOverlay.cpp	2015-05-07 21:01:22 -07:00
Bradley Austin Davis	c31d36be59	Fixing scale resolution issues	2015-05-07 12:01:56 -07:00
Atlante45	f761ba521a	Quiet compiler	2015-05-07 20:16:03 +02:00
Bradley Austin Davis	561d275dda	Fix ensmallened overlay UI	2015-05-06 15:18:17 -07:00
Bradley Austin Davis	3c10d29d53	Removing another reference to oculus manager	2015-05-06 14:09:43 -07:00
David Rowe	1fdf2c7803	Don't flash whole screen when audio clips	2015-05-06 13:35:53 -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	7c16fd05c1	Merge branch 'master' into ui-refactor	2015-04-25 16:35:43 -07:00
Atlante45	ba507cef98	Fix a few warnings	2015-04-25 11:01:02 +02:00
Brad Davis	99a6e1f86c	Breaking up offscreen UI work	2015-04-24 13:21:21 -07:00
Brad Davis	8d8c4babba	Coding standard fixes	2015-04-22 19:06:22 -07:00
Brad Davis	d14d5f3d29	Working on new-UI implementations of address bar and login	2015-04-15 00:36:04 -07:00
Atlante45	5e3ed1c8e4	Compute correct mouse position	2015-04-07 17:15:16 +02:00
Atlante45	1cc4384404	Add new frame of reference for cursor	2015-04-07 17:13:30 +02:00
Atlante45	ae6ee54569	Fix ray collision not using inverse rot	2015-04-07 17:11:02 +02:00
Atlante45	73f9276c74	Fix warning	2015-04-07 17:10:31 +02:00
Atlante45	a120e50cc0	Account for actual eye position in oculus pick ray	2015-04-06 18:29:02 +02:00
Seth Alves	fc1e45fc58	valgrind says this is used before it's initialized	2015-03-28 17:10:46 -07:00