243 commits

Author	SHA1	Message	Date
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
ZappoMan	6cff99f9d6	menu and display tweaks	2015-03-26 16:36:46 -07:00
ZappoMan	a89691fc66	switch GLCanvas back to being owned by Application	2015-02-25 12:11:35 -08:00
Atlante45	5230b805d2	Fix warnings	2015-02-18 19:24:29 +01:00
Andrew Meadows	dba206337b	Merge pull request #4294 from thoys/20348 ... CR for Job #20348 - Change audio meter background back to white	2015-02-17 09:24:05 -08:00
Andrew Meadows	d896f3a811	Merge pull request #4252 from thoys/20224 ... CR for Job #20224 - Make virtualKeyboard.js go to locations and support gamepads	2015-02-17 09:03:17 -08:00
Thijs Wenker	42e4eee15e	audio meter background "back in black" / "paint it black"	2015-02-16 23:14:27 +01:00
Triplelexx	e2f942c026	Coding standard fixes ... Corrected else format, removed additional comment to fit other declarations and break block.	2015-02-11 06:11:38 +00:00
Triplelexx	260f960ccc	Indentation correction ... Indention was still incorrect I believe. 😢	2015-02-11 03:49:28 +00:00
Triplelexx	837f8d71a4	Coding standard fixes ... Coding standard fixes Indentation and space missing	2015-02-11 03:17:28 +00:00
Triplelexx	84d7ae6b3a	Change conditional limit to >= ... edge case	2015-02-11 00:18:08 +00:00
Triplelexx	93366e068f	Remove all references to AUDIO_METER_INSET ... further cleaning	2015-02-11 00:16:40 +00:00
Triplelexx	d59ee7c561	Removed meter inset ... changes to bar color make the inset very visible	2015-02-10 23:57:09 +00:00
Triplelexx	e473661568	Fix meter showing out of bounds ... add conditional check for exception when audioLevel is NAN.	2015-02-10 23:55:56 +00:00
Triplelexx	8e0ac763eb	Changed color of audio bar background ... Worklist mentions: Additionally, change the color of the bar to #4CC1B8 / 76,193,184	2015-02-10 22:41:43 +00:00
Thijs Wenker	e53b38e497	style / make sure the magnifier isn't rendered when we don't want it	2015-02-09 17:16:54 +01:00
Thijs Wenker	e3ca1efe6b	Merge branch 'master' of https://github.com/worklist/hifi into 20224	2015-02-07 00:34:38 +01:00
Stephen Birarda	219e78425b	resolve conflicts on merge with upstream master	2015-02-06 09:49:46 -08:00
Andrew Meadows	5ea785f4ad	Merge pull request #4232 from thoys/cursor_is_visible_and_oculus_cursor_visibility ... Ability to make cursor invisible again (both OS-cursor and oculus rectile) and js-interface to cursorVisible boolean	2015-02-06 08:58:14 -08:00