18750 commits

Author	SHA1	Message	Date
Dante Ruiz	3fab901b49	commit chabges	2017-01-10 09:13:45 -08:00
druiz17	28c8d527df	Merge pull request #9340 from fayeli/tablet-hide-yellow ... Ability to disable yellow highlight around Web Overlays	2017-01-10 09:11:51 -08:00
Faye Li Si Fi	93e4f9126f	disable drawing highlight if "showKeyboardFocusHighlight" flag is false	2017-01-09 11:01:15 -08:00
Anthony J. Thibault	6794ed7cc4	Merge remote-tracking branch 'upstream/master' into tablet-ui	2017-01-09 10:37:46 -08:00
Faye Li Si Fi	2fa17ea6a7	fix missing parenthesis	2017-01-09 10:23:31 -08:00
Chris Collins	30d5f70e11	Merge pull request #9278 from jherico/cpu_opt_scene ... More low level optimizations	2017-01-09 10:10:40 -08:00
Faye Li Si Fi	d0d89e216d	Add showKeyboardFocusHighlight in constructor	2017-01-09 09:54:41 -08:00
Brad Hefta-Gaub	1a7b5ab520	Merge pull request #9326 from jherico/oculus_budget_stats ... Adding tracking of Oculus renders, submits, and frames that are over budget	2017-01-06 18:18:16 -08:00
Howard Stearns	b432ffa78d	Merge pull request #9323 from zfox23/FixPalSpaceBubbleInteraction ... Fix the PAL & Space Bubble interaction	2017-01-06 16:47:43 -08:00
Seth Alves	ad6175857d	Merge pull request #9328 from hyperlogic/tablet-ui ... Allow Hifi.SoundEffect to be used in all qml	2017-01-06 15:21:08 -08:00
Anthony J. Thibault	0860c50a49	Allow Hifi.SoundEffect to be used in all qml ... Including webEntities, webOverlays and the system tablet. We might want to add this to enable spatial sound effects for the web keyboard.	2017-01-06 14:01:13 -08:00
Zach Fox	dec41f67cc	Fix bugs and generally fix behavior	2017-01-06 13:58:23 -08:00
Seth Alves	668bc35227	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-merge	2017-01-06 13:31:13 -08:00
Howard Stearns	36c99a604b	Merge pull request #9319 from howard-stearns/edit-button-to-select-in-pal ... Edit button to select in pal	2017-01-06 13:17:29 -08:00
Brad Davis	15b9e750f9	Adding tracking of Oculus renders, submits, and frames that are over budget	2017-01-06 10:51:26 -08:00
howard-stearns	2f5f53c8e4	cr	2017-01-06 10:28:09 -08:00
Atlante45	428a7f3bf8	Log Dialog doesn't float on top	2017-01-05 17:49:39 -08:00
Zach Fox	495925a017	This behavior was harder to change than expected...	2017-01-05 16:58:32 -08:00
Faye Li Si Fi	e7d14b9381	Adding new property "showKeyboardFocusHighlight" to Web3DOverlay	2017-01-05 16:49:55 -08:00
howard-stearns	f5c4535115	Merge branch 'master' of https://github.com/highfidelity/hifi into edit-button-to-select-in-pal	2017-01-05 16:29:34 -08:00
Howard Stearns	3f54428744	Merge pull request #9313 from howard-stearns/pal ... People Action List	2017-01-05 15:49:56 -08:00
Seth Alves	d072b1524a	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-05 15:27:11 -08:00
howard-stearns	ef02c84759	further simplification of letterbox, and use for selection failures	2017-01-05 14:46:32 -08:00
howard-stearns	0cdeac8736	abstract out letterbox message	2017-01-05 14:32:31 -08:00
howard-stearns	0670a4689f	Merge branch 'master' of https://github.com/highfidelity/hifi into edit-button-to-select-in-pal	2017-01-05 13:57:44 -08:00
Anthony J. Thibault	7198cd13b5	added button click wav	2017-01-05 13:56:04 -08:00
Anthony J. Thibault	85de0d3bbf	Added local only spatialized button click sounds to tablet	2017-01-05 13:54:06 -08:00
Howard Stearns	bbf7d16537	process consistent select message	2017-01-05 13:45:03 -08:00
Howard Stearns	28326ff47a	Merge pull request #9306 from zfox23/PALVisualUpdates ... Fix PAL scrollbar; add helper popup to ADMIN tab	2017-01-05 13:29:21 -08:00
howard-stearns	47aa1e4f8e	add pal to defaultScripts	2017-01-05 12:23:17 -08:00
Zach Fox	b5713656be	Minor language changes on Admin help text	2017-01-05 09:27:12 -08:00
Brad Hefta-Gaub	368f48f0a7	Merge pull request #9247 from huffman/feat/tutorial-touch-grip ... Add support for new Touch grip mappings to tutorial	2017-01-04 17:58:05 -08:00
Clément Brisset	e34ecac843	Merge pull request #9299 from Atlante45/settings ... Fix settings hitch	2017-01-04 17:19:44 -08:00
howard-stearns	9709bedca7	checkpoint	2017-01-04 16:55:58 -08:00
Zach Fox	0c77ff2556	Fix silly quotation bug	2017-01-04 16:28:23 -08:00
Zach Fox	083bf95917	Fix PAL scrollbar; add helper popup to ADMIN tab	2017-01-04 16:25:13 -08:00
Brad Hefta-Gaub	f9ca41e89c	Merge pull request #9302 from jherico/expose_dropped_count ... Expose dropped frames count to stats UI	2017-01-04 16:12:35 -08:00
Howard Stearns	3d8da683db	Merge pull request #9290 from zfox23/PersonalMute ... Personal mute; Quasi-ignore; Reversible PAL actions	2017-01-04 14:37:09 -08:00
Zach Fox	675159be45	Last commit to fix final bugs	2017-01-04 14:33:02 -08:00
Zach Fox	ac41e8abc4	Bugfix re: population; remove user image for now	2017-01-04 14:06:51 -08:00
Zach Fox	c695878025	Clear local ignored list upon domain change	2017-01-04 13:31:16 -08:00
Brad Davis	3f2fdd1915	Expose dropped frames count to stats UI	2017-01-04 13:20:58 -08:00
Zach Fox	dde5f69ac9	More CR & simplifications	2017-01-04 12:41:30 -08:00
Faye Li Si Fi	32bc73dad3	added activeText and activeIcon properties in QML	2017-01-04 12:20:41 -08:00
Atlante45	56a25dfdee	Check setting value changed	2017-01-04 11:56:24 -08:00
Zach Fox	14def61eb8	More CR comments; 1 bug remaining re: sig slot	2017-01-03 17:32:47 -08:00
Anthony J. Thibault	e4a08709c6	Merge remote-tracking branch 'upstream/tablet-ui' into tablet-ui	2017-01-03 16:23:57 -08:00
Anthony Thibault	9502a8b0c4	Merge pull request #9294 from fayeli/tablet-mic-level ... Audio level calculation in tabletUI.js	2017-01-03 16:12:04 -08:00
Zach Fox	899dd21328	Lots of CR feedback	2017-01-03 15:43:30 -08:00
Anthony J. Thibault	3c2f9acd39	Hooked up EventBridge to TabletScriptingInterface.	2017-01-03 15:43:21 -08:00