3292 commits

Author	SHA1	Message	Date
Anthony J. Thibault	bff0eeef75	Added username to tablet header	2017-01-24 14:31:57 -08:00
Anthony J. Thibault	d2f024e84d	Fix for "ReferenceError: globalPosition is not defined" warning	2017-01-24 11:40:20 -08:00
Seth Alves	200105c856	Merge pull request #9484 from hyperlogic/tablet-ui ... UI navigation work with game pads	2017-01-23 16:01:45 -08:00
Anthony J. Thibault	584a9a3c98	UI navigation work with game pads ... The tablet UI can be long lived, unlike the previous VRMenu. So instead of using a dynamic mapping that was only enabled when the VRMenu was shown, standard_navigation.json. standard_navigation is always active. Also, standard_navigation.json has been changed. Left and Right click and stick events never become UINav events. Only Dpad A, B, X, Y, LB and RB are mapped to UINav events.	2017-01-23 15:22:49 -08:00
Seth Alves	cdb14e7662	put name of button-click file back	2017-01-23 13:55:11 -08:00
Seth Alves	702aba9646	use a softer button-click sound	2017-01-23 10:13:45 -08:00
Seth Alves	be8bc9652b	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-23 09:44:04 -08:00
Zach Fox	11a57efafb	Fix it!	2017-01-20 13:44:29 -08:00
Seth Alves	dfa949f2d8	switch to new click sound	2017-01-20 13:35:41 -08:00
Zach Fox	8f3c4794c6	Comments	2017-01-20 10:24:52 -08:00
Zach Fox	9c9206acc0	Prevent logspam	2017-01-20 10:24:51 -08:00
Zach Fox	c83cd4a94a	Complex checkpoint	2017-01-20 10:24:51 -08:00
Seth Alves	c492319be2	merge from upstream	2017-01-20 10:14:11 -08:00
Ryan Downe Karpf	03851d4188	Merge pull request #9441 from davidkelly/dk/makeUsSomeAnalytics ... Some initial analytics for PAL usage	2017-01-20 08:30:46 -08:00
David Kelly	5adc2cc593	Couple improvements ... Only send one message when gain is changed. Eliminated the bool and now just sending un-personalMute, etc...	2017-01-19 17:22:39 -08:00
David Kelly	d9fbf832e2	Some initial analytics for PAL usage	2017-01-19 11:35:17 -08:00
Dante Ruiz	342a6c67fb	menu checkable button fix	2017-01-19 08:12:49 -08:00
Seth Alves	3517daaad2	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-18 15:49:12 -08:00
Zach Fox	7f57251a0e	Remove logs also removed in Master	2017-01-18 13:38:19 -08:00
Zach Fox	f8dd7f5433	Cleanup	2017-01-18 12:55:25 -08:00
Zach Fox	e9d3c36873	Final commit?	2017-01-18 12:55:25 -08:00
Zach Fox	d067ba7dcc	Alan's feedback	2017-01-18 12:55:24 -08:00
Zach Fox	9d19aa3c79	Checkpoint	2017-01-18 12:55:24 -08:00
Zach Fox	202d4e8107	Checkpoint	2017-01-18 12:55:24 -08:00
Zach Fox	346cfbfe02	First checkpoint	2017-01-18 12:55:24 -08:00
Dante Ruiz	0f3ac2831e	fix tablet menu selection issue	2017-01-18 17:20:42 +00:00
Dante Ruiz	1c13f538f7	removed debug output	2017-01-18 17:08:13 +00:00
Dante Ruiz	fa3bea52cd	fixed bug with menu	2017-01-18 16:45:27 +00:00
Dante Ruiz	baff07b0f9	controller with menus finally work	2017-01-18 07:41:25 -08:00
Dante Ruiz	9a61b6030b	tabletFocus update	2017-01-18 07:40:15 -08:00
Dante Ruiz	d3fa7651c9	some what working d-pad	2017-01-18 07:40:15 -08:00
dante ruiz	865a78a8c8	saving work	2017-01-18 07:40:14 -08:00
Seth Alves	b57803057d	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-18 06:38:44 -08:00
Seth Alves	0abb41ca2d	Merge pull request #9413 from hyperlogic/tablet-ui ... clara.io marketplace works on tablet	2017-01-18 06:37:55 -08:00
David Kelly	f5300d3862	Removing some PAL-related interface log spam ... Probably more, but these _seem_ to be the worst	2017-01-17 17:06:18 -08:00
Faye Li Si Fi	d7209ef7f7	syntax	2017-01-17 16:56:54 -08:00
Faye Li Si Fi	42a96a94b4	fix	2017-01-17 16:54:40 -08:00
Faye Li Si Fi	126bfba512	fix tablet menu scrolling issue	2017-01-17 16:40:12 -08:00
Zach Fox	7a568ed8a7	Merge pull request #9401 from zfox23/PAL_DisplayName ... PAL: Editable Display Names & Immediate Update	2017-01-17 16:00:41 -08:00
Anthony J. Thibault	56fc42a2bd	clara.io marketplace works on tablet	2017-01-17 15:38:44 -08:00
Zach Fox	59ff970d5b	CR feedback	2017-01-17 15:01:02 -08:00
Faye Li Si Fi	20ac96a7f9	fix clicking on checkboxes in menus or on ghosted menu items slides in a blank page	2017-01-17 12:29:38 -08:00
Faye Li Si Fi	965f9ab0a7	fix tapping menu when already at the top-level menu blanks the tablet	2017-01-17 11:58:48 -08:00
Seth Alves	6bace4f451	merge from upstream	2017-01-17 09:29:30 -08:00
David Kelly	6c701bb0f0	remove ignored avatars from PAL when they disconnect	2017-01-16 18:22:53 -08:00
Zach Fox	3b56f46206	Style changes	2017-01-16 13:18:24 -08:00
Zach Fox	32e330320e	Cleanup after rebase	2017-01-16 11:26:57 -08:00
Zach Fox	2f176f50fa	Another checkpoint	2017-01-16 10:44:54 -08:00
Zach Fox	6e4a4da92a	Checkpoint	2017-01-16 10:42:29 -08:00
Zach Fox	117e302b2a	First pass	2017-01-16 10:39:11 -08:00
Zach Fox	a5343d9aa9	Final tweaks before PR!	2017-01-13 17:20:29 -08:00
Zach Fox	a89868dcad	Make sliders appear only when row is selected	2017-01-13 15:41:17 -08:00
Zach Fox	8343769352	NameCard improvements & user feedback	2017-01-13 15:25:07 -08:00
Zach Fox	a69a10b8e4	Cleanup after rebase	2017-01-13 13:15:01 -08:00
Zach Fox	a9226e303c	Pull out visual changess & move them to other PR	2017-01-13 13:00:23 -08:00
Zach Fox	b0b6aeac6c	Ken's feedback	2017-01-13 13:00:03 -08:00
Zach Fox	b9cddc31a9	Checkpoint before implementing Ken's suggestions	2017-01-13 13:00:03 -08:00
Zach Fox	503468e49b	Style changes	2017-01-13 12:59:23 -08:00
Zach Fox	dcff873cd4	Modify slider function	2017-01-13 12:57:35 -08:00
Zach Fox	8bb200902f	First pass	2017-01-13 12:57:35 -08:00
Seth Alves	50ad0d881d	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui	2017-01-13 10:15:00 -08:00
Seth Alves	bbff372097	Merge pull request #9377 from fayeli/tablet-menu-qml ... Rework Context Menu QML to Be Suitable for Tablet	2017-01-13 09:59:57 -08:00
Seth Alves	481cc47f79	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-13 09:28:18 -08:00
Faye Li Si Fi	834e3af879	checkbox margin and nav hover color	2017-01-12 18:12:13 -08:00
Faye Li Si Fi	10a82ac11f	update breadcrumb text as you navigate menus	2017-01-12 17:38:13 -08:00
Faye Li Si Fi	54eef26eaa	click breadcrumb text to go back to parent menu	2017-01-12 16:33:33 -08:00
Faye Li Si Fi	ef699db5be	nav bar menu now bring you back to menu root	2017-01-12 16:14:37 -08:00
Faye Li Si Fi	99b6c6f1fd	menu icon and breadcrumb text	2017-01-12 15:47:02 -08:00
Faye Li Si Fi	41356f8b1d	make space for menu navigation bar	2017-01-12 14:36:33 -08:00
Seth Alves	b4870a14fa	Merge pull request #9372 from druiz17/removeHud ... Completely removed HUD	2017-01-12 14:24:40 -08:00
Zach Fox	b7e95a3486	Updates from Alan	2017-01-12 14:14:28 -08:00
Dante Ruiz	784548bb25	removed hud	2017-01-12 22:07:20 +00:00
Anthony J. Thibault	b251dc9ed6	Tablet springboard can now be scrolled	2017-01-12 13:11:27 -08:00
Faye Li Si Fi	f316505a05	context menu fill to fit tablet screen	2017-01-12 13:11:08 -08:00
Zach Fox	8e1a70891d	Checkpoint after cherry-picking from existing PR	2017-01-12 10:59:28 -08:00
Anthony Thibault	e7a88b5a3c	Merge pull request #9343 from druiz17/menuApp ... Moved the context menu to the tablet	2017-01-10 13:34:44 -08:00
Faye Li	07039897c6	New color scheme for audio bar	2017-01-10 11:41:16 -08:00
Dante Ruiz	6c51edec77	added context menu to tablet	2017-01-10 09:13:45 -08:00
Dante Ruiz	3fab901b49	commit chabges	2017-01-10 09:13:45 -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
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	2f5f53c8e4	cr	2017-01-06 10:28:09 -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	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	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
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
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
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
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
Faye Li	68aacfe544	added "updateAudioBar" function signature in header file	2017-01-03 12:38:23 -08:00
Faye Li	7e1b06efdc	slot function in QML	2017-01-03 11:15:28 -08:00
Anthony Thibault	c201b6a7f9	Merge pull request #9256 from druiz17/moreButtons ... all hub button now on tablet	2017-01-03 10:44:19 -08:00
Anthony J. Thibault	00980366d6	Merge branch 'master' into tablet-ui	2017-01-03 09:45:23 -08:00
Zach Fox	4a21eaa33f	Cleanup before PR	2016-12-30 15:18:01 -08:00
Zach Fox	951db2e2da	Bugs fixed!	2016-12-30 15:12:17 -08:00
Zach Fox	ea40582afb	Remaining bug: Hover when sort	2016-12-30 12:55:46 -08:00
Zach Fox	f26b7c0134	Checkpoint	2016-12-30 09:51:43 -08:00
Zach Fox	3bd68f5e3e	Checkpoint for removing userData	2016-12-29 16:09:31 -08:00
Zach Fox	be4050aa78	One bug down!	2016-12-29 15:43:42 -08:00
Zach Fox	f96508e197	Gotta fix these bugs...	2016-12-29 14:19:40 -08:00
Zach Fox	10b5b957f2	Ahh...It's beautiful and simple now.	2016-12-29 13:09:40 -08:00
Zach Fox	24eac77115	I'm about to refactor this.	2016-12-29 11:57:51 -08:00
Zach Fox	bb2b48d424	Getting very close.	2016-12-29 11:35:20 -08:00
Zach Fox	af1c67a252	Progress!	2016-12-28 17:23:56 -08:00
Zach Fox	d3700fc922	Fix merge errors	2016-12-28 15:47:28 -08:00
Zach Fox	46e8bf5283	First steps, holding off til Howard finishes	2016-12-28 15:12:21 -08:00
howard-stearns	768b747b3a	Make avatar go away when ignored, even when pal is up. (But currently, it ... comes back!)	2016-12-27 10:17:39 -08:00
Brad Davis	5b30f5da1b	Merge pull request #9259 from zfox23/FixRunningScripts ... Fix "Running Scripts" window being inaccessible	2016-12-23 15:37:24 -08:00
Zach Fox	72da05bb30	Merge pull request #9268 from zfox23/PalRefresh ... Add PAL refresh button	2016-12-23 15:16:51 -08:00
Zach Fox	5490dddbbf	Cool style changes!	2016-12-23 12:22:33 -08:00
David Kelly	9eed430f49	CR feedback	2016-12-22 18:09:19 -08:00
David Kelly	2e897e0cc9	Working first pass ... Seems roughly same as mic meter. Works for other avatars, though using agent avatars (crowd-agent.js + summon.js), seems not to work. I'll investigate that...	2016-12-22 14:01:03 -08:00
Zach Fox	d01500a7bb	Fix the bug?	2016-12-21 17:53:30 -08:00
Dante Ruiz	cad9f66572	removed qml generated buttons	2016-12-21 23:35:46 +00:00
Zach Fox	7c51d47ae4	Better separator	2016-12-21 14:11:14 -08:00
Zach Fox	1eea3ed27d	No more semicolons; tons of improvements	2016-12-21 12:48:26 -08:00
Zach Fox	630fb8696f	Lots of progress today	2016-12-21 12:48:26 -08:00
Zach Fox	0be4db1e68	Checkboxes!	2016-12-21 12:48:26 -08:00
Zach Fox	9b65a72bb5	Popup essentially done	2016-12-21 12:48:25 -08:00
Zach Fox	5b77202c52	Popups wow!	2016-12-21 12:48:25 -08:00
Zach Fox	db2da8f06b	Great cleanup	2016-12-21 12:48:25 -08:00
Zach Fox	7999e14ecf	Kinda screwed things up by changing styles	2016-12-21 12:48:25 -08:00
Zach Fox	feafc16833	Frequent checkpoints are good.	2016-12-21 12:47:38 -08:00
Zach Fox	e7c2229b2c	More progress	2016-12-21 12:46:23 -08:00
Zach Fox	deb40f67df	Steady progress	2016-12-21 12:46:23 -08:00
Zach Fox	46c787512e	Working	2016-12-21 12:46:23 -08:00
Zach Fox	5996228622	Starting off strong.	2016-12-21 12:46:23 -08:00
Anthony J. Thibault	ec38c4e319	Merge remote-tracking branch 'upstream/tablet-ui' into tablet-ui	2016-12-20 13:43:06 -08:00
Anthony J. Thibault	84db58dbc6	Make tablet.qml work on Web3DOverlay	2016-12-20 12:16:11 -08:00
Zach Fox	a18f9dbe90	PR comments; need particular fix on Master for full QA	2016-12-20 07:45:35 -08:00
Zach Fox	ba240854a7	Comments and clarity	2016-12-20 07:45:35 -08:00
Zach Fox	95e2f0687d	It's working! Untested on human avatars.	2016-12-20 07:45:35 -08:00
Zach Fox	54774950d2	Super close	2016-12-20 07:45:35 -08:00
Zach Fox	9c09ec6755	Checkpoint	2016-12-20 07:45:35 -08:00
howard-stearns	641f98589a	don't keep selection while things are disappearing	2016-12-20 07:43:48 -08:00
howard-stearns	db68a6adcd	fix broken search for myself	2016-12-20 07:43:48 -08:00
howard-stearns	07ab771c2b	update canKick whenever we get new data, instead of just at first use.	2016-12-20 07:43:48 -08:00
howard-stearns	d0cdd4d5c1	missing the ban button	2016-12-20 07:43:48 -08:00
howard-stearns	0e9b1b45f4	Don't show admin columns if you can't kick.	2016-12-20 07:43:48 -08:00
howard-stearns	5a97156151	no debug printing	2016-12-20 07:43:48 -08:00
howard-stearns	946d9aa346	checkpoint	2016-12-20 07:43:48 -08:00
howard-stearns	7e7ce0c103	checkpoint	2016-12-20 07:43:48 -08:00
Howard Stearns	b6b80fb9c1	checkpoint	2016-12-20 07:43:48 -08:00
howard-stearns	8d300eac76	pal prototype	2016-12-20 07:43:48 -08:00
David Rowe	1987719cfd	Display Clara.io download information	2016-12-20 07:33:55 -08:00
David Rowe	b672b7e177	Fix Clara download failing if move mouse after initiating download	2016-12-20 07:33:55 -08:00
David Rowe	7f809083dc	Use Clara.io API for FBX downloads	2016-12-20 07:33:55 -08:00
David Rowe	a4b2077d5a	Set auto adding for Clara downloads	2016-12-20 07:33:55 -08:00
David Rowe	467741f348	Add parameter that enables automatically adding download model to world	2016-12-20 07:33:55 -08:00
Chris Collins	61c60fca2d	Merge pull request #8968 from ctrlaltdavid/21089 ... Clara.io marketplace improvements	2016-12-19 18:21:45 -08:00
Anthony J. Thibault	a791ddcc22	Tablet can switch to a web url. ... Help button has been updated to switch to the help.html. It doesn't look good because the content was authored expecting landscape window, not portrait. The API is by no means final. But it exposes two methods to JS. * Tablet.gotoHomeScreen() - Used to forcefully go back to the home tablet "springboard", eventually this will hooked up to the tablet button. * Tablet.gotoWebScreen(url) - Causes the tablet to switch from the home "springboard" and load a web url. tabletTest.js and help.js have been updated to use this functionality.	2016-12-19 17:52:19 -08:00
Anthony J. Thibault	856791c11d	Made TabletRoot.qml the main tablet qml file. ... This file uses a Loader node to load, Tablet.qml.	2016-12-19 15:15:16 -08:00
Anthony J. Thibault	10f9233c90	Fixed js interface after recent Tablet.qml changes ... * TabletButton.inDebugMode defaults to false * TabletButton now listens to onIsActiveChanged event to flip state of button. * Fixed help.js and tabletTest.js to compensate for the removal of the TabletButton.color property	2016-12-19 12:20:56 -08:00
Zach Fox	a912fec496	PR comments; need particular fix on Master for full QA	2016-12-19 10:20:08 -08:00
Zach Fox	e940daf5b4	Comments and clarity	2016-12-19 10:20:08 -08:00
Zach Fox	aa837d8858	It's working! Untested on human avatars.	2016-12-19 10:20:08 -08:00
Zach Fox	2c5db54b08	Super close	2016-12-19 10:20:08 -08:00
Zach Fox	c9dc91900f	Checkpoint	2016-12-19 10:20:08 -08:00
Faye Li Si Fi	edd1a02aa1	added debug mode	2016-12-19 09:19:36 -08:00
Faye Li Si Fi	434e7dfbbd	reduce testing buttons number to 6	2016-12-19 09:13:12 -08:00
Faye Li Si Fi	01c5c2745d	remove commented out code, added uuid property	2016-12-16 16:29:02 -08:00
Faye Li Si Fi	4d98f6979c	hover state glow	2016-12-16 13:43:47 -08:00
Faye Li Si Fi	5200dd9581	New color scheme and button state styling	2016-12-16 11:50:04 -08:00
Anthony J. Thibault	3610beb2cd	bug-fix found in code review	2016-12-16 09:57:12 -08:00
David Rowe	9459b967be	Merge branch 'master' into 21089	2016-12-16 20:02:43 +13:00
Anthony J. Thibault	5441d33a25	Support for the ablity to change button properties from js.	2016-12-15 18:17:14 -08:00
Anthony J. Thibault	5d1ccfbccc	Tablet#removeButton now works properly	2016-12-15 15:49:37 -08:00
Anthony J. Thibault	8b99fa90e8	Merge branch 'master' into tablet-ui	2016-12-15 13:28:23 -08:00
Anthony J. Thibault	d2c4417b24	Hook up Help button to the new Tablet interface	2016-12-14 17:05:47 -08:00
Anthony J. Thibault	d4f9d21ce8	Pass tablet QQuickItem to TabletScriptingInterface ... Also, moved TabletScriptingInterface to script-engine library for easy access, baby.	2016-12-14 14:04:48 -08:00
Faye Li Si Fi	a651e19bdd	audio gradient bar length as a function of 0 to 1	2016-12-14 11:38:36 -08:00
howard-stearns	4503855ae8	don't keep selection while things are disappearing	2016-12-13 17:00:24 -08:00
howard-stearns	a50b731faa	fix broken search for myself	2016-12-13 16:52:18 -08:00
howard-stearns	773bbc4ef1	update canKick whenever we get new data, instead of just at first use.	2016-12-13 16:30:16 -08:00
howard-stearns	00653b6b19	missing the ban button	2016-12-13 16:23:43 -08:00
Faye Li	53263789a0	fix relative path	2016-12-13 16:04:25 -08:00
howard-stearns	03d3e0b550	Merge branch 'master' of https://github.com/highfidelity/hifi into pal-proto	2016-12-13 16:03:00 -08:00
Faye Li	5b8e80654d	button glow on hover	2016-12-13 16:01:50 -08:00
Faye Li	ad905ac6dc	drop shadow on tablet buttons + set text at instantiation	2016-12-13 15:32:21 -08:00
Brad Hefta-Gaub	a2ba03284e	Merge pull request #9186 from ZappoMan/kinectPlugin ... Kinect Plugin	2016-12-13 15:29:41 -08:00
howard-stearns	b0a69468d2	Don't show admin columns if you can't kick.	2016-12-13 15:16:18 -08:00
howard-stearns	adbfa0752a	no debug printing	2016-12-13 15:09:46 -08:00
howard-stearns	c9827d1521	checkpoint	2016-12-13 15:05:08 -08:00
howard-stearns	86010af828	checkpoint	2016-12-13 13:01:45 -08:00
Faye Li	8fcc42e537	overriding colors at tablet buttons instantiation	2016-12-13 12:34:38 -08:00
Howard Stearns	7c92ad5ced	checkpoint	2016-12-13 09:15:28 -08:00
David Rowe	1f3045ad30	Merge branch 'master' into 21089 ... Conflicts: interface/src/Application.cpp	2016-12-13 14:05:24 +13:00
howard-stearns	712543a39a	Merge branch 'master' of https://github.com/highfidelity/hifi into pal-proto	2016-12-12 16:37:41 -08:00
howard-stearns	4b5aae3c55	pal prototype	2016-12-12 16:37:16 -08:00
Seth Alves	d97be52542	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2016-12-12 16:24:17 -08:00
Zach Fox	7030c7b0a6	Space bubble improvements (#9142) ... * The space bubble around a player's avatar is now visualized. When another avatar enters a player's bubble, The bubble visualization will appear, a soft tone will play, and the "Bubble" HUD button will flash. * The space bubble radius setting has been removed. Space bubble size now scales based on avatar scale. * Space bubble collision detection is now more accurate and reliable. * CTRL + N toggles the bubble. * The "Bubble" HUD button has been moved to the proper location.	2016-12-12 14:22:54 -08:00
Brad Hefta-Gaub	4959a88581	first cut at kinect input plugin	2016-12-08 22:13:56 -08:00
Anthony J. Thibault	319bb9ce78	Prototype of Tablet.qml hacked to appear on ALL web entities.	2016-12-08 15:31:00 -08:00
David Rowe	a75d0b3fe8	Merge branch 'master' into 21089	2016-11-30 14:50:51 +13:00
Anthony J. Thibault	9b0ce556e7	Added preferences for the Perception Neuron plugin. ... By default this plugin is disabled. The server address and port number are also configurable.	2016-11-23 10:10:00 -08:00
howard-stearns	81786bf819	animate suggestions when available	2016-11-21 16:46:10 -08:00
howard-stearns	5b57354624	crazy workaround for qt bug	2016-11-16 17:03:24 -08:00
howard-stearns	050d343849	styling changes	2016-11-16 15:54:11 -08:00
howard-stearns	b0518feee4	split ToolbarButton.qml into a stateful image part	2016-11-15 14:59:27 -08:00
howard-stearns	9809515853	styling	2016-11-15 14:12:27 -08:00
howard-stearns	6078b833a1	Merge remote-tracking branch 'origin/group-snapshots-by-place' into no-snapshots-welcome	2016-11-14 13:47:32 -08:00
Howard Stearns	fac5d1e12e	group snapshots by place	2016-11-12 17:00:54 -08:00
Howard Stearns	17428d7ecb	tab-like filtering of suggestions by type	2016-11-12 15:23:11 -08:00
David Rowe	84795439ea	Display Clara.io download information	2016-11-10 16:29:48 +13:00
David Rowe	d33ac21aaa	Merge branch 'master' into 21089	2016-11-08 08:23:10 +13:00
David Rowe	d1e54a9217	Fix Clara download failing if move mouse after initiating download	2016-11-04 10:49:16 +13:00
howard-stearns	3a072b5bf9	tell desktop about preference changes	2016-11-03 12:17:28 -07:00
howard-stearns	6aad78c8e8	Merge branch 'fogbugz_2028_part2' of https://github.com/zfox23/hifi into centered-toolbar	2016-11-03 11:23:47 -07:00
Zach Fox	9a22c29788	Get ready for merge	2016-11-03 11:20:08 -07:00
Zach Fox	b74c1d3476	tabs to spaces	2016-11-03 10:42:15 -07:00
Zach Fox	a12e0325bf	Making progress...	2016-11-03 10:39:55 -07:00
howard-stearns	f3d4821579	constrain toolbar based on setting. (ui for settings to come.)	2016-11-03 10:39:53 -07:00
howard-stearns	90ebbb79c1	centered toolbar	2016-11-02 15:37:53 -07:00
David Rowe	427c8008c6	Merge branch 'master' into 21089	2016-11-03 09:18:25 +13:00
Zach Fox	b98c6cb50f	Change 'Snapshot' to 'snapshot' and use smaller font	2016-11-01 14:49:18 -07:00
Zach Fox	c4b59eafbb	Add 'Snapshot' text. My very first commit!	2016-11-01 14:09:25 -07:00
David Rowe	667a777695	Use Clara.io API for FBX downloads	2016-11-01 23:43:15 +13:00
David Rowe	e0ef24a460	Set auto adding for Clara downloads	2016-10-30 15:35:20 +13:00
David Rowe	12747d26e0	Add parameter that enables automatically adding download model to world	2016-10-30 13:58:17 +13:00
Howard Stearns	0eee6f8abd	Merge pull request #8844 from huffman/fix/hud-position ... Update default system toolbar position	2016-10-20 16:07:20 -07:00
Ryan Huffman	3ad039cadc	Update default system toolbar position	2016-10-18 13:57:03 -07:00
Stephen Birarda	5682d51667	use the HFWebEngineProfile in Desktop.qml	2016-10-18 11:42:55 -07:00
Stephen Birarda	c4cec8eb1e	use desktop profile again, move classes to networking subdir	2016-10-18 10:22:31 -07:00
Stephen Birarda	3ce47631b7	move the intercepted web engine profile to BaseWebView	2016-10-17 14:25:59 -07:00
Stephen Birarda	b4b5c648c2	use a QWebEngineProfile request interceptor for auth in HTTP header	2016-10-17 11:34:37 -07:00
David Rowe	31b35f0a35	Only raise keyboard if in HMD display mode	2016-10-12 09:43:33 +13:00
David Rowe	f8572096b1	Merge branch 'master' into 21055	2016-09-28 20:00:04 +13:00
David Rowe	bc8c400448	Fix up keyboards in attachments dialogs	2016-09-26 16:39:34 +13:00
David Rowe	023efe05f0	Move keyboard QML files	2016-09-25 09:54:48 +13:00
David Rowe	52137cb3c1	Put keyboard at bottom of scrolling dialogs rather than under controls	2016-09-24 11:40:38 +12:00
howard-stearns	17549348b4	less busy hotspotting, and make use of restricted feed (by protocol)	2016-09-22 16:48:16 -07:00
Howard Stearns	8e9b743515	rollover images	2016-09-21 19:15:01 -07:00
howard-stearns	41b20dc69d	single feed with snapshot and concurrency, no radio buttons, mini-card ... has two hotspots that bring up different kinds of cards, and anywhere else on the minicard takes you "there".	2016-09-21 16:00:29 -07:00
Seth Alves	753e4c4c7b	keyboard for avatar attachment model url dialog	2016-09-12 16:49:10 -07:00
Seth Alves	2c0676d9b1	make qml keyboard work better in running-scripts dialog	2016-09-12 16:28:24 -07:00
Seth Alves	38a1556716	qml keyboard for running-scripts window	2016-09-12 13:28:46 -07:00
Brad Hefta-Gaub	3d54600843	Merge pull request #8513 from Atlante45/feat/network-port ... Add settings to change local port	2016-09-08 18:10:32 -07:00
howard-stearns	b918e1ec51	fix system toolbar following upgrade to QT 5.6	2016-09-08 11:32:12 -07:00
SamGondelman	038aba20e4	disable dropshadows if unsupported (OSX and AMD cards)	2016-09-06 17:36:57 -07:00
Atlante45	a8de6f0a57	Add settings to change local port	2016-09-06 10:18:42 -07:00
James B. Pollack	d9ebad7976	Merge pull request #8372 from elisa-lj11/zip_project ... Added Clara.io to the marketplace	2016-08-24 15:53:58 -07:00
howard-stearns	bc90b0bc43	pr review	2016-08-22 16:09:09 -07:00
howard-stearns	993340811f	switch over to metaverse server user story cards	2016-08-19 16:40:53 -07:00
elisa-lj11	8bc9a92429	removed extraneous debug prints	2016-08-19 11:32:13 -07:00
elisa-lj11	4c434e875e	fixed merge conflicts in Application.cpp	2016-08-19 09:46:22 -07:00
howard-stearns	d58cc8ddd9	use html card from user_story id, and close things when ... receiveHifiSchemeUrl	2016-08-17 16:35:29 -07:00
elisa-lj11	9ea9baeadf	Making JS/QML safer (DOES NOT WORK)	2016-08-16 14:12:19 -07:00
howard-stearns	2f114b9c92	fix image link. How did this ever work?	2016-08-16 10:38:00 -07:00
howard-stearns	747c43d065	basic user story card	2016-08-11 16:43:29 -07:00
howard-stearns	e6746acf4c	Merge branch 'master' of https://github.com/highfidelity/hifi into discovery	2016-08-11 15:40:26 -07:00
David Rowe	8e56e0bf18	Fix QML warning	2016-08-10 10:41:37 +12:00
elisa-lj11	a9a8710689	Switched saving download/upload to temporary directory	2016-08-04 17:01:19 -07:00
elisa-lj11	b1b2ea48b2	Made code more QA; extra browser and download widget close upon download	2016-08-04 17:01:19 -07:00
elisa-lj11	615627e981	Working download and unpackage from Clara.io	2016-08-04 16:59:38 -07:00
elisa-lj11	c36fc29363	Zip download works	2016-08-04 16:59:03 -07:00
howard-stearns	611223f013	highlight to show that the cards can be clicked	2016-07-29 15:49:20 -07:00
howard-stearns	ae9421f1f6	smaller user label, and use the word "people"	2016-07-29 15:22:08 -07:00
howard-stearns	ed811d0431	replace Row with ListView, but otherwise same user-functionality	2016-07-28 15:01:21 -07:00
howard-stearns	abb63139f6	Merge branch 'master' of https://github.com/highfidelity/hifi into suggestions	2016-07-18 16:29:49 -07:00
Brad Davis	9ebc0c28c8	Fix hover states for toolbar buttons	2016-07-15 17:12:49 -07:00
howard-stearns	f73c2b884d	Remove now-superflous Column.	2016-07-15 17:01:37 -07:00
howard-stearns	f00114e53e	Make it work with laser pointers (selection at least), and fix magic ... numbers.	2016-07-15 16:46:20 -07:00
howard-stearns	99e9a76803	Merge branch 'master' of https://github.com/highfidelity/hifi into suggestions	2016-07-15 16:14:48 -07:00
howard-stearns	289617d4ce	styling	2016-07-15 16:14:29 -07:00
howard-stearns	6fb2cedfe0	card default image: settable, use to start, and reset when needed	2016-07-15 13:42:31 -07:00
howard-stearns	e974bad8f0	Merge branch 'master' of https://github.com/highfidelity/hifi into suggestions	2016-07-15 10:36:19 -07:00
Brad Davis	43e045c22a	Restore mouseover events for items in windows	2016-07-14 17:40:05 -07:00
Brad Davis	a6d71f508e	Fix edit toolbar button vanishing, persistent edit button	2016-07-14 17:40:04 -07:00
Brad Davis	fdcbf71623	Remove fade effect from toolbar buttons	2016-07-14 17:40:02 -07:00
howard-stearns	3132cca482	prototype	2016-07-14 14:49:03 -07:00
Brad Davis	f2220288fb	Expand frame decoration when mouse is over a window in HMD mode	2016-07-12 16:40:53 -07:00
Brad Hefta-Gaub	b8d79ec263	Merge pull request #8179 from SamGondelman/snapshotFix3 ... Various snapshot improvements	2016-07-12 15:28:51 -07:00
Brad Hefta-Gaub	bcee128de0	Merge pull request #6959 from Triplelexx/20769 ... CR for Job #20769 - Touchscreen camera input for Interface	2016-07-11 14:24:52 -07:00
SamGondelman	b3513b543c	fixed snapshot path setting	2016-07-05 18:23:59 -07:00
Ryan Downe Karpf	7eb07cba4c	Merge pull request #8171 from jherico/qml_fixes ... Keyboard focus polish for Vive UI	2016-07-01 16:20:36 -07:00
howard-stearns	1ad9cfde99	make hud button participate in buttonState just like other toolbar ... chicklets	2016-07-01 13:54:00 -07:00
howard-stearns	02cc6cc567	hover states	2016-07-01 12:18:26 -07:00
SamGondelman	218b26b521	removed snapshot share dialog, ctrl s shouldn't leave you moving	2016-07-01 10:58:55 -07:00
howard-stearns	125f6d8b63	Merge branch 'master' of https://github.com/highfidelity/hifi into button-state	2016-06-30 16:49:19 -07:00
howard-stearns	f03f5f3e68	new icons	2016-06-30 16:47:10 -07:00
SamGondelman	69ffd63ba7	fix snapshot sharing window	2016-06-30 15:42:48 -07:00
Brad Davis	167cb72a0e	Don't auto-focus the filter field in running scripts	2016-06-30 15:18:59 -07:00
Triplelexx	fd4d9761ce	merge master and resolve conflicts ... * remove use of jointsCaptured flag in inputDevice update, TouchscreenDevice now locks the userInputMapper * resolve conflict in Application.cpp, userInputMapper no longer loads default mapping	2016-06-24 03:34:39 +01:00
Brad Davis	37e9f66639	Additional toolbar work	2016-06-20 15:41:21 -07:00
Bradley Austin Davis	ec615caa80	Support toolbar API	2016-06-17 13:06:42 -07:00
Bradley Austin Davis	33e9caa636	Simplify overlay conductor, menu interation	2016-06-15 17:24:39 -07:00
Bradley Austin Davis	175dbb8924	Merge remote-tracking branch 'upstream/master' into vive-ui	2016-06-14 09:48:56 -07:00
Brad Hefta-Gaub	7da29daf9d	Merge pull request #8036 from ctrlaltdavid/20955 ... Fix image2d overlay color property	2016-06-13 19:21:59 -07:00
Brad Davis	472a3540d7	Merge remote-tracking branch 'upstream/master' into vive-ui ... Conflicts: scripts/system/controllers/handControllerGrab.js	2016-06-10 10:43:09 -07:00
David Rowe	5352bd4b76	Fix height of Load Defaults button	2016-06-09 17:15:17 +12:00
Howard Stearns	bf48099286	Merge pull request #8032 from jherico/pin-button ... Add a constant hud toggle button to the UI	2016-06-08 10:33:11 -07:00
Brad Davis	ca6e86e767	Merge remote-tracking branch 'upstream/master' into vive-ui ... Conflicts: interface/resources/qml/hifi/dialogs/RunningScripts.qml	2016-06-07 21:51:47 -07:00
David Rowe	f9d6a7ba8d	Fix image2d overlay color property	2016-06-08 14:04:02 +12:00
Brad Davis	ba61491ee6	PR feedback	2016-06-07 15:33:00 -07:00
Brad Davis	b9ee0c087e	Add a constant hud toggle button to the UI	2016-06-07 13:45:23 -07:00
David Rowe	b6af46cac9	Add "Load Defaults" button to Running Scripts dialog ... And rename "Stop All" to "Remove All".	2016-06-07 11:30:07 +12:00
Brad Davis	8c13ff4ee1	Pinned UI support	2016-06-02 17:24:25 -07:00
David Rowe	504516b627	Merge branch 'master' into 20917	2016-05-24 08:03:54 +12:00
Brad Hefta-Gaub	00bd3b2e8a	remove more dead code	2016-05-20 13:43:08 -07:00
David Rowe	17b3101ca5	Merge branch 'master' into 20917	2016-05-20 18:50:01 +12:00
Atlante45	38f74c1843	Remove the last of the glow level	2016-05-14 14:49:31 -07:00
David Rowe	b6fcb77d6f	Update Running Scripts list to use updated QML table control	2016-05-12 17:16:56 +12:00
Brad Hefta-Gaub	4ab7b660d4	fix a bunch of bugs in qml window placement	2016-04-25 20:19:54 -07:00
Brad Hefta-Gaub	f4e4f217e8	Merge pull request #7642 from ctrlaltdavid/20872 ... Further restyling of edit.js	2016-04-22 13:46:26 -07:00
David Rowe	7b9e6b52fb	Merge branch 'master' into 20872 ... Conflicts: interface/resources/qml/hifi/dialogs/RunningScripts.qml	2016-04-22 13:19:47 +12:00
David Rowe	a7b82e8cae	Decouple ui and shared libraries	2016-04-22 12:58:47 +12:00
David Rowe	266e4c998b	Don't show "Reveal Scripts Folder" link when open Running Scripts in HMD	2016-04-22 12:29:22 +12:00
David Rowe	6c5335cfa7	Replace button with icon and text	2016-04-21 15:17:06 +12:00
David Rowe	9c9bca546c	Add button that opens scripts directory window	2016-04-21 11:52:03 +12:00
David Rowe	43f843f731	Retrofit updated margins and spacing to QML dialogs	2016-04-13 16:39:52 +12:00
David Rowe	f7f5443a44	Merge branch 'master' into 20872 ... Conflicts: examples/html/entityProperties.html	2016-04-12 15:40:35 +12:00
David Rowe	e37e46d34a	Disable arrow keys being able to move between HTML form fields ... Moving between form fields with arrow keys makes it to easy to make unintended changes to adjacent fields.	2016-04-08 10:30:00 +12:00
David Rowe	4e3cdf6569	Update Running Scripts' search to have rounded ends and a search icon	2016-04-07 12:32:27 +12:00
Triplelexx	11af0a421b	Merge branch 'master' into 20769	2016-04-03 22:57:55 +01:00
David Rowe	13ab854a9d	Reduce space between collapsed sections ... In settings dialogs as well as entities editor.	2016-03-31 15:02:16 +13:00
David Rowe	51728d14a7	Miscellaneous improvements to Attachments dialog	2016-03-24 21:17:36 +13:00
Stephen Birarda	34fb06a7bd	changes to attachments dialog from contractor	2016-03-23 13:52:47 -07:00
timemarkov	160b4e7ba2	Implement new design of attachment dialog	2016-03-18 12:11:00 +01:00
David Rowe	48d4316714	Fix typo	2016-03-17 09:34:21 +13:00
Atlante45	5a0beec1f5	Replace old drag&drop with new UI	2016-03-09 11:47:31 -08:00
Atlante45	ded449072f	Rename window	2016-03-08 13:13:45 -08:00
Atlante45	784f669998	First draft Assets Manager	2016-03-08 13:13:45 -08:00
David Rowe	1eb6fa425c	Fix up Running Scripts dialog	2016-03-03 20:09:50 +13:00
David Rowe	4d53dee29c	Rename section control	2016-03-02 19:46:26 +13:00
David Rowe	e79427bb3b	Make some settings dialogs have collapsible sections	2016-03-02 19:41:50 +13:00
David Rowe	16fbf60bae	Update preferences dialog titles to match menu items	2016-03-02 11:52:58 +13:00
David Rowe	a25702535b	Style snapshots section	2016-02-26 14:01:57 +13:00
David Rowe	d255ad3805	Improve property naming	2016-02-26 10:17:36 +13:00
David Rowe	09029e4edd	Change name of dialog to match menu item	2016-02-25 20:37:54 +13:00
David Rowe	10efbd996f	Update General Settings dialog to use new window frame style	2016-02-25 20:26:36 +13:00
Brad Hefta-Gaub	1699e4a396	Merge pull request #7131 from ctrlaltdavid/20805 ... Restyle the Running Scripts dialog	2016-02-24 13:45:40 -08:00
David Rowe	bac703b29e	Adjust height of Running Scripts now that fonts are consistently sized	2016-02-24 12:36:46 +13:00
Brad Hefta-Gaub	71262c3e64	cleaner QML rejection of mouse messages	2016-02-23 11:14:16 -08:00
Brad Hefta-Gaub	2db25690f1	detect when mouse is over QML overlays or 2D JS Overlays	2016-02-23 10:14:44 -08:00
David Rowe	e30135a89d	Increase height of dialog to avoid scrollbars	2016-02-23 20:05:45 +13:00
David Rowe	db6c76bf67	Merge branch 'master' into 20805	2016-02-22 13:15:40 +13:00
James B. Pollack	afb6f1fe84	no clipboard	2016-02-19 13:50:30 -08:00
James B. Pollack	66e8f070e4	popup windows	2016-02-19 13:48:54 -08:00
David Rowe	54b27f3ac3	Merge branch 'master' into 20805	2016-02-18 23:35:37 +13:00
David Rowe	b68837277c	Fix default focus	2016-02-18 22:12:43 +13:00
David Rowe	d32f743f52	Style running scripts and available scripts tables	2016-02-18 16:35:51 +13:00
David Rowe	b2314d33ba	Style and lay out text fields	2016-02-17 20:44:09 +13:00
David Rowe	61d359a9b5	Style Button controls	2016-02-17 16:12:11 +13:00
David Rowe	1164e3e303	Set up window pane's content width so that can right-align	2016-02-17 15:35:35 +13:00
David Rowe	386a247f78	Put Running Scripts content into sections	2016-02-16 17:48:21 +13:00
David Rowe	4d74bb04b0	Style scrollbar	2016-02-16 09:48:09 +13:00
howard-stearns	7057d5c40c	Snap Turn avatar preference. (Still tied to Developer menu item.)	2016-02-15 12:38:40 -08:00
David Rowe	9a536b3b33	Specify a minimum Running Scripts window size	2016-02-15 18:02:59 +13:00
David Rowe	a5da678d6e	Make Running Scripts dialog content scrollable when needed	2016-02-15 18:02:20 +13:00
David Rowe	31930e879a	Style content background, size frame, and position frame elements	2016-02-14 21:01:23 +13:00
David Rowe	3d8df56baa	Copy bare minimum of files as start of restyling Running Scripts dialog ... And add license headers to files.	2016-02-12 10:13:06 +13:00
Zach Pomerantz	5eeaa9a33e	Move graphics settings to dedicated dialog	2016-02-11 10:00:44 -08:00
Brad Davis	e376b781c1	Keyboard navigation in running scripts list	2016-02-08 16:12:23 -08:00
Bradley Austin Davis	ebf0bf394a	Fix native text rendering by forcing positions to integer values	2016-02-05 11:43:31 -08:00
Bradley Austin Davis	320c4d27b5	Force Qt (rather than OS) rendering in a number of places	2016-02-03 14:51:05 -08:00
Bradley Austin Davis	bc7fda0ae9	Set desirable global settings for QML web views	2016-02-02 15:19:47 -08:00
Andrew Meadows	e394f64540	Merge pull request #6991 from seefo/master ... Added camera sensitivity dialog preferences	2016-02-02 08:22:45 -08:00
Brad Davis	27c38599a9	Snapshot dialogs	2016-02-01 11:07:48 -08:00
Seefo	ffa6687af3	Added setting dialogs for camera pitch and yaw	2016-01-29 19:34:57 -05:00
Brad Davis	8c19b95ea2	Fix oversized text, invalid color handling	2016-01-28 16:36:28 -08:00
Brad Davis	5b817ccc21	Make all 2D overlays QML	2016-01-28 16:03:26 -08:00
samcake	f4e0352f61	Merge pull request #6930 from zzmp/feat/bubble-render-settings ... Bubble up render settings from CPP to JS/QML	2016-01-27 14:20:51 -08:00
Brad Davis	f53aaa1d64	Removing old attachment dialog, updating menu code	2016-01-26 21:55:42 -08:00
Brad Davis	2956557c5f	Adding overlay compatible combo-box	2016-01-26 21:55:41 -08:00
Brad Davis	664100b9b1	Attachment dialog	2016-01-26 21:55:40 -08:00
Zach Pomerantz	bed325d675	Add Graphics to general settings	2016-01-25 15:17:43 -08:00
Brad Davis	bbefafcb07	Break up preferences dialogs	2016-01-23 23:11:41 -08:00
Brad Davis	8e57f06de2	Add browser action shortcut to our custom desktop	2016-01-23 22:06:59 -08:00
Brad Davis	208d7c3cfc	Killing the old preferences dialog	2016-01-22 19:24:38 -08:00
Brad Davis	71ae36f5c0	Button prefs and conditionally enabled prefs	2016-01-22 19:06:30 -08:00
Brad Davis	27fdb523cb	Add directory & avatar browsing preferences	2016-01-22 17:30:10 -08:00
Brad Davis	c7186590ea	Support for directory browsing	2016-01-22 17:30:09 -08:00
Brad Davis	2026821d9e	Moving preferences to dependency mananger	2016-01-22 17:30:08 -08:00
Brad Davis	205ab05506	First pass on preferences dialog ... Conflicts: tests/ui/qmlscratch.pro	2016-01-22 17:30:07 -08:00
Brad Davis	d2900200a1	More cleanup & menu fixing	2016-01-20 11:23:56 -08:00
Brad Davis	746c388f7a	Cleanup of QML windowing and message boxes	2016-01-15 23:14:49 -08:00