2957 commits

Author	SHA1	Message	Date
Zach Pomerantz	eb4255e1ac	fix audio checkbox bindings	2017-06-15 18:21:23 -04:00
David Kelly	3d922f5db6	works, sorta, but blinks like crazy, cursor gets f-ed up...	2017-06-15 14:17:43 -07:00
Zach Pomerantz	3093a73ce1	Merge branch 'master' of github.com:highfidelity/hifi into audio/parity	2017-06-15 15:04:06 -04:00
Dante Ruiz	a1782bf7d2	Merge branch 'controller-ui' into hand-pucks	2017-06-15 16:27:55 +01:00
Dante Ruiz	d65c0dfbac	Merge branch 'master' of github.com:highfidelity/hifi into controller-ui	2017-06-15 16:24:59 +01:00
NeetBhagat	a6b1b17d45	Merge branch 'master' into 21369	2017-06-15 11:04:22 +05:30
David Kelly	54dfc33b38	initial skeleton of qml objects	2017-06-14 14:36:37 -07:00
Zach Fox	6b6b6026a4	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-14 13:44:13 -07:00
Zach Pomerantz	bc44e7beaf	bring qml to standard	2017-06-14 10:25:41 -04:00
Zach Fox	37e72f25a3	Make the PAL's tab background color white	2017-06-13 16:04:14 -07:00
Zach Pomerantz	a8f69bb2e0	Merge branch 'master' of github.com:highfidelity/hifi into audio/parity	2017-06-13 17:41:52 -04:00
Zach Pomerantz	e7da007acd	only show Audio menu title when appropriate	2017-06-13 17:13:39 -04:00
Dante Ruiz	ef9a211f6e	adding hand punck	2017-06-13 21:15:16 +01:00
Zach Pomerantz	20c0dac8e8	update QML with Audio.muted	2017-06-13 16:10:16 -04:00
Zach Pomerantz	bf5c70501d	rm tester script	2017-06-13 14:54:53 -04:00
Zach Pomerantz	1a046b4d91	propagate title in Audio dialog qml	2017-06-13 14:42:48 -04:00
NeetBhagat	9646eba873	Complete console.trace and added a testcases for all 13 functions.	2017-06-13 23:52:48 +05:30
Zach Fox	7d1a7f4c0b	Merge branch 'master' of https://github.com/highfidelity/hifi into ... spectator-camera - INCLUDING MERGE CONFLICT FIXES	2017-06-13 09:42:14 -07:00
Zach Pomerantz	89bd895054	mv showAudioTools to just AvatarInputs	2017-06-13 12:31:05 -04:00
NeetBhagat	b0e9c62c12	Merge branch 'master' of https://github.com/highfidelity/hifi into 21369	2017-06-13 10:10:44 +05:30
Zach Pomerantz	b37a0239b0	up to reverb (needs cherry-picking)	2017-06-12 18:00:52 -04:00
Bradley Austin Davis	1968ecbc8f	Simplify eventBridge mechanism exposing functionality to web pages	2017-06-12 14:46:37 -07:00
Dante Ruiz	89b0e31edc	update calibrate button glyph	2017-06-12 22:21:46 +01:00
Dante Ruiz	bbe675ab72	making final changes	2017-06-12 22:01:41 +01:00
Zach Pomerantz	858b980c16	add qml Separator	2017-06-12 15:18:16 -04:00
Dante Ruiz	1b13cd6d45	saving work	2017-06-12 17:31:02 +01:00
Dante Ruiz	067fc9bb98	fixed merge conflict	2017-06-12 16:45:34 +01:00
NeetBhagat	e6a5930365	Merge branch 'master' into 21369	2017-06-12 11:17:26 +05:30
druiz17	f6ef1443c8	some more clean up	2017-06-11 12:08:45 -07:00
Dante Ruiz	ef1be931dc	preparing to clean code	2017-06-10 00:50:32 +01:00
ZappoMan	6fe20f90a3	add better debugging for audio problems ... use OS default device if settings have no values	2017-06-09 13:36:12 -07:00
Zach Fox	a4f5d327a2	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-09 11:38:35 -07:00
NeetBhagat	c5d8268007	Merge branch 'master' of https://github.com/highfidelity/hifi into 21369	2017-06-09 18:04:34 +05:30
Dante Ruiz	73e628461e	confiration update status	2017-06-09 00:44:05 +01:00
Dante Ruiz	c97ea84cbf	saving work	2017-06-08 17:44:55 +01:00
howard-stearns	fa74daf875	Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor	2017-06-07 16:43:25 -07:00
Dante Ruiz	11409aae9b	connect the ui with the input plugins	2017-06-08 00:34:52 +01:00
howard-stearns	8db81ee5c9	wire up preview vs camera display in scripts	2017-06-07 16:19:36 -07:00
Zach Fox	d1719fade6	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-07 09:46:04 -07:00
NeetBhagat	ead0d42cf3	Merge branch 'master' into 21369 ... # Conflicts: # libraries/gl/src/gl/OffscreenQmlSurface.cpp # libraries/gl/src/gl/OffscreenQmlSurface.h	2017-06-07 15:47:19 +05:30
NeetBhagat	904e25c9e3	intial commit #21369 Working on clear method of console	2017-06-07 14:37:18 +05:30
Dante Ruiz	4ba1fdc323	elimated uncofigurable items from the list	2017-06-07 00:48:12 +01:00
Dante Ruiz	70ba344f1b	finished openvr ui	2017-06-07 00:25:08 +01:00
Zach Fox	6e9b083be1	Function renaming; turn cam off when changing domains	2017-06-06 15:49:15 -07:00
Zach Fox	383ef542a1	Remove 'debugSelfie.js'; Change 'HMD' to 'VR headset'	2017-06-06 14:59:26 -07:00
Zach Pomerantz	2b99f299c8	testing	2017-06-06 17:54:52 -04:00
Zach Fox	b50cf6cee6	Quick feedback from Alan	2017-06-06 14:50:01 -07:00
Zach Fox	ca05e3d0b6	Improvements to switch; switch settings persist	2017-06-06 14:17:38 -07:00
Zach Fox	afb7e72b25	Separator; Switch.qml updates; etc	2017-06-06 13:51:07 -07:00
Dante Ruiz	bb7c424d47	get ui working	2017-06-06 21:09:09 +01:00
Zach Fox	557d1c65a3	Another checkpoint; added Switch.qml	2017-06-06 11:59:23 -07:00
Zach Fox	9970802142	Another checkpoint	2017-06-06 11:59:22 -07:00
Zach Fox	1fc7094b2c	Checkpoint	2017-06-06 11:59:22 -07:00
Zach Fox	e9bb982651	First checkpoint!	2017-06-06 11:59:22 -07:00
Dante Ruiz	038ffe920a	fixing merge conflicts	2017-06-06 16:42:08 +01:00
Dante Ruiz	19b134b0ac	base ui working	2017-06-06 00:32:20 +01:00
Bradley Austin Davis	995fe11c05	Migrate to single QML engine	2017-06-05 15:14:44 -07:00
Zach Pomerantz	d8815d1dce	prep audio menu	2017-06-05 16:24:00 -04:00
Zach Pomerantz	7cb38d22c3	fix AudioBuffers to work in tablet	2017-06-05 15:06:47 -04:00
Howard Stearns	556dcd69ac	wording change regarding use of exact for floors	2017-06-03 15:48:48 -07:00
Dante Ruiz	f0f10f74c6	inpput configutration stub	2017-06-03 00:30:00 +01:00
Brad Davis	9a80a81321	Merge pull request #10565 from vladest/fix_claraio_download_clones ... Make sure that there is only one connection created for web events, s…	2017-06-01 20:42:50 -07:00
anshuman64	694d1d042d	Merge pull request #10573 from druiz17/head-puck ... Added head puck configuration	2017-06-01 16:06:00 -07:00
David Kelly	f79c9ea021	we can sort on ignored	2017-06-01 07:29:31 -07:00
David Kelly	a17886aa58	do not allow sorting on non-sortable columns in PAL	2017-06-01 07:24:03 -07:00
Zach Pomerantz	2b40ad4275	mv Audio... to Settings as dialog	2017-05-28 17:42:24 -04:00
Zach Pomerantz	8ca8c3aa69	mv AudioPreferencesDialog to AudioBuffers	2017-05-28 17:40:57 -04:00
Vladyslav Stelmakhovskyi	bcee25acc7	Make sure that there is only one connection created for web events, so downloads from CLARA IO not duplicated	2017-05-28 19:54:41 +02:00
Dante Ruiz	a45bea2c90	fixed merge conflicts	2017-05-27 00:57:09 +01:00
Sam Gateau	f9c6cecb23	Merge pull request #10529 from samcake/ambient ... Fix compressed texture size evaluation and Cleaning up the texture counters (number and memory) for better reporting	2017-05-24 10:48:21 -07:00
Brad Hefta-Gaub	eca045714b	Merge pull request #10532 from ctrlaltdavid/21344 ... Display spinner in Web controls when they're loading an HTTP page	2017-05-23 16:39:17 -07:00
Thijs Wenker	962d95ca46	add more precision to attachment scale in attachment dialog	2017-05-23 18:16:08 +02:00
David Rowe	bc4af86b57	Display spinner in Web controls when they're loading an HTTP page	2017-05-23 15:40:35 +12:00
samcake	e0487f7e04	Solving the size evaluation for compressed format	2017-05-22 16:51:54 -07:00
samcake	e4f9f2935e	Solving the size evaluation for compressed format	2017-05-22 15:42:18 -07:00
samcake	80b6fd65ae	Cleaning up counters and naming schemes...	2017-05-17 18:31:28 -07:00
Zach Fox	b9ddc3b19f	Improve robustness of display name focus in PAL	2017-05-16 16:25:22 -07:00
David Kelly	a9716313be	cr feedback -- really good feedback in fact	2017-05-11 17:02:37 -07:00
David Kelly	ae5f9e4fb1	animate scroll of partially visible cards	2017-05-11 15:10:19 -07:00
druiz17	e4df4369ad	Merge pull request #10436 from druiz17/config-ui ... Added the ability to choose puck configuration from the general settings	2017-05-11 13:39:05 -07:00
Vladyslav Stelmakhovskyi	bd6ac7a39e	Code style fixes	2017-05-11 20:38:09 +02:00
Dante Ruiz	4365907462	drop down puck configuration for gernal settings	2017-05-10 22:12:11 +01:00
Vladyslav Stelmakhovskyi	2328da3c48	Merge branch 'master' into audio-source-sync	2017-05-10 21:22:40 +02:00
Vladyslav Stelmakhovskyi	2d46f9d30e	Move most of the logic to C++ model, speed up initialization. Reduce number of AudioClient blocking calls to minimum	2017-05-10 21:21:39 +02:00
Zach Fox	cf3c10c5b1	Fix the bugs, add the feature	2017-05-09 14:40:41 -07:00
Vladyslav Stelmakhovskyi	7ab6909c77	Merge branch 'master' into audio-source-sync	2017-05-09 11:08:08 +02:00
David Rowe	116175cf9f	Fix going back from Twitter password recovery page	2017-05-09 09:03:48 +12:00
David Rowe	c8328e9b9f	Merge branch 'master' into 21319	2017-05-09 08:04:27 +12:00
Vladyslav Stelmakhovskyi	fa9a4053ca	Save selected device in settings to make sure it will not be changed back in Menu	2017-05-08 21:24:46 +02:00
Vladyslav Stelmakhovskyi	d0111ac0bb	Merge branch 'master' into audio-source-sync	2017-05-08 20:09:34 +02:00
David Rowe	1b26ba22cb	Fix browser history in goto "i" pages on tablet	2017-05-06 11:13:13 +12:00
Zach Fox	6b00688289	Merge pull request #10392 from zfox23/AvailabilityLanguageChanges ... "Set Availability" UI changes	2017-05-05 14:03:39 -07:00
Zach Fox	a10606b994	OMG language changed again	2017-05-05 11:44:59 -07:00
Zach Fox	905f36976f	New language	2017-05-05 11:28:49 -07:00
howard-stearns	2ecc71a990	Annoncement Card visual tweeks.	2017-05-05 10:49:09 -07:00
Zach Fox	b41fb952ae	UI changes - Thanks Alan!	2017-05-05 10:29:46 -07:00
Andrew Meadows	f809afae2f	Merge pull request #10363 from jherico/qmlspam ... Removing logspam on toggling scripts window	2017-05-05 08:29:12 -07:00
David Rowe	88dc6b5f61	Fix tablet Web view "back" button not greying out when disabled	2017-05-05 17:24:36 +12:00
Howard Stearns	fc9e9e1d28	Merge pull request #10374 from howard-stearns/notification-circumstances ... Notification circumstances	2017-05-04 16:18:58 -07:00
howard-stearns	9954380ce3	don't filter out the place you're at anymore	2017-05-04 14:44:48 -07:00
Andrew Meadows	7cb2bff4c5	Merge pull request #10350 from sethalves/fix-vr-2d-vr-tablet-crash ... Fix vr 2d vr tablet crash	2017-05-04 10:08:55 -07:00
humbletim	34cadfc876	sort RunningScripts by caseless filename	2017-05-04 11:22:30 -04:00
David Rowe	30604ab901	Fix some typos noticed in passing	2017-05-04 16:56:18 +12:00
David Rowe	9d92ed2b9b	Fix keyboard not appearing in social media snapshot sharing dialogs	2017-05-04 16:55:10 +12:00
David Rowe	8ae3d4e8a0	Merge branch 'master' into 21314 ... # Conflicts: # interface/resources/qml/controls/TabletWebView.qml	2017-05-04 13:10:09 +12:00
Zach Fox	affc7fc654	Merge pull request #10369 from druiz17/url-fix ... Fix tablet webview showing incorrect url.	2017-05-03 16:58:06 -07:00
Zach Fox	d28d89e8ff	Merge pull request #10368 from zfox23/palWebViewtoTabletWebView ... PAL WebView is now a TabletWebView	2017-05-03 16:51:32 -07:00
Dante Ruiz	5390a29859	tabletwebview-url-fix	2017-05-03 23:05:05 +01:00
Zach Fox	eaf819d11d	Remove FIXME	2017-05-03 14:59:07 -07:00
Zach Fox	066b2db73f	Make the change	2017-05-03 14:57:31 -07:00
Brad Davis	8e12c1959d	Removing logspam on toggling scripts window	2017-05-03 09:53:32 -07:00
David Rowe	7fdcb9b1f0	Fix numeric keys not displaying in social media sharing dialogs	2017-05-03 14:59:41 +12:00
David Rowe	7b387c52c3	Fix reliability of keyboard enabling in tablet Web pages	2017-05-03 14:42:06 +12:00
Vladyslav Stelmakhovskyi	e789b69a8e	Merge branch 'master' into audio-source-sync	2017-05-02 20:57:01 +02:00
Seth Alves	6b2caf8081	Merge branch 'master' of github.com:highfidelity/hifi into fix-vr-2d-vr-tablet-crash	2017-05-02 09:41:47 -07:00
druiz17	18368cc073	Merge pull request #10343 from druiz17/tabletwebview-fix-links ... fix Tablet webview issues of not loading correct url.	2017-05-02 08:09:22 -07:00
Seth Alves	71deac49c6	reset tablet to homescreen when going from 2d to vr	2017-05-01 17:06:15 -07:00
Howard Stearns	73c24a5240	Merge pull request #10344 from howard-stearns/announcement-styling ... goto announcement card styling	2017-05-01 16:41:39 -07:00
howard-stearns	ca5318f121	remove debugging code	2017-05-01 15:57:22 -07:00
howard-stearns	545fd1355f	cleanup	2017-05-01 15:45:26 -07:00
howard-stearns	61b738e3cd	announcment styling	2017-05-01 15:35:17 -07:00
Dante Ruiz	a08b55d5f5	minimize diff	2017-05-01 23:08:25 +01:00
druiz17	67daa4b0a9	Merge pull request #10335 from druiz17/webview-js ... Implemented of a web app to bring up the tablet webView	2017-05-01 15:03:55 -07:00
Dante Ruiz	b00d7d763a	Merge branch 'master' of github.com:highfidelity/hifi into tabletwebview-fix-links	2017-05-01 22:45:42 +01:00
Dante Ruiz	64b8237bd6	fix twitter and facebook links	2017-05-01 22:45:13 +01:00
Dante Ruiz	62870d85d3	Merge branch 'webview-js' of github.com:druiz17/hifi into tabletwebview-fix-links	2017-05-01 21:58:09 +01:00
Dante Ruiz	bb9eb98625	prevent mouse events from propagating to far	2017-05-01 21:49:57 +01:00
Dante Ruiz	c205bf0980	working on cleaner navigation	2017-05-01 21:23:38 +01:00
Dante Ruiz	763feccbe1	removed tabs	2017-05-01 18:07:42 +01:00
Dante Ruiz	9f33af479d	saving work	2017-05-01 18:04:22 +01:00
Vladyslav Stelmakhovskyi	28447cde0b	Get rid of QML errors in HMD mode. Sync Audio menu in Tablet/HMD without recreating menu items	2017-05-01 18:41:38 +02:00
druiz17	f60deb0cfc	fixed the twitter link	2017-04-30 22:55:44 -07:00
druiz17	2bf7b12c7d	open webview from tabletwebscreen	2017-04-30 15:27:34 -07:00
Howard Stearns	b6ae0a5bde	add nextTick, and cleanup	2017-04-28 20:06:13 -07:00
howard-stearns	f9debf1388	checkpoint	2017-04-28 16:53:08 -07:00
Dante Ruiz	59f84a60c5	saving work	2017-04-29 00:31:09 +01:00
Vladyslav Stelmakhovskyi	368334e07e	Merge branch 'master' into audio-source-sync	2017-04-28 23:04:17 +02:00
Vladyslav Stelmakhovskyi	d18ac6dd49	Reimplemented Tablet Audio screen using C++ model	2017-04-28 23:02:28 +02:00
Howard Stearns	0ad8f4d985	remove debugging	2017-04-28 07:15:22 -07:00
howard-stearns	aed762e986	ux	2017-04-27 17:16:03 -07:00
howard-stearns	e4f259e630	back to non-fake data	2017-04-27 13:01:33 -07:00
howard-stearns	56196c03a3	pr review	2017-04-27 12:56:32 -07:00
howard-stearns	97777a416d	Merge branch 'master' of https://github.com/highfidelity/hifi into new-address-bar	2017-04-27 12:02:02 -07:00
anshuman64	d146431e9b	Merge pull request #10268 from druiz17/input-recorder ... Input recorder/ input playback system for all input actions	2017-04-26 16:20:20 -07:00
Zach Fox	9ace7a7488	Merge pull request #10279 from andrewd440/21174 ... 21174 Make the Particle Emitter Easier to Use	2017-04-26 15:35:29 -07:00
Andrew Lowry	d3a9114676	Uses spaces instead of tabs for Edit.qml and EditTabView.qml.	2017-04-26 18:29:38 -04:00
anshuman64	5bd9b2e631	Merge pull request #10130 from ctrlaltdavid/21249 ... New avatar record and playback script	2017-04-26 15:18:30 -07:00
Dante Ruiz	95d6a451c6	fixed work mapping	2017-04-26 22:14:53 +01:00
Zach Pomerantz	532284f779	fix tablet resolve typo	2017-04-26 16:28:42 -04:00
Dante Ruiz	4df953d510	fixed text issue	2017-04-26 19:14:14 +01:00
Dante Ruiz	d8e6e8e7d0	Merge branch 'master' of github.com:highfidelity/hifi into input-recorder	2017-04-26 16:53:02 +01:00
Dante Ruiz	79d827c6be	added requested features	2017-04-26 16:52:51 +01:00
Seth Alves	c7ab4994ea	Merge pull request #10282 from druiz17/tablet-webview-keyboard ... Added tabletwebview keyboard for HMD	2017-04-25 19:30:49 -07:00
David Rowe	4a5f84f4b9	Merge branch 'master' into 21249 ... # Conflicts: # libraries/audio-client/src/AudioClient.cpp	2017-04-26 13:24:18 +12:00
Atlante45	62b7855e1f	Add pending to stats	2017-04-25 15:56:23 -07:00
Dante Ruiz	851eece0e4	removed comments	2017-04-25 23:26:16 +01:00
Dante Ruiz	b78bae37be	added keyboard for tabletWebview	2017-04-25 23:22:27 +01:00
Dante Ruiz	8c020a0ec2	saving work	2017-04-25 18:01:19 +01:00
Dante Ruiz	367a6ac03c	first prototype	2017-04-24 22:09:01 +01:00
Dante Ruiz	d057dfebf0	got input recording to work	2017-04-24 19:57:38 +01:00
Andrew Lowry	6a218eaca9	Embeds colpick color picker in dat.GUI for particle explorer. ... Cleans up eslint for particleExplorer.js.	2017-04-24 13:35:37 -04:00
Andrew Lowry	aea89824c5	Switches tablet edit tab to particle explorer when particle entities are ... selected or created.	2017-04-24 13:35:37 -04:00
Dante Ruiz	64fcfd33a4	working on loading files	2017-04-21 22:38:53 +01:00
Dante Ruiz	cc34cb96e4	making ui for input recorder	2017-04-21 18:15:47 +01:00
David Rowe	daedb94b04	Merge branch 'master' into 21249	2017-04-21 14:50:28 +12:00
howard-stearns	4ea882cad1	faster initial response	2017-04-20 14:56:34 -07:00
howard-stearns	ce7145a388	Announcement cards, debug data.	2017-04-20 14:40:24 -07:00
howard-stearns	bc77eeeabd	scroll, margins	2017-04-20 13:43:55 -07:00
howard-stearns	b8e9fb67b8	old style card fonts, margins, etc.	2017-04-19 16:34:10 -07:00
howard-stearns	2512255dd0	reusable feeds	2017-04-19 16:33:02 -07:00
howard-stearns	3ce238b8a0	make feed self contained	2017-04-19 13:45:58 -07:00
David Rowe	2108300272	Merge branch 'master' into 21249	2017-04-20 08:43:00 +12:00
howard-stearns	c5f1455872	go horizontal	2017-04-19 12:47:28 -07:00
David Rowe	9088d1ef9c	Tablet version of recordings browser dialog	2017-04-19 16:15:22 +12:00
samcake	2c16b2bf3a	Expose the runtime from the engine in Stats	2017-04-18 18:12:42 -07:00
David Rowe	00b6b2a2c0	Implement desktop recordings browser dialog	2017-04-19 12:34:59 +12:00
Zach Fox	7505b82189	Merge pull request #10046 from Triplelexx/21224 ... 21224 - Allow people to save avatar bookmarks	2017-04-18 11:10:50 -07:00
David Rowe	dae6d6fb69	Stub desktop dialog to select recording to play from ATP assets	2017-04-18 11:43:42 +12:00
Dante Ruiz	31b61c3225	removed white space	2017-04-18 00:24:34 +01:00
Dante Ruiz	e46d9da98f	fixed merge conflict	2017-04-18 00:22:35 +01:00
Zach Fox	7a7cfb84e5	Remove HMD keyboard focus toggle on AddressBar input	2017-04-17 10:08:40 -07:00
Zach Fox	a623ced64e	Fix hover states on back/forward buttons	2017-04-14 12:43:07 -07:00
Dante Ruiz	863d64b2fd	removed comments and non-needed files	2017-04-14 18:06:44 +01:00
Dante Ruiz	7189d4d7fa	daving web work	2017-04-14 17:01:23 +01:00
Zach Fox	0543709081	Focus fix	2017-04-13 16:10:36 -07:00
Zach Fox	520ceebf5b	Small HMD tweaks	2017-04-13 15:52:59 -07:00
Zach Fox	d9dc8ebc41	More improvements	2017-04-13 15:48:51 -07:00
Zach Fox	71caf85a27	Quick fix!	2017-04-12 14:57:44 -07:00
David Kelly	a12407ddda	Merge pull request #10202 from davidkelly/dk/3934 ... Connection sort change	2017-04-12 10:42:04 -07:00
David Kelly	058a5b14a4	damn linter didn't run - vimrc work ahead...	2017-04-12 10:22:40 -07:00
David Kelly	9376ac646f	offline people sort change	2017-04-12 08:41:36 -07:00
Chris Collins	b07ed13023	Merge pull request #10184 from druiz17/snapshot-fix ... snapshot bug fixes	2017-04-11 13:00:46 -07:00
Dante Ruiz	9c79e62004	webview-fix	2017-04-11 18:49:40 +01:00
Dante Ruiz	d823093ddb	fixed merge conflict	2017-04-11 16:58:25 +01:00
Seth Alves	d5f5192954	Merge pull request #10174 from vladest/fix-snapshot-login-cancel ... Check if dialog was opened from StackView and then pop or just go to …	2017-04-11 07:07:29 -07:00
Chris Collins	d8581c1026	Merge pull request #10176 from vladest/snaps_hover ... Added hover to Snaps and Places	2017-04-10 16:09:43 -07:00
Seth Alves	eb281389f5	fix includeActions so places show up in All	2017-04-10 14:46:31 -07:00
Howard Stearns	99ba07dcb2	Merge pull request #10181 from davidkelly/dk/infoButtonFix ... re-enable the info button for user images on nearby tab	2017-04-10 13:27:33 -07:00
Dante Ruiz	e0f19944bc	Merge branch 'master' of github.com:highfidelity/hifi into snapshot-fix	2017-04-10 20:58:46 +01:00
Dante Ruiz	4e94aaa9e8	finished allowing to go back to previous app	2017-04-10 20:58:10 +01:00
Howard Stearns	8682df6bb7	Merge pull request #10154 from davidkelly/dk/3995 ... updated connection instructions	2017-04-10 12:43:20 -07:00
David Kelly	5fc4bbc260	re-enable the info button for user images on nearby tab	2017-04-10 12:26:34 -07:00
David Kelly	082d0964d2	oops	2017-04-10 11:08:45 -07:00
David Kelly	cd55728490	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/4036	2017-04-10 10:09:27 -07:00
David Kelly	46b6903b93	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3995	2017-04-10 10:08:17 -07:00
Vladyslav Stelmakhovskyi	393b24452d	Added hover to Snaps and Places	2017-04-10 17:07:59 +02:00
David Kelly	3ea6cac45a	HMD.mounted instead of HMD.isMounted	2017-04-10 08:05:01 -07:00
druiz17	92bb7f2329	saving work	2017-04-09 18:55:53 -07:00
Philip Rosedale	c74778116a	Merge pull request #10156 from Triplelexx/21256 ... 21256 - Add packet loss % to stats	2017-04-09 18:00:01 -07:00
Vladyslav Stelmakhovskyi	7628916db6	Check if dialog was opened from StackView and then pop or just go to home menu	2017-04-09 20:09:15 +02:00
Seth Alves	aa89903a9f	Merge pull request #10160 from vladest/tabletwebview-yahoo-fix ... Yahoo, Reddit etc now works correctly	2017-04-08 20:25:18 -07:00
Dante Ruiz	86c67a3017	tablet pages	2017-04-08 02:01:21 +01:00
Chris Collins	8e12f62cbb	Merge pull request #10153 from druiz17/goto-fix ... Ability to toggle goto with the crt-l and enter keys	2017-04-07 16:36:41 -07:00
Chris Collins	1175f65cb0	Merge pull request #10162 from vladest/goto-white-buttons-fix ... Check if offset outside image, set to last image	2017-04-07 15:58:48 -07:00
David Kelly	948a821824	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3995	2017-04-07 14:30:22 -07:00
David Kelly	174b2978e3	username stays around now when tabbing to connections	2017-04-07 14:01:36 -07:00
Howard Stearns	57d8ec883e	Merge pull request #10163 from davidkelly/dk/3938 ... updated availability combo dialog	2017-04-07 13:57:17 -07:00
Seth Alves	03065ee6c8	Merge pull request #9938 from kunalgosar/jsRenderBug ... Stop WebEntities Running Files and Commands	2017-04-07 13:44:03 -07:00
Dante Ruiz	cde9310f3e	goto home button fix	2017-04-07 21:35:28 +01:00
Dante Ruiz	909fda98a4	git goto button toggle hightlight	2017-04-07 21:01:53 +01:00
David Kelly	870e003311	Scattered X glyphs around the letterbox and combo dialogs	2017-04-07 11:12:54 -07:00
Vladyslav Stelmakhovskyi	a1892b351f	Cant use underscores outside class internals	2017-04-07 19:40:46 +02:00
David Kelly	ee9bc0bfa4	updated availability combo dialog	2017-04-07 10:25:37 -07:00
Vladyslav Stelmakhovskyi	9a563ba02f	Check if offset outside image, set to last image	2017-04-07 19:17:09 +02:00
Triplelexx	fcfd206e9c	change implict conversions	2017-04-07 17:47:04 +01:00
David Kelly	12b5b91754	Merge pull request #10161 from howard-stearns/fix-pal-connections-help ... fix pal connections-tab help trigger	2017-04-07 09:34:11 -07:00
Howard Stearns	468cc7f19b	Merge pull request #10150 from davidkelly/dk/3930 ... friends checkbox speedup	2017-04-07 09:27:39 -07:00
David Kelly	cb092d67dd	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3995	2017-04-07 09:01:59 -07:00
Howard Stearns	03013ecb3a	fix pal connections-tab help trigger	2017-04-07 07:30:36 -07:00
Vladyslav Stelmakhovskyi	f88ba7bc57	Yahoo, Reddit etc now works correctly	2017-04-07 15:45:33 +02:00
David Kelly	d64a803451	no need to set checked	2017-04-06 16:08:48 -07:00
David Kelly	a1c211395b	Merge pull request #10152 from howard-stearns/fix-sort-by-connections-friend-column ... fix sorting by pal connections-tab friends column	2017-04-06 15:43:21 -07:00
David Kelly	179a445f59	updated connection instructions	2017-04-06 15:21:10 -07:00
Howard Stearns	67f2cc3567	Merge pull request #10148 from davidkelly/dk/3936 ... pal selection changes	2017-04-06 14:58:46 -07:00
howard-stearns	9577102c22	fix sorting by pal connections-tab friends column	2017-04-06 14:45:08 -07:00
Dante Ruiz	a89081601c	fix merge issues	2017-04-06 22:31:47 +01:00
Dante Ruiz	52fd446d4d	toggle goto in tablet	2017-04-06 22:27:37 +01:00
David Kelly	331f2da4f8	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3936	2017-04-06 14:22:08 -07:00
Seth Alves	3c6429cdf3	Merge pull request #10103 from vladest/master-qml-bugfixes ... Master qml bugfixes	2017-04-06 14:22:06 -07:00
David Kelly	726395ac3e	friends checkbox speedup	2017-04-06 14:07:07 -07:00
Howard Stearns	f7ef587c61	Merge pull request #10138 from davidkelly/dk/3935 ... Now you can forget connections	2017-04-06 14:05:25 -07:00
David Kelly	46a7d28e16	Merge pull request #10144 from howard-stearns/notice-login-change-in-pal ... notice login/logout change in pal	2017-04-06 12:57:22 -07:00
David Kelly	e0a1422345	pal selection changes	2017-04-06 12:07:51 -07:00
howard-stearns	1d60a55d5f	notice login/logout change in pal	2017-04-06 11:20:08 -07:00
David Kelly	85c78da839	updated, plus fixed some annoying errors in logs from Pal.qml	2017-04-06 11:16:51 -07:00
Vladyslav Stelmakhovskyi	16fa7988f6	TabletWebView redesigned to single WebView instance	2017-04-06 17:53:46 +02:00
Triplelexx	f588612fc3	add audioPacketLoss % display in stats	2017-04-06 16:04:14 +01:00
David Kelly	06bd9c97bf	remove info button from avatar image	2017-04-05 18:21:54 -07:00
David Kelly	61ece265f4	now you can forget connections	2017-04-05 18:16:16 -07:00
Dante Ruiz	34f3c4abee	removed mousearea	2017-04-05 18:08:03 +01:00
Dante Ruiz	de8b7eeb27	removed commented code	2017-04-05 18:02:55 +01:00
Dante Ruiz	24b89275f2	fix new model dialog textInput	2017-04-05 18:00:43 +01:00
kunalgosar	8749428ede	dont assume no query tags	2017-04-04 13:51:34 -07:00
Kunal Gosar	e5c075f107	fix typo and namespace	2017-04-04 11:54:58 -07:00
kunalgosar	9d0667cb31	add url tag to web entities	2017-04-04 11:54:58 -07:00
kunalgosar	19ab7526d3	apply profile to relevant entities	2017-04-04 11:54:21 -07:00
kunalgosar	a0f0879087	added file type filter and interceptor	2017-04-04 11:54:21 -07:00
Lexx	af95741a7e	Merge branch 'master' into 21224	2017-04-04 18:24:49 +01:00
Howard Stearns	b0fa784267	Merge pull request #10108 from davidkelly/dk/PalImprovementsMostlyZach ... Dk/pal improvements mostly zach	2017-04-04 10:03:10 -07:00
David Kelly	08ac25473f	wording change	2017-04-04 09:53:09 -07:00
Vladyslav Stelmakhovskyi	367555acdb	Fixed BasicTableView.qml:610:17: QML Item: Binding loop detected for property width. width must be explicitly set	2017-04-04 16:35:21 +02:00
Vladyslav Stelmakhovskyi	332f9bb283	Fixed TabletMenuStack.qml:56: Error: Cannot assign [undefined] to QString. Fixed keyboardRaised undefined error	2017-04-04 16:22:40 +02:00
David Kelly	4d6886d1f4	cr feedback, plus changed 'People' to 'Connections' in a couple places	2017-04-03 17:03:14 -07:00
Seth Alves	cb787c2862	Merge pull request #10104 from druiz17/tablet-webView3.0 ... Remove unnecessary prints and code for tabletWebView.qml	2017-04-03 16:10:54 -07:00
Seth Alves	fbf2014f04	Merge pull request #10102 from vladest/tablet-ui-goto ... Put current address to location instead of inputfield	2017-04-03 16:09:58 -07:00
David Kelly	4629accc9c	style updates	2017-04-03 15:35:53 -07:00
David Kelly	2f1b6be24d	Merge branch 'PAL_v2_Zach_new' of https://github.com/zfox23/hifi	2017-04-03 10:55:55 -07:00
Dante Ruiz	3090629f77	clean up code	2017-04-03 18:51:39 +01:00
Vladyslav Stelmakhovskyi	990e1379e3	Fix warning in Audio page. Revert commented out assert in OffscreenGLCanvas: move to separate task ... (cherry picked from commit d966979c2368b159cf5b96c5fd535411cda019b8)	2017-04-03 19:33:41 +02:00
Vladyslav Stelmakhovskyi	156166ce4a	Fixed another warning in TabletAddressDialog.qml ... (cherry picked from commit 73c923bb522ad711380a2fcdaa9babe9f01a639a)	2017-04-03 19:33:13 +02:00
Vladyslav Stelmakhovskyi	9e96888534	Fixed warning: TabletAddressDialog.qml:546: Error: Cannot assign to non-existent property 'shown' ... (cherry picked from commit e70c2cdcc74f9fd43273dca268433cdefd9ecf40)	2017-04-03 19:32:09 +02:00
Vladyslav Stelmakhovskyi	6b7f3f7125	Fixed warning: TabletAddressDialog.qml:282:13: QML ListView: Cannot specify top, bottom, and verticalCenter anchors at the same time. ... (cherry picked from commit b11e245cb1b19149ff00f16b718ff4088b856f3e)	2017-04-03 19:32:09 +02:00
Vladyslav Stelmakhovskyi	849d65f95f	Fixed warning: Tablet.qml:205: TypeError: Cannot read property of null ... (cherry picked from commit b1dc14b355bc6053a0e264a057a799a4d446e347)	2017-04-03 19:32:09 +02:00
Seth Alves	c45514a557	Merge pull request #10066 from vladest/tablet-ui-connection-dialog ... Implemented no connection dialog for Tablet UI	2017-04-03 09:57:00 -07:00
Vladyslav Stelmakhovskyi	d207dae5b7	Put current address to location instead of inputfield	2017-04-02 20:02:40 +02:00
Chris Collins	cc8b52fff4	Merge pull request #10095 from druiz17/tablet-webView2.0 ... Tablet webview now uses mobile format	2017-04-01 08:33:09 -07:00
Dante Ruiz	7ca7ad5e0b	removed junk file	2017-04-01 01:53:00 +01:00
Zach Fox	f148bca1c0	More progress on ComboDialog	2017-03-31 17:12:41 -07:00
Zach Fox	8a96969471	Merge pull request #9873 from highfidelity/PAL_v2 ... PAL v2.0	2017-03-31 17:00:41 -07:00
Dante Ruiz	d1bf3e4bf2	fixed webview mobile view	2017-04-01 00:58:09 +01:00
Zach Fox	fd3167ca9c	'PEOPLE' back to 'CONNECTIONS'	2017-03-31 16:41:25 -07:00
David Kelly	8ceb6a20f0	friend/unfriend working	2017-03-31 15:05:21 -07:00
Zach Fox	6a4c2c5e12	Fix issues; checkpoint on new ComboDialog	2017-03-31 14:56:42 -07:00
Dante Ruiz	70d2d69557	Merge branch 'master' of github.com:highfidelity/hifi into tablet-webView	2017-03-31 19:29:31 +01:00
Dante Ruiz	9658e1b8ac	better web view handling	2017-03-31 19:25:03 +01:00
Dante Ruiz	b6901bba3e	added tabletWebView.qml	2017-03-31 18:48:08 +01:00
Dante Ruiz	8f402c73b0	saving work 2.0	2017-03-31 01:18:31 +01:00
Zach Fox	05c34fb3ee	Move some things around so ComboBox works (and layout improves)	2017-03-30 15:19:19 -07:00
Zach Fox	c24b8b47a9	Minor layout changes	2017-03-30 14:08:29 -07:00
Howard Stearns	0edbf1fbd9	Merge pull request #10044 from howard-stearns/pal-backend-integration ... Pal backend integration	2017-03-30 12:55:11 -07:00
David Kelly	e66c075f8e	Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-30 10:14:29 -07:00
Triplelexx	aa9a2532a9	fix for displaying "Bookmark Avatar" dialog in tablet ui	2017-03-30 13:54:33 +01:00
Dante Ruiz	cb8660c699	saving work	2017-03-30 01:34:14 +01:00
Triplelexx	50e35a220b	Merge remote-tracking branch 'upstream/master' into 21224	2017-03-30 01:25:27 +01:00
Zach Fox	4887081e2c	New PAL colors; slight layout changes	2017-03-29 16:30:24 -07:00
Zach Fox	a6ff3fcdb7	Tablet PAL bugfix; Connections help text v1	2017-03-29 15:47:19 -07:00
Anthony J. Thibault	332dfa098f	Fix for disappearing toolbar after reload all scripts	2017-03-29 14:10:26 -07:00
Howard Stearns	b8f557ca54	Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into pal-backend-integration	2017-03-29 13:30:15 -07:00
Vladyslav Stelmakhovskyi	209de29b2a	Intial commit. Basically works. Need some testing	2017-03-29 17:36:05 +02:00
Vladyslav Stelmakhovskyi	9822193644	Set z-order of comboboxes to make sure lowest will no overlap higher ones	2017-03-29 14:41:18 +02:00
Howard Stearns	c795d2ca3b	Four-way discoverability. (Needs testing.)	2017-03-28 18:31:08 -07:00
Zach Fox	b776f25b3b	Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-28 18:09:17 -07:00
Zach Fox	81264c998b	Revert "Merge from upstream/master" ... This reverts commit b5ba4a109d.	2017-03-28 17:39:45 -07:00
Zach Fox	b5ba4a109d	Merge from upstream/master	2017-03-28 17:37:34 -07:00
Dante Ruiz	a76e5ef8d9	improve the design of the tablet goto	2017-03-28 23:02:23 +01:00
Zach Fox	fce2049630	Trivial removal of commented code	2017-03-27 16:45:03 -07:00
Seth Alves	48ea9acfb3	Merge pull request #10016 from druiz17/tablet-goto ... Porting goto to the tablet	2017-03-27 10:04:11 -08:00
Zach Fox	e1a880a5d4	Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-27 09:10:12 -07:00
Dante Ruiz	b8eac7abef	revoming useless code	2017-03-27 16:17:50 +01:00
Triplelexx	07e6b766b5	rename FILENAME constants	2017-03-26 23:10:50 +01:00
Triplelexx	dc64065668	Merge remote-tracking branch 'upstream/master' into 21224 ... update	2017-03-26 22:20:24 +01:00
Triplelexx	8f507942cf	change storage location ... still unsure what is best. this is consistent and doesn't require login	2017-03-25 19:10:12 +00:00
Triplelexx	c4bcacf0e0	use QueuedButton for upload dialog	2017-03-25 19:04:40 +00:00
Vladyslav Stelmakhovskyi	edb66ae704	Merge branch 'tablet-ui' into tablet-ui-audio-screen	2017-03-25 13:20:43 +01:00
Vladyslav Stelmakhovskyi	fc23c348cb	Implemented Audio settings screen for Tablet UI	2017-03-25 13:17:38 +01:00
humbletim	5d5d947ddb	updates per discussion with triplelexx	2017-03-25 04:01:02 -04:00
humbletim	630afb716f	consolidate QML->C++ triggering workaround to help compartmentalize the problem for later fixin'	2017-03-25 03:01:35 -04:00
humbletim	96f905362b	alternative way to connect the button?	2017-03-25 01:17:27 -04:00
Zach Fox	e88895935b	Revert "Actually merge from master" ... This reverts commit 056d6fbe4f.	2017-03-24 17:56:48 -07:00
Dante Ruiz	2a59139c76	trying to fix focus issue	2017-03-25 01:17:37 +01:00
Dante Ruiz	9e2768cc84	saving work	2017-03-25 01:06:21 +01:00
Triplelexx	bda1d54209	create AvatarBookmarks ... derive AvatarBookMarks and LocationBookmarks from Bookmarks, first pass at integration, QML issues noted	2017-03-24 22:58:36 +00:00
Dante Ruiz	119a71d0d1	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-goto	2017-03-24 23:55:18 +01:00
Dante Ruiz	d9046a1982	goto on the tablet	2017-03-24 23:54:54 +01:00
Zach Fox	056d6fbe4f	Actually merge from master	2017-03-24 10:10:17 -07:00
Zach Fox	915ace0087	Revert "Merge from Master" ... This reverts commit e48123b5bb.	2017-03-24 10:04:51 -07:00
Seth Alves	902e3d41d6	merge from upstream	2017-03-24 08:20:35 -07:00
Brad Hefta-Gaub	9a38b36f59	Merge pull request #9970 from Triplelexx/21223 ... 21223 - Quat functions have naming inconsistencies	2017-03-24 08:12:11 -07:00
Dante Ruiz	a078121c46	saving work	2017-03-24 00:23:13 +01:00
Zach Fox	3f95982f34	Fix bug due to incorrect merge...	2017-03-23 14:00:50 -07:00
Zach Fox	98ee02f84f	Use OpacityMask instead of hack; fix connectionsTab	2017-03-23 10:49:31 -07:00
Zach Fox	a7623dcac8	Use OpacityMask instead of hack; fix connectionsTab	2017-03-23 10:48:44 -07:00
Dante Ruiz	ae111ff2e9	Merge branch 'tablet-goto' of github.com:fayeli/hifi into tablet-goto	2017-03-23 18:25:31 +01:00
Zach Fox	e48123b5bb	Merge from Master	2017-03-23 09:54:14 -07:00
Seth Alves	ff3fc244d1	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-23 09:50:53 -07:00
Dante Ruiz	af97c7275e	Use loadQMlSource if no stack is aviable	2017-03-23 17:03:24 +01:00
Zach Fox	692ef369c7	Attempted Stale PAL fix - hard to test!	2017-03-22 15:14:11 -07:00
Brad Davis	85c80f3be8	Merge remote-tracking branch 'upstream/master' into smarter_textures ... Conflicts: libraries/gpu/src/gpu/Texture.cpp	2017-03-22 14:25:23 -07:00
Zach Fox	bf191eabb7	Some new stale PAL behavior	2017-03-22 13:35:48 -07:00
Triplelexx	2515563a0b	change getFront to getForward	2017-03-21 22:35:07 +00:00
Zach Fox	058faa8c0f	Row color bugfix	2017-03-21 10:03:51 -07:00
Seth Alves	cc4ddd1387	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-21 08:43:35 -08:00
Vladyslav Stelmakhovskyi	fb0adae0b1	Scripts debug window in Tablet UI	2017-03-21 15:04:38 +01:00
Zach Pomerantz	20ea13e00a	Merge pull request #9897 from zzmp/record/noise-gate ... Add AudioNoiseGate to recordings played through Interface	2017-03-21 00:21:20 -04:00
Zach Fox	29e97381eb	PAL open, user leaves, gray out row	2017-03-20 17:20:28 -07:00
Faye Li	9cab8b6c4a	end of day commit	2017-03-20 17:04:29 -07:00
Brad Davis	e482eac437	Merge remote-tracking branch 'upstream/master' into smarter_textures	2017-03-20 16:22:13 -07:00
Faye Li	1d095b8158	added back forward and back button on nav bar	2017-03-20 15:57:59 -07:00
Faye Li	b6bf58d5be	rearrange layout of main tablet go to screen	2017-03-20 15:28:30 -07:00
Zach Fox	d16acc5a7f	Stale PAL Notification	2017-03-20 15:24:49 -07:00
Zach Fox	0506fc0033	New goTo() behavior; Fix goBack	2017-03-20 12:55:38 -07:00
Seth Alves	2e29ff3114	Merge pull request #9934 from fayeli/edit-import-entities ... Adding Import Entities button on the Create tab of Edit	2017-03-20 09:13:08 -08:00
Seth Alves	f48557b06b	Merge pull request #9943 from vladest/tablet-ui-login-logout ... Tablet ui login logout	2017-03-18 09:37:11 -08:00
Vladyslav Stelmakhovskyi	5335bf8862	Menu items in Tablet UI now wrapped	2017-03-18 15:58:16 +01:00
Vladyslav Stelmakhovskyi	696825580e	Merge branch 'tablet-ui' into tablet-ui-login-logout	2017-03-18 14:42:11 +01:00
Vladyslav Stelmakhovskyi	5e162a6447	Implemented login facility for tablet UI	2017-03-18 14:38:49 +01:00
Triplelexx	a9b1a38665	remove Mini Mirror from View menu ... Avatar inputs only contains the audio meter now.	2017-03-18 00:53:13 +00:00
Faye Li	33a7ff825e	indicate expecting json file on button text	2017-03-17 11:37:38 -07:00
Faye Li	6531efffbc	hook up qml button to edit.js	2017-03-17 11:22:07 -07:00
Zach Fox	fc2a501474	Cleanup JS<->QML messaging	2017-03-16 15:38:39 -07:00
David Rowe	07e4b0ce41	Fix title menu icon getting stuck on white	2017-03-17 11:28:14 +13:00
David Rowe	069e66b875	Fix stack functions	2017-03-17 11:19:50 +13:00
David Rowe	f1947769d6	Fix tablet settings dialogs' titles and make QML consistent	2017-03-17 11:15:56 +13:00
Zach Fox	b3821bb02d	fix location vs AddressManager woes	2017-03-16 12:57:21 -07:00
Zach Fox	05fec328c0	Make tablet popups work like they should	2017-03-16 10:38:46 -07:00
David Rowe	1080e21afd	Tidying	2017-03-16 19:28:28 +13:00
David Rowe	89eb073855	Fix dialog height changing as drop-down value is changed	2017-03-16 19:28:12 +13:00
David Rowe	74db9dc573	Fix drop-down hiding behind buttons	2017-03-16 19:27:47 +13:00
David Rowe	3c1506237a	Fix not all warning text displaying	2017-03-16 19:27:27 +13:00
David Rowe	7efda8bead	Make clicking on dialog background defocus current control	2017-03-16 19:27:06 +13:00
David Rowe	9e458fd180	Fix keyboard in tablet custom query dialog	2017-03-16 19:26:41 +13:00
Faye Li	10ebb6efd7	simplify asset server button	2017-03-15 16:55:21 -07:00
Faye Li	42216b6986	create import entities button on create tab	2017-03-15 16:47:31 -07:00
howard-stearns	84fd17bd88	use location.metaverseServerUrl instead of hardcoded value.	2017-03-15 16:33:23 -07:00
howard-stearns	c0c92fd8d1	Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-15 15:20:28 -07:00
Vladyslav Stelmakhovskyi	856e15060d	Implemented Domain Connection statistics for Tablet UI	2017-03-15 21:05:13 +01:00
Zach Fox	786180291b	Bugfixes and improvements	2017-03-15 11:46:33 -07:00
Zach Pomerantz	789bb7c855	rename audio(Mic)OutboundPPS	2017-03-15 13:30:39 -04:00
Seth Alves	563d59bda9	Merge pull request #9886 from vladest/tablet-ui-entity-statistics ... Tablet ui entity statistics	2017-03-15 08:40:52 -08:00
Seth Alves	df82c30e83	Merge pull request #9892 from hyperlogic/bug-fix/tablet-running-scripts-improvements ... Tablet Running Scripts dialog fixes	2017-03-15 08:38:40 -08:00
Seth Alves	b5919d89a5	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-15 08:26:10 -08:00
howard-stearns	6c88bc98b4	Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-15 09:24:30 -07:00
Zach Fox	0a6bcd7fca	Massive performance boost	2017-03-14 16:24:06 -07:00
Anthony J. Thibault	3a788d31de	Tablet Running Scripts dialog fixes ... * The "Currrently Running" section is now visible by default, this includes the "Reload All" and "Remove All" buttons * The entire dialog is flickable/scrollable. We need to do this because the entire dialog is too tall to fit on the tablet. * The keyboard now appears when the filter edit text has focus. The content is scrolled in such away that the focus edit field, and the tree view are above the keyboard.	2017-03-14 15:38:53 -07:00
Zach Fox	5da0dfc4ac	Merging from Pal_v2_Zach	2017-03-14 14:05:50 -07:00
Dante Ruiz	4c686eaa67	fix tablet menu stack focus issue	2017-03-14 21:20:41 +01:00
Vladyslav Stelmakhovskyi	e2a4011b05	Coloring implemented	2017-03-14 19:10:41 +01:00
Vladyslav Stelmakhovskyi	56d4bfe077	Servers stats added. TODO: coloring	2017-03-14 18:38:49 +01:00
Vladyslav Stelmakhovskyi	d9ca8a826d	TabletEntityStatistics.qml refactored. Text now wrapped. TODO: coloring, server stats	2017-03-14 17:02:09 +01:00
Vladyslav Stelmakhovskyi	99c74cec41	Merge branch 'tablet-ui' into tablet-ui-entity-statistics	2017-03-14 15:59:27 +01:00
Vladyslav Stelmakhovskyi	0accce5337	TabletComboBoxPreference.qml not needed anymore	2017-03-14 15:53:41 +01:00
Vladyslav Stelmakhovskyi	ee7dd458ca	Merge branch 'tablet-ui' into tablet-ui-graphics	2017-03-14 15:37:36 +01:00
Seth Alves	c89a4c4786	Merge pull request #9874 from hyperlogic/bug-fix/toolbar-fade ... Fix for visible empty toolbar when switching from desktop to HMD mode.	2017-03-14 05:33:54 -08:00
Seth Alves	f8a6a82371	Merge pull request #9881 from ctrlaltdavid/21197 ... Browse for avatar in Marketplace from tablet avatar settings dialog	2017-03-14 05:33:11 -08:00
David Rowe	43687d4773	Tidying	2017-03-14 21:41:04 +13:00
David Rowe	d141d5b683	Add keyboard	2017-03-14 21:36:57 +13:00
David Rowe	f3a99a2437	Implement avatar browser for tablet avatar settings	2017-03-14 15:36:51 +13:00
David Rowe	2e96b8a59b	Merge branch 'tablet-ui' into 21197	2017-03-14 14:47:22 +13:00
Zach Fox	e3d0842ddc	Implement browser in PAL	2017-03-13 18:39:47 -07:00
David Rowe	7504c124e4	Make attachment model browser dialog modal	2017-03-14 13:34:06 +13:00
David Rowe	01c313ad60	Fix QML errors	2017-03-14 13:33:20 +13:00
Brad Davis	3bef5ad528	Merge remote-tracking branch 'upstream/master' into smarter_textures	2017-03-13 14:30:25 -07:00
Anthony J. Thibault	40b7e34c0b	Fix for visible empty toolbar when switching from desktop to HMD mode.	2017-03-13 14:23:13 -07:00
Zach Fox	d04b1da1c2	Merging from PAL_v2_Zach	2017-03-13 12:54:01 -07:00
David Rowe	4dd7667fd7	Merge branch 'tablet-ui' into 21209 ... # Conflicts: # interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml # interface/src/ui/overlays/Web3DOverlay.cpp	2017-03-14 08:50:01 +13:00
Vladyslav Stelmakhovskyi	9e9c64021c	Merge branch 'tablet-ui' into tablet-ui-entity-statistics	2017-03-13 19:54:40 +01:00
howard-stearns	db06c2650f	Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-13 11:53:48 -07:00
Vladyslav Stelmakhovskyi	48db6201e5	Basic statistics showed. TODO: servers statistics, coloring, wrapping	2017-03-13 19:48:50 +01:00
Zach Fox	beb848373b	Update from zfox23/PALv2 branch	2017-03-13 10:15:06 -07:00
Seth Alves	4f71a5b234	Merge pull request #9864 from vladest/tablet-ui-lod-settings ... Add LOD settings to Tablet UI	2017-03-13 08:59:40 -08:00
Seth Alves	ffd4d1488c	Merge pull request #9866 from vladest/tablet-ui-lodtools ... Fixed slider groove size calculation. Added LOD Tools to Tablet UI	2017-03-13 08:59:06 -08:00
Vladyslav Stelmakhovskyi	49055cfa5c	Some statistics showed	2017-03-13 16:31:29 +01:00
David Rowe	05e4c2a1bb	MyAvatar is available in tablet now	2017-03-12 09:59:52 +13:00
Brad Hefta-Gaub	a38965d628	add more audio stats	2017-03-11 09:50:30 -08:00
Vladyslav Stelmakhovskyi	81bc56f124	Fixed slider groove size calculation. Added LOD Tools to Tablet UI	2017-03-11 14:44:33 +01:00
Vladyslav Stelmakhovskyi	d70943dd6c	Add Graphics preferences to Tablet. Use TabletComboBox instead of desktop ComboBox for Tablet preferences	2017-03-11 12:23:31 +01:00
Vladyslav Stelmakhovskyi	9f7c5a1603	Add LOD settings to Tablet UI	2017-03-11 11:54:44 +01:00
David Rowe	0fc45799ed	Remove redundant keyboard handling code	2017-03-11 17:04:55 +13:00
David Rowe	6a8d0b1064	Refactor some tablet dialog headers	2017-03-11 16:55:22 +13:00
David Rowe	327e3c9973	Don't expand height of higlighted row	2017-03-11 15:46:43 +13:00
David Rowe	0a2976deab	Add tablet keyboard	2017-03-11 15:43:33 +13:00
Brad Hefta-Gaub	6ce50269ac	add audio mixer in/out stats to the client stats	2017-03-10 18:42:18 -08:00
David Rowe	ffbb04d3bc	Tablet and desktop versions of attachment model browser dialog	2017-03-11 15:38:21 +13:00
David Rowe	d261e48b9d	Use existing model browser dialog as base content	2017-03-11 14:33:03 +13:00
David Rowe	25364c0628	Make dropdown scrollbar wider	2017-03-11 12:59:15 +13:00
David Rowe	713c50f2e8	Fix attachments dialog joint dropdown in tablet	2017-03-11 12:52:22 +13:00
Dante Ruiz	8a973dae3c	fixed bring menu dialogs in tablet	2017-03-10 23:21:29 +00:00
David Rowe	189eee01a6	Refactor TabletComboBox.qml into ComboBox.qml	2017-03-11 11:02:09 +13:00
David Rowe	71713b10f3	Merge remote-tracking branch 'upstream/tablet-ui' into 21209 ... # Conflicts: # interface/src/ui/overlays/Web3DOverlay.cpp	2017-03-11 09:14:06 +13:00
Dante Ruiz	78da936344	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-imporove-dialogs	2017-03-10 19:33:51 +00:00
Dante Ruiz	b63ab05eec	improved general settting coloring	2017-03-10 19:33:14 +00:00
Vladyslav Stelmakhovskyi	e27ccab2f4	Eliminate pathToFonts not found errors at startup. Change TableFiledialog folder on click	2017-03-10 19:53:20 +01:00
David Rowe	7af9f879dd	Fix scrollbar and keyboard behavior	2017-03-10 21:44:20 +13:00
David Rowe	9291d272fe	Add scrollbar	2017-03-10 18:25:16 +13:00
David Rowe	b539c55c02	Scroll and snap to attachment with focus	2017-03-10 14:33:51 +13:00
David Rowe	c7d1aa8ff4	Make attachments list flickable	2017-03-10 08:26:00 +13:00
druiz17	0069569e96	Merge branch 'tablet-ui' into 21197	2017-03-09 09:31:15 -08:00
David Rowe	53dcf80cc0	Add dialog title	2017-03-09 22:38:49 +13:00
David Rowe	4be106cbae	Remove obsolete rounded border	2017-03-09 18:20:26 +13:00
David Rowe	66dded5e28	Scroll attachments if necessary when raise keyboard to keep focus	2017-03-09 18:13:26 +13:00
David Rowe	1fc6d82456	Tablet and desktop versions of avatar attachments dialog	2017-03-09 13:04:57 +13:00
David Rowe	22e5229036	Use existing attachments dialog as base dialog content	2017-03-09 09:57:45 +13:00
Brad Davis	e94f803b84	Merge remote-tracking branch 'upstream/master' into HEAD	2017-03-08 09:03:21 -08:00
Dante Ruiz	74fe3da035	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix	2017-03-08 16:28:24 +00:00
David Rowe	950f91965d	Merge branch 'tablet-ui-edit-js' into 21197	2017-03-08 17:35:58 +13:00
Seth Alves	509ce3f2d2	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-07 18:41:36 -08:00
howard-stearns	cb41b9135b	fix broken merge	2017-03-07 12:10:52 -08:00
howard-stearns	8a489f36f4	Merge branch 'master' of https://github.com/highfidelity/hifi into fix-ban-remove-from-pal	2017-03-07 10:49:53 -08:00
Seth Alves	df2e73c2f0	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-07 09:44:41 -08:00
David Kelly	b760e86226	rest of cr feedback	2017-03-07 10:17:32 -07:00
David Kelly	c6dbfc85f0	cr feedback	2017-03-07 09:54:00 -07:00
David Rowe	fb1ff5be89	Port Developer > Network > Networking to tablet	2017-03-07 17:02:29 +13:00
David Kelly	3d39aae35b	minor tweak - just in case	2017-03-06 15:52:33 -07:00
David Kelly	e14a1ad1af	minor cleanup	2017-03-06 15:26:03 -07:00
David Kelly	db036d997c	first pass	2017-03-06 15:18:35 -07:00
David Rowe	af4bdd5943	Port Developer > Audio > Buffers to tablet	2017-03-07 09:57:02 +13:00
Vladyslav Stelmakhovskyi	6d9e7de6dc	Implemented AssetBrowser in Tablet view	2017-03-06 21:45:55 +01:00
David Rowe	09ecb12510	Merge branch 'tablet-ui-edit-js' into 21197 ... # Conflicts: # interface/src/ui/overlays/Web3DOverlay.cpp	2017-03-07 08:59:40 +13:00
howard-stearns	632cdc1b38	semicolons and whitespace per coding standard	2017-03-06 11:04:12 -08:00
David Rowe	0333122b23	Make Save and Cancel buttons close preferences dialog	2017-03-04 15:27:31 +13:00
howard-stearns	a715a694f0	fix 'banned user doesn't disappear from pal until refresh'	2017-03-03 16:27:38 -08:00
David Rowe	53cfad65cd	Add keyboard to preferences dialogs	2017-03-04 13:01:02 +13:00
Dante Ruiz	88c0db969c	added tabletComboBox to tabletFileDialog	2017-03-03 17:14:00 +00:00
Bradley Austin Davis	efad7da508	Merge remote-tracking branch 'upstream/master' into HEAD	2017-03-03 08:59:24 -08:00
Dante Ruiz	f867f4e739	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix	2017-03-03 15:40:41 +00:00
David Rowe	9384dfd89c	Merge branch 'tablet-ui-edit-js' into 21197	2017-03-03 18:05:18 +13:00
David Rowe	4d624ad256	Merge branch 'menuFix' into 21199	2017-03-03 09:42:16 +13:00
Seth Alves	cf37845f9e	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-02 10:06:38 -08:00
Dante Ruiz	5ba89e67af	fixed message dialog bug	2017-03-02 16:50:42 +00:00
David Kelly	79e440be81	fix unmute when ignoring in PAL (you can't)	2017-03-02 08:36:58 -07:00
David Rowe	62f91b4af6	Work around MyAvatar not being available in avatar preference control	2017-03-02 15:01:31 +13:00
David Rowe	ebe41bb443	Add a title to the tablet settings dialogs	2017-03-02 14:11:56 +13:00
Dante Ruiz	58c1a2fb99	Merge branch 'master' into menuFix	2017-03-02 00:55:18 +00:00
David Rowe	b9869264ba	Display avatar settings dialog in tablet	2017-03-02 13:16:23 +13:00
David Rowe	9f56d2f6f6	Make tablet general settings dialog naming more consistent with desktop	2017-03-02 12:30:36 +13:00
Bradley Austin Davis	fa5b315e09	Merge remote-tracking branch 'upstream/master' into smarter_textures	2017-03-01 15:16:18 -08:00
howard-stearns	5be952c4e8	persist sort info for tablet re-opening, and start with column 1	2017-03-01 14:51:48 -08:00
David Rowe	6fafc829e1	Merge branch 'menuFix' into tablet-ui	2017-03-02 09:28:35 +13:00
David Rowe	f60c2f8ec9	Merge branch 'tablet-ui-edit-js' into tablet-ui	2017-03-02 09:27:09 +13:00
David Kelly	45293ab130	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting	2017-03-01 12:55:54 -07:00
David Kelly	55d049ff5c	style updates	2017-03-01 12:43:45 -07:00
David Kelly	efe44425a6	cr feedback, plus something I missed	2017-03-01 09:26:03 -07:00
Dante Ruiz	e2479a78bd	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix	2017-03-01 16:04:12 +00:00
David Kelly	678020fed6	now use it (plus a bit of cleanup)	2017-02-28 15:03:45 -07:00
Dante Ruiz	16d3f22e77	remove uncommented code	2017-02-28 21:39:33 +00:00
Dante Ruiz	f0f2b8c4da	fix comboBox and PushOntoStack	2017-02-28 21:30:25 +00:00
howard-stearns	c04fd0ec66	smaller glyph size	2017-02-27 16:07:05 -08:00
David Kelly	3bf3f16a6a	whitespace	2017-02-27 12:56:03 -07:00
David Kelly	e7c8085bc8	switch to using glyph button	2017-02-27 12:44:23 -07:00
David Kelly	baa7f81d79	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting	2017-02-24 18:38:57 -08:00
Dante Ruiz	73c337efd0	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix	2017-02-25 00:42:22 +00:00
Dante Ruiz	835b23832f	some modal clean up	2017-02-25 00:40:38 +00:00
Seth Alves	fcd3c09404	Merge branch 'tablet-ui-tablet-is-overlay' of github.com:sethalves/hifi into tablet-ui-edit-js-tablet-as-overlay	2017-02-24 14:27:30 -08:00
Brad Davis	cd8bba47cf	Add pending texture transfer size to tracked stats	2017-02-24 12:39:38 -08:00
David Kelly	d6f0d8c960	styling changes, first pass	2017-02-24 11:45:03 -08:00
Howard Stearns	a9b8045697	Merge pull request #9720 from howard-stearns/filter-pal-by-view-distance ... Filter pal by view distance	2017-02-24 11:10:13 -08:00
David Kelly	d399f648d5	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting	2017-02-24 10:32:43 -08:00
Dante Ruiz	89f5e5112f	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix	2017-02-24 15:25:32 +00:00
David Kelly	4a4c914ca8	First cut at new styling	2017-02-23 18:53:22 -08:00
Seth Alves	610c20e01a	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-23 17:41:38 -08:00
Seth Alves	57ab2ba7ca	Merge pull request #7 from fayeli/edit-js-create-tab ... Create Tab and Tab Bar QML Styling	2017-02-23 17:40:48 -08:00
Brad Davis	61e341db75	Merge remote-tracking branch 'upstream/master' into smarter_textures	2017-02-23 17:22:03 -08:00
Faye Li	c60360b6e0	particle explorer icon	2017-02-23 16:34:10 -08:00
Dante Ruiz	4a5be4238e	messages and file dialogs in tablet	2017-02-24 00:19:32 +00:00
Faye Li	80c3c00398	switch to properties tab when you create an entity	2017-02-23 14:48:06 -08:00
Faye Li	d4ea0c116d	asset server button	2017-02-23 14:36:39 -08:00
Faye Li	3850bc35a9	icons on new entity buttons	2017-02-23 13:31:03 -08:00
Faye Li	bd834097d5	tab bar styling	2017-02-23 12:36:27 -08:00
Faye Li	8e89e07732	text choose an entity type to create	2017-02-23 11:50:39 -08:00
Faye Li	88318c1911	create tab background and new entity buttons	2017-02-23 11:40:26 -08:00
Howard Stearns	cddba43837	Merge branch 'master' into filter-pal-by-view-distance	2017-02-23 08:25:16 -08:00
Dante Ruiz	93ae93a45a	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix	2017-02-23 15:43:24 +00:00
Andrew Meadows	6ac33dbf61	count avatar joint updates and non-updates	2017-02-22 17:23:36 -08:00
Dante Ruiz	3ba605bf23	saving work	2017-02-23 00:28:30 +00:00
howard-stearns	de3a0d3d0c	button styling	2017-02-22 13:02:05 -08:00
howard-stearns	023a32563c	work around .qml settings issues	2017-02-22 12:59:40 -08:00
Seth Alves	5bff2034c3	cleanups, attempt to get particle explorer to work right	2017-02-22 12:07:18 -08:00
samcake	6938948501	Merge branch 'master' of https://github.com/highfidelity/hifi into texmex	2017-02-22 12:00:11 -08:00
Seth Alves	84b93826d0	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-22 09:30:16 -08:00
Anthony J. Thibault	379b7bc56d	Fix for system toolbar hiding when scripts are reloaded	2017-02-21 17:24:22 -08:00
howard-stearns	a20590a2f9	fixed myCard width in all cases (admin or not)	2017-02-21 16:03:59 -08:00
howard-stearns	1ddc7de581	remove debugging (and fix missing brace)	2017-02-21 15:41:17 -08:00
howard-stearns	f21e17d512	new buttons	2017-02-21 15:32:41 -08:00
howard-stearns	aff44d682e	Merge branch 'master' of https://github.com/highfidelity/hifi into filter-pal-by-view-distance	2017-02-21 13:45:25 -08:00
howard-stearns	15d8041683	snapshot working, before button change	2017-02-21 13:14:45 -08:00
David Kelly	76229905f2	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting	2017-02-21 09:24:22 -08:00
Seth Alves	43f47c1106	merge from upstream	2017-02-20 12:45:39 -08:00
Brad Davis	07506b0078	Merge remote-tracking branch 'upstream/master' into smarter_textures	2017-02-19 14:00:52 -08:00
Dante Ruiz	3f8ea4ac54	fixed merge conflict	2017-02-17 23:33:39 +00:00
Anthony J. Thibault	5963c6ddc3	Fix for toolbar visibility after snapshots.	2017-02-17 11:04:04 -08:00
Dante Ruiz	dedd85d296	saving work	2017-02-17 18:47:59 +00:00
David Kelly	d938c70b48	volume goes 0-9 now	2017-02-17 11:11:08 -07:00
Seth Alves	0d10667bb4	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-17 09:58:33 -08:00
David Kelly	51246a2e45	first cut, pretty ugly	2017-02-17 10:24:01 -07:00
Dante Ruiz	08ffa18008	Merge branch 'master' into menuFix	2017-02-17 15:53:33 +00:00
Brad Davis	35a6359d59	Fixing transfer logic, adding stats display & profile ranges	2017-02-17 07:53:21 -08:00
Dante Ruiz	3189b44612	refreshing with master	2017-02-17 15:50:08 +00:00
Anthony J. Thibault	cffdecbf68	Merge branch 'master' into feature/toolbar-tablet-switcheroo	2017-02-16 16:28:43 -08:00
Dante Ruiz	628b97bfc6	fixed merge issues	2017-02-17 00:08:31 +00:00
Dante Ruiz	afd56bbbbe	fixed qml font path issue for desktop and tablet	2017-02-17 00:01:12 +00:00
Anthony J. Thibault	8ccca86dee	Settings for Tablet Becomes Toolbar	2017-02-16 15:57:36 -08:00
Anthony J. Thibault	5b1f150171	Fix for race condition when switching between Main Menu and Audio Menu	2017-02-16 12:52:46 -08:00
howard-stearns	6e3ae1fe4f	cleanup some accumulated cruft in pal code	2017-02-16 10:53:02 -08:00
Dante Ruiz	b50bc99cbd	updated menu stack	2017-02-16 08:13:16 -08:00
Dante Ruiz	2a97ebb076	updating branch with master	2017-02-16 08:11:50 -08:00
Anthony J. Thibault	03b6280ed0	Fix for empty toolbar issue	2017-02-15 16:50:08 -08:00
Anthony J. Thibault	67302cbd2b	toolbar work to better support tablet buttons	2017-02-15 15:53:08 -08:00
Anthony J. Thibault	ed11edad56	EventBridge support	2017-02-15 13:59:04 -08:00
Dante Ruiz	e6853a9255	updated menu stack	2017-02-15 18:57:06 +00:00
Dante Ruiz	485592751f	fixing merge changes	2017-02-15 15:38:22 +00:00
Dante Ruiz	22baab1359	updating branch with master	2017-02-15 15:24:08 +00:00
Anthony J. Thibault	912e8aa04a	Tablet buttons now work in toolbar. ... Switching between tablet and toolbar is not as dynamic as I'd like but it's a start.	2017-02-14 15:37:24 -08:00
Anthony J. Thibault	4503923665	Initial version of TabletProxy.toolbarMode boolean ... Copies all tablet buttons between the tablet and the system toolbar. To test type this in the console: Tablet.getTablet("com.highfidelity.interface.tablet.system").toolbarMode = true;	2017-02-14 15:36:03 -08:00
Seth Alves	838d7f6f10	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-14 13:58:18 -08:00
David Rowe	625f5efdf8	Merge branch 'master' into 21164 ... # Conflicts: # scripts/system/audio.js	2017-02-15 10:00:52 +13:00
Chris Collins	442e8d68ef	Merge pull request #9650 from kunalgosar/browserFix ... Added isAway (paused) property to myAvatar	2017-02-14 11:16:07 -08:00
Dante Ruiz	968ba1e03d	updated file headers	2017-02-14 16:08:25 +00:00
Dante Ruiz	aa164bbf8f	diff minimize	2017-02-14 15:55:32 +00:00
Dante Ruiz	9d5f392be3	removed more qml log errors	2017-02-14 07:46:34 -08:00
Dante Ruiz	773ade5b61	removing qml errors	2017-02-14 07:46:34 -08:00
Dante Ruiz	8fbcead6d1	removed/renamed some files	2017-02-14 07:46:33 -08:00
Dante Ruiz	948352cdb6	general preferences work on tablet	2017-02-14 07:46:33 -08:00
Dante Ruiz	888d4ff706	basic prefreneces done	2017-02-14 07:46:32 -08:00
Dante Ruiz	46cfa7cf13	saving work	2017-02-14 07:46:31 -08:00
Seth Alves	d40402faae	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-14 06:53:34 -08:00
Anthony J. Thibault	1c783031b1	Removed ColorOverlay from TabletButton, added more icon & text states ... Now uses separate images for each state. Now tabletButtonProxy has 4 state properties, one for icon and images. * icon * hoverIcon * activeIcon * activeHoverIcon * text * hoverText * activeText * activeHoverText Updated scripts to set new button states, if necessary.	2017-02-13 15:09:46 -08:00
Faye Li	6f506d6023	some attempts to get icons in create tab	2017-02-13 14:40:45 -08:00
David Rowe	77f0fb1491	Change the "Mute" tablet button to "Audio"	2017-02-11 22:40:19 +13:00
kunalgosar	9c537726e5	Fix stuck in pause error with browsers	2017-02-10 18:13:09 -08:00
David Rowe	a08347936e	Make clicking the tablet mic icon or audio bar toggle the mute state	2017-02-11 15:11:27 +13:00
Seth Alves	44aa3e044b	make it so near grabbing while edit is active doesn't select a new entity	2017-02-10 16:56:53 -08:00
Seth Alves	fead52f626	put new-entity buttons in a tab of the edit app	2017-02-10 15:18:01 -08:00
David Rowe	acaf8c69c6	Better tablet mic muted and unmuted iconography	2017-02-11 11:07:31 +13:00
Seth Alves	0b358a2ac7	finish hooking up new-model dialog	2017-02-10 13:29:06 -08:00
David Rowe	b5b92c1508	Make the tablet's mic icon reflect the current mute state	2017-02-11 09:53:02 +13:00
Seth Alves	e851ece343	merge from upstream	2017-02-10 12:09:00 -08:00
Seth Alves	3171ce1602	hook up more of new-model dialog	2017-02-10 12:03:26 -08:00
Seth Alves	7a63b07462	attempting to handle new-model dialog	2017-02-09 17:14:10 -08:00
Seth Alves	d0d13cdde1	fix tab titles	2017-02-09 15:52:15 -08:00
Seth Alves	e12c77e576	move the edit tabs into tablet	2017-02-09 14:43:44 -08:00
Seth Alves	c4ac719d2c	merge from upstream + cleanups	2017-02-09 14:26:29 -08:00
Seth Alves	4c3a6842a5	start on moving edit.js to tablet	2017-02-09 14:03:01 -08:00
Brad Hefta-Gaub	bc22326ec8	Merge pull request #9640 from ZappoMan/avatarSimulationStats ... New stats for avatar simulation	2017-02-09 12:58:30 -08:00
Dante Ruiz	ff60058cbe	checking if desktop exists	2017-02-09 17:54:41 +00:00
Brad Hefta-Gaub	ae071aec0d	add a bunch more stats for avatar processing	2017-02-09 09:52:09 -08:00
Dante Ruiz	6bc685b02a	saving work	2017-02-09 07:13:29 -08:00
Dante Ruiz	5c5ace7c7b	goto in tablet	2017-02-09 07:13:29 -08:00
Anthony J. Thibault	090f632189	Pal: Moved keyboard tray to be flush with bottom of window.	2017-02-08 18:16:48 -08:00
Anthony J. Thibault	7cc3079328	Tightened up margins for the tablet.	2017-02-08 17:58:24 -08:00
Anthony J. Thibault	a209d0372a	First cut of pal on tablet.	2017-02-08 17:34:03 -08:00
Seth Alves	90fa8bf572	Merge pull request #9612 from druiz17/users ... some tweaks to users and menus got tablet	2017-02-07 15:38:43 -08:00
Dante Ruiz	5ff91c018b	snapshot fix	2017-02-06 19:39:57 +00:00
Dante Ruiz	dd8f095bd8	minimize diff	2017-02-04 00:36:41 +00:00
Dante Ruiz	0c28776ea2	some tweaks to users and menus got tablet	2017-02-04 00:13:39 +00:00
Anthony J. Thibault	85e01e3922	tablet-ui: Added sortOrder property to buttons ... By default user created buttons will appear after system buttons.	2017-02-02 17:18:22 -08:00
Dante Ruiz	2cc1ee008d	added clicking sounds to tablet menus	2017-02-02 17:46:42 +00:00
Anthony J. Thibault	de55a5dfe6	tablet-ui: reduced volume of button click	2017-02-01 18:47:50 -08:00
Zach Fox	8b1161b0b0	Fix it	2017-02-01 12:32:30 -08:00
Anthony J. Thibault	8f362861eb	tablet-ui: button icon images now work with http urls.	2017-01-31 16:53:25 -08:00
Seth Alves	ac475300f6	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-30 08:15:29 -08:00
Zach Fox	5cba928540	Do it!	2017-01-27 16:30:59 -08:00
Seth Alves	204652514e	fix some fallout from toolbar changes	2017-01-25 16:29:36 -08:00
Seth Alves	f382b541c7	merge from upstream	2017-01-25 15:42:33 -08:00
Seth Alves	ff8d13ecc7	get button-states for toolbar buttons working again	2017-01-25 15:38:54 -08:00
Dante Ruiz	6671d7f9e6	removed some unnessary menu item	2017-01-25 21:23:04 +00:00
Dante Ruiz	0d7f15e41b	removed more qml errors	2017-01-25 18:22:28 +00:00
Seth Alves	7d370fb791	Merge pull request #9507 from cozza13/tablet-ui ... Changes to tablet formatting	2017-01-25 09:29:16 -08:00
Dante Ruiz	096b2e876f	removing qml null print error	2017-01-25 08:00:40 -08:00
Chris Collins	df9bfa6eff	Changes to tablet formating ... Changes to QML and .js formating to match style of mockup.	2017-01-25 07:41:04 -08:00
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	2fc76d64fd	clean up unused code and files	2017-01-10 09:13:46 -08:00
Dante Ruiz	6705846518	clean up round 1	2017-01-10 09:13:46 -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
Anthony J. Thibault	6794ed7cc4	Merge remote-tracking branch 'upstream/master' into tablet-ui	2017-01-09 10:37:46 -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
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
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
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	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
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
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
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	2216ab6def	Delete redundant code	2016-12-20 07:40:28 -08:00
David Rowe	5fbdd64fff	Handle Clara marketplace downloads	2016-12-20 07:40:28 -08:00
David Rowe	767b3ea8e9	Add script injection to Web 3D overlay	2016-12-20 07:40:28 -08:00
David Rowe	ef488ec036	Get script injection working in new marketplaces window	2016-12-20 07:33:55 -08:00
David Rowe	5690bc30ea	Automatically continue once Zip file is ready	2016-12-20 07:33:55 -08:00
David Rowe	e40b71b3dd	Customize Clara item menu	2016-12-20 07:33:55 -08:00
David Rowe	c7c3dfef3e	Fix up library link from Clara item page	2016-12-20 07:33:55 -08:00
David Rowe	f7503ba46c	Display "image" option for each Clara marketplace item	2016-12-20 07:33:55 -08:00
David Rowe	1987719cfd	Display Clara.io download information	2016-12-20 07:33:55 -08:00
David Rowe	bf2bcc0b80	Add user feedback on download process	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	196473f9fa	Provide keyboard in marketplaces window	2016-12-20 07:33:55 -08:00
David Rowe	b3cc69d608	Inject keyboard raising and lowering script into marketplaces window	2016-12-20 07:33:55 -08:00
David Rowe	420f65b1aa	Add keyboard control to marketplaces window	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	e1a135591f	Code tidying	2016-12-20 07:33:55 -08:00
David Rowe	09ee7b1bd4	Hide brief flash of browser window used for download	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
David Rowe	5f7a2f3b3c	Canonical default browser URL	2016-12-20 07:33:55 -08:00
David Rowe	211cf7a81a	Make Clara.io download more robust	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
howard-stearns	ae4064f445	Merge branch 'master' of https://github.com/highfidelity/hifi into pal-proto	2016-12-14 17:04:52 -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
Brad Hefta-Gaub	e3bc49c302	drop avatar data rate to 45hz	2016-12-13 16:51:59 -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
Stephen Birarda	5111256a9e	resize the sign up dialog when showing errors	2016-12-12 13:04:14 -08:00
Stephen Birarda	a0663bdf31	fix resizing of LoginDialog and friends	2016-12-12 11:32:19 -08:00
Stephen Birarda	691ce4312e	fix resizing for keyboard changes in body loaded qml	2016-12-09 16:49:53 -08:00
Stephen Birarda	f0f10d837c	fix indents, fix resize for keyboard changes	2016-12-09 16:04:42 -08:00
Brad Hefta-Gaub	4959a88581	first cut at kinect input plugin	2016-12-08 22:13:56 -08:00
Stephen Birarda	673e03aae4	add a spinner to sign up	2016-12-08 17:29:29 -08:00
Stephen Birarda	370de667d5	add a spinner to the login dialog	2016-12-08 17:23:39 -08:00
Stephen Birarda	396c2bc28f	add error for login after signup, fix link style	2016-12-08 17:00:47 -08:00
Stephen Birarda	9445fc2898	fix for display of multiple sign up errors	2016-12-08 16:28:16 -08:00
Stephen Birarda	b66ddbdbdb	add email field, error handling for sign up inputs	2016-12-08 16:16:37 -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
Stephen Birarda	556ccb90f7	make a SignUpBody loaded by LoginDialog	2016-12-08 14:35:41 -08:00
Stephen Birarda	801a384607	a simple signup dialog copied from login dialog	2016-12-07 16:14:20 -08:00
David Rowe	460d332c6f	Delete redundant code	2016-12-07 10:06:32 +13:00
David Rowe	d857f943f8	Handle Clara marketplace downloads	2016-12-07 09:16:59 +13:00
David Rowe	a8a04cfbba	Add script injection to Web 3D overlay	2016-12-05 12:19:49 +13:00
David Rowe	a75d0b3fe8	Merge branch 'master' into 21089	2016-11-30 14:50:51 +13:00
Anthony J. Thibault	cbf514a738	PreferenceDialogs now preserve the sort order of their showCategories. ... Specifically, this was to fix the issue with the Neuron plugin preferences being the top section in the General Preferences dialog, now it is the last.	2016-11-23 10:11:28 -08: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
David Kelly	dcda5d50a0	Merge pull request #9106 from howard-stearns/animate-suggestions-when-available ... animate suggestions when available	2016-11-22 09:24:48 -08:00
howard-stearns	81786bf819	animate suggestions when available	2016-11-21 16:46:10 -08:00
howard-stearns	2beed7e70b	proper include_actions for 'places' tab.	2016-11-21 16:22:02 -08:00
howard-stearns	da56457c4a	Merge branch 'master' of https://github.com/highfidelity/hifi into location-cleanup	2016-11-18 17:13:32 -08:00
howard-stearns	f1806eb649	server protocols	2016-11-18 17:05:14 -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	9f2b6dc40b	location cleanup	2016-11-16 12:53:57 -08:00
howard-stearns	fef68ac53a	gap between top and scroll	2016-11-16 10:02:17 -08:00
howard-stearns	b0518feee4	split ToolbarButton.qml into a stateful image part	2016-11-15 14:59:27 -08:00
howard-stearns	182050c4b9	don't process stale query responses	2016-11-15 14:34:23 -08:00
howard-stearns	9809515853	styling	2016-11-15 14:12:27 -08:00
David Rowe	9b270834dd	Merge branch 'master' into 21089	2016-11-16 08:51:48 +13: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
David Rowe	e7d9f98ca4	Get script injection working in new marketplaces window	2016-11-15 09:23:51 +13: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
Howard Stearns	fcbf4f421a	no scroll margins	2016-11-12 10:04:15 -08:00
Brad Hefta-Gaub	0dc7f0bf17	Merge pull request #9055 from jherico/fix_stats ... Fix buffer count in stats display	2016-11-11 13:31:55 -08:00
Brad Davis	0aec9400c7	Fix buffer count in stats display	2016-11-11 12:54:19 -08:00
David Rowe	975eea8702	Automatically continue once Zip file is ready	2016-11-11 12:04:05 +13:00
Brad Davis	90f55f0cd5	Add stutter tracking	2016-11-10 11:56:38 -08:00
David Rowe	1fe5e451bf	Customize Clara item menu	2016-11-10 20:28:41 +13:00
David Rowe	492e98c31e	Fix up library link from Clara item page	2016-11-10 18:20:36 +13:00
David Rowe	5503adac3e	Display "image" option for each Clara marketplace item	2016-11-10 17:55:12 +13:00
David Rowe	84795439ea	Display Clara.io download information	2016-11-10 16:29:48 +13:00
David Rowe	5eff7c9e15	Merge branch 'master' into 21089	2016-11-10 14:42:21 +13:00
Howard Stearns	0a56f7c4fe	Merge pull request #9009 from howard-stearns/fix-numeric-keyboard-for-window-prompt ... fix numeric keyboard for hmd Window.prompt	2016-11-08 12:05:13 -08:00
Chris Collins	eec8e2f19b	Merge pull request #9000 from samcake/punk ... Add Frame Timing and GPU memory to the Stats and user activity log	2016-11-07 16:17:20 -08:00
David Rowe	090065ee34	Add user feedback on download process	2016-11-08 13:05:35 +13:00
David Rowe	d33ac21aaa	Merge branch 'master' into 21089	2016-11-08 08:23:10 +13:00
howard-stearns	84eb1721e7	fix numeric keyboard for hmd Window.prompt	2016-11-04 17:02:14 -07:00
samcake	76aa541d4a	Adding the frame gpu and batch timer	2016-11-04 11:49:52 -07:00
howard-stearns	c5ee1941d1	raise desktop when showing it	2016-11-03 17:02:47 -07: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	10309cc699	Merge branch 'master' of https://github.com/highfidelity/hifi into centered-toolbar	2016-11-02 15:38:24 -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
David Rowe	de5e02310b	Provide keyboard in marketplaces window	2016-11-03 09:00:40 +13:00
Dante Ruiz	a948e03ed8	changed old icon to new icon	2016-11-02 08:23:10 -07:00
David Rowe	c578cd4b6d	Inject keyboard raising and lowering script into marketplaces window	2016-11-02 17:06:40 +13:00
David Rowe	41c7f714e2	Add keyboard control to marketplaces window	2016-11-02 16:49:45 +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	93beaa81c0	Code tidying	2016-11-01 13:27:05 +13:00
Brad Hefta-Gaub	8fbac58091	remove mute icons	2016-10-30 09:33:02 -07:00
David Rowe	098200a5dd	Hide brief flash of browser window used for download	2016-10-30 15:50:41 +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
David Rowe	97407e1cd5	Canonical default browser URL	2016-10-29 21:31:44 +13:00
David Rowe	5e82410371	Make Clara.io download more robust	2016-10-29 21:31:27 +13:00
Anthony J. Thibault	1fc310434e	Fix for crash in QtWebEngineCore when rapidly switching domains ... Call stop on the QWebEngineView before destroying OffscreenQMLSurface.	2016-10-27 18:55:24 -07:00
Brad Hefta-Gaub	863bf067b7	Merge pull request #8893 from jherico/texture_force_sparse ... Changes to texture loading rules	2016-10-25 18:22:42 -07:00
Brad Hefta-Gaub	b0b950e132	Merge pull request #8898 from ctrlaltdavid/fix-overlaywebwindow-keyboard ... Update OverlayWebWindow keyboard visibility per HMD/desktop mode changes	2016-10-25 17:59:46 -07:00
Brad Davis	ce627eeea1	Updated metrics	2016-10-25 17:49:51 -07:00
Brad Hefta-Gaub	001cfc7e15	Merge pull request #8901 from samcake/blue ... Adding more detailed counters for texture memory consumption	2016-10-25 16:19:56 -07:00
samcake	507d3e5a39	IMprove the counting and namoing of the new couters the gl swapchain	2016-10-25 12:28:07 -07:00
sam	6b2b68e691	trying to add counters for the default FBO	2016-10-25 03:36:23 -07:00
David Rowe	34b9d3eecc	Update OverlayWebWindow keyboard visibility per HMD/desktop mode changes	2016-10-25 20:25:34 +13:00
samcake	58b81e3b0c	Adding counter for the amount of memory used in texture for Framebuffers	2016-10-24 18:34:16 -07:00
Clément Brisset	dd45500313	Merge pull request #8891 from huffman/fix/disconnected-dialog-updates ... Fix several aspects of the "disconnected" dialog	2016-10-24 15:39:16 -07:00
Ryan Huffman	e7023b3d99	Add ConnectionFaiureDialog qml	2016-10-24 10:52:46 -07:00
Brad Davis	861b69aa94	Add free GPU memory to the displayed stats	2016-10-23 13:07:38 -07:00
Brad Davis	62de2af944	Add more GPU stats, make stats easier to read	2016-10-22 14:38:46 -07:00
Brad Davis	1bd398ae5e	Report offscreen texture memory usage in stats	2016-10-21 11:31:37 -07: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	9dee1b85fe	Merge pull request #8855 from birarda/blank-asset-delete ... force valid file path for asset file mapping operations	2016-10-19 14:22:26 -07:00
Stephen Birarda	e3f194b4dd	use the err directly on upload error	2016-10-19 12:41:01 -07:00
Stephen Birarda	179cb67cdb	change order of asset upload failure changes	2016-10-19 11:55:54 -07:00
Stephen Birarda	b80f3fbd7b	fix error handling for failed asset upload	2016-10-19 11:37:35 -07:00
howard-stearns	36951c3c95	colors	2016-10-19 11:24:21 -07:00
howard-stearns	a5fc0d92a2	Merge branch 'master' of https://github.com/highfidelity/hifi into unit-scaled-address-bar	2016-10-19 11:11:05 -07:00
Howard Stearns	20ed77d425	Merge pull request #8840 from Atlante45/keyboard ... Add virtual keyboard for steam username collision	2016-10-18 17:34:55 -07:00
Stephen Birarda	9f2627d31d	Merge pull request #8828 from birarda/web-engine-interceptor ... move HF access token to authorization header	2016-10-18 17:24:58 -07:00
David Rowe	c8e9e4ecd0	Fix suggestion card appearing behind keyboard	2016-10-19 10:13:07 +13:00
Ryan Huffman	3ad039cadc	Update default system toolbar position	2016-10-18 13:57:03 -07:00
Atlante45	0858b3fc8d	Inform user their Steam informations will not be shared	2016-10-18 12:07:18 -07:00
Stephen Birarda	5682d51667	use the HFWebEngineProfile in Desktop.qml	2016-10-18 11:42:55 -07:00
Atlante45	c40a027108	Add virtual keyboard for steam username collision	2016-10-18 11:16:14 -07:00
Stephen Birarda	c4cec8eb1e	use desktop profile again, move classes to networking subdir	2016-10-18 10:22:31 -07:00
howard-stearns	ecd84bf23d	desktop vertical	2016-10-18 10:05:39 -07:00
howard-stearns	0d2bd23874	cleanup	2016-10-18 09:38:55 -07:00
howard-stearns	0dd5c65036	Merge branch 'master' of https://github.com/highfidelity/hifi into unit-scaled-address-bar	2016-10-18 09:36:43 -07:00
howard-stearns	3ce3e57c38	Merge branch 'master' of https://github.com/highfidelity/hifi into unit-scaled-address-bar	2016-10-18 09:36:09 -07:00
Chris Collins	a9dd31f59d	Merge pull request #8833 from jherico/gpu_stats ... Add GPU buffer and texture current counts to the main stats display	2016-10-17 21:03:23 -07:00
Stephen Birarda	3cbdf13931	add intercepted profile to uit WebView	2016-10-17 15:04:33 -07:00
Stephen Birarda	4ec703b7dc	remove unused import from uit WebView	2016-10-17 14:29:12 -07:00
Stephen Birarda	3ce47631b7	move the intercepted web engine profile to BaseWebView	2016-10-17 14:25:59 -07:00
Brad Davis	1e9c369660	Add GPU buffer and texture current counts to the main stats display	2016-10-17 14:02:14 -07:00
howard-stearns	e7392acb10	directory picker works when choosing the initial value	2016-10-17 13:50:23 -07:00
Stephen Birarda	b4b5c648c2	use a QWebEngineProfile request interceptor for auth in HTTP header	2016-10-17 11:34:37 -07:00
Howard Stearns	313e3e7b6d	git rid of wacky scaling	2016-10-15 18:18:24 -07:00
David Rowe	a767a27e7e	Merge branch 'master' into 21070 ... Conflicts: interface/resources/qml/AddressBarDialog.qml	2016-10-16 14:09:53 +13:00
David Rowe	bfc9974fb7	Alter layout of spacebar row	2016-10-15 12:17:59 +13:00
David Rowe	7e4f494e96	Fix no keyboard when renaming item directly in Asset Server dialog	2016-10-15 11:19:38 +13:00
howard-stearns	25f121b462	close button for address bar	2016-10-14 15:10:55 -07:00
David Rowe	c9c5436080	Fix auto scrolling dialogs when keyboard raised	2016-10-15 10:34:54 +13:00
David Rowe	94e20d9a13	Fix login dialog keyboard	2016-10-14 14:29:14 +13:00
David Rowe	8f42a3fe9e	Fix keyboard state in browser when switching focus to/from dialog frame	2016-10-14 12:14:23 +13:00
David Rowe	64c54f9c6b	Fix keyboard in new browser window opened from Web view	2016-10-14 10:03:52 +13:00
David Rowe	2343e02454	Fix a couple of QML errors	2016-10-13 18:16:21 +13:00
David Rowe	a75925d1e3	Add numeric shift	2016-10-13 14:18:21 +13:00
David Rowe	2ef974f729	Fix alphabetic shift	2016-10-13 12:16:02 +13:00
David Rowe	4dfe290d4a	Add comma and period keys to last row of keyboard	2016-10-13 12:02:36 +13:00
David Rowe	5d390b4722	Revise positions of keys in keyboard	2016-10-13 11:45:14 +13:00
David Rowe	a359626316	Merge branch 'master' into 21070	2016-10-13 09:54:59 +13:00
David Rowe	e269a84d0e	Add placeholder "FIXME"s for making Web entity keyboard HMD-only	2016-10-13 09:35:39 +13:00
David Rowe	18f19b07d4	Fix checkbox not being disabled per dropdown default ... And tweak checkbox position.	2016-10-13 08:37:30 +13:00
David Rowe	86f6cee2ad	Fix Asset Browser add-to-world drop-down	2016-10-12 20:08:33 +13:00
David Rowe	ee31e3b896	Fix Asset Browser add-to-world with spaces unwittingly appended to names	2016-10-12 20:08:15 +13:00
David Rowe	49709b42d7	Merge branch 'master' into 21070	2016-10-12 09:45:34 +13:00
David Rowe	31b35f0a35	Only raise keyboard if in HMD display mode	2016-10-12 09:43:33 +13:00
David Rowe	552f276a06	Load avatar browser dialog such that JavaScript EventBridge works	2016-10-11 11:12:57 +13:00
David Rowe	d0900ec75e	Add keyboard to avatar browser dialog	2016-10-11 10:11:36 +13:00
Chris Collins	2b8765b47e	Merge pull request #8765 from ctrlaltdavid/fix-address-bar ... Fix address bar not being able to regain focus	2016-10-10 10:11:34 -07:00
David Rowe	827c2b015b	Update other dialogs to use single keyboard QML file	2016-10-09 11:52:30 +13:00
David Rowe	12f4b2854d	Fix address bar not being able to regain focus	2016-10-08 19:38:57 +13:00
David Rowe	5a4665b02f	Combine numeric keys into alpha keyboard QML file for scrolling windows	2016-10-08 16:27:51 +13:00
David Rowe	b954852ba9	Use temporary copy of keyboard QML file while refactoring	2016-10-08 15:23:11 +13:00
David Rowe	a934f59c2a	Fix virtual keyboard in login dialog	2016-10-08 13:37:31 +13:00
David Rowe	bdff71151d	Updates from code review	2016-10-07 13:35:44 +13:00
David Rowe	e2e762f9e7	Merge branch 'master' into 21055 ... Conflicts: interface/resources/qml/AddressBarDialog.qml	2016-10-07 11:27:35 +13:00
David Rowe	b6221a5f83	Fix clearing address bar after navigating using picture card	2016-10-07 09:45:34 +13:00
David Rowe	1ee9317234	Fix clearing address and cursor upon address bar closing	2016-10-06 17:00:25 +13:00
David Rowe	a347936b68	Fix location not being updated after using back and forwards buttons	2016-10-06 16:47:49 +13:00
David Rowe	2807f76e68	Fix semantics of function parameter	2016-10-06 15:49:16 +13:00
David Rowe	742e603fd6	Show cursor if user clicks in address bar	2016-10-06 15:21:08 +13:00
David Rowe	7d23cd7c7c	Don't show cursor until after have started entering an address	2016-10-06 15:19:58 +13:00
David Rowe	b70eac353b	Enable address entry by typing without clicking in address bar	2016-10-06 15:18:07 +13:00
David Rowe	1a745094e2	Merge branch 'master' into 21055 ... Conflicts: libraries/entities-renderer/src/RenderableWebEntityItem.cpp libraries/gl/src/gl/OffscreenQmlSurface.h	2016-10-06 09:29:09 +13:00
David Rowe	e9a398472a	Remove duplicate keyboard ... Fixes keyboard raising and lowering when select entity with editor open.	2016-09-29 12:09:04 +13:00
David Rowe	2933e37a0a	Fix field not scrolling into view when raise keyboard in settings	2016-09-29 10:47:15 +13:00
David Rowe	40bfbf4021	Prevent flicker of keyboard area when navigate to a new page in browser	2016-09-29 10:35:18 +13:00
David Rowe	52f2d36096	Move "," and "." to numeric keyboard for ready use with numeric fields	2016-09-29 10:17:31 +13:00
David Rowe	f8572096b1	Merge branch 'master' into 21055	2016-09-28 20:00:04 +13:00
David Rowe	2344d15dbc	Raise and lower keyboard for HTML fields in Marketplace window	2016-09-28 16:41:01 +13:00
David Rowe	875566d956	Raise and lower keyboard for HTML fields in Browser window	2016-09-28 16:40:38 +13:00
howard-stearns	39d352e1a7	display location/connection status in address bar when it doesn't have ... focus	2016-09-26 11:27:50 -07:00
David Rowe	bc8c400448	Fix up keyboards in attachments dialogs	2016-09-26 16:39:34 +13:00
David Rowe	302c8ede60	Miscellaneous fixes	2016-09-26 15:34:39 +13:00
David Rowe	7d1d71084d	Add keyboard to custom query dialog	2016-09-26 14:32:29 +13:00
David Rowe	023efe05f0	Move keyboard QML files	2016-09-25 09:54:48 +13:00
David Rowe	5b6835fbdb	Fix defocusing	2016-09-24 21:23:30 +12:00
David Rowe	0f672c3aa2	Scroll content if necessary when keyboard is displayed	2016-09-24 18:56:35 +12:00
David Rowe	8663455d01	Unfocus field and hide keyboard when click in blank part of dialog	2016-09-24 17:34:02 +12: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	2468b56079	Merge branch 'master' of github.com:highfidelity/hifi into qml-keyboard	2016-09-20 13:28:20 -07:00
Brad Hefta-Gaub	41bbfcd578	Merge pull request #8603 from sethalves/quiet-logging ... categorize some qDebugs	2016-09-15 18:09:11 -07:00
Seth Alves	4470338663	catagorize some qDebugs	2016-09-14 21:39:45 -07:00
howard-stearns	db20a8ceef	fix 1319	2016-09-14 11:20:09 -07:00
Seth Alves	409ebe526b	qml keyboard for Browser window	2016-09-14 10:38:08 -07:00
Seth Alves	447de7cd5a	qml keyboard for edit.js window	2016-09-13 16:31:59 -07:00
Seth Alves	dff567054d	qml keyboard for avatar preferences dialog	2016-09-13 11:17:00 -07:00
Seth Alves	161424afaf	qml keyboard for browsable preferences	2016-09-12 21:39:52 -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	b841e3094d	qml keyboard for file dialog	2016-09-12 16:23:05 -07:00
Seth Alves	3e86b2f0f2	remove some unneeded objectNames	2016-09-12 15:34:29 -07:00
Seth Alves	4c370d0d32	qml keyboard for query-dialog	2016-09-12 15:31:07 -07:00
Seth Alves	38a1556716	qml keyboard for running-scripts window	2016-09-12 13:28:46 -07:00
Seth Alves	44af3b43cc	fix property access	2016-09-09 17:02:11 -07:00
Seth Alves	c396196e0f	show and hide keyboard for qml windows	2016-09-09 16:48:46 -07:00
Seth Alves	e5b56fec7c	put keyboard on location dialog	2016-09-09 11:32:17 -07:00
Brad Hefta-Gaub	ad8a832c86	Merge pull request #8582 from howard-stearns/open-browser-and-close ... Handle window.open/close in Web content.	2016-09-08 21:17:40 -07:00
Brad Hefta-Gaub	b56ad737d4	Merge pull request #8567 from hyperlogic/feature/tablet-ui-foundation ... Web Entities Virtual Keyboard + Event Bridge support	2016-09-08 18:36:46 -07:00
Anthony J. Thibault	d38625ce2a	Coding standard fix for JS portions of QML. ... Semicolons at end of line.	2016-09-08 18:16:32 -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	ebf280fd6f	Handle window.open requests from web pages in WebView following QT upgrade. ... Handle window.close requests in the browser.	2016-09-08 13:06:33 -07:00
howard-stearns	b918e1ec51	fix system toolbar following upgrade to QT 5.6	2016-09-08 11:32:12 -07:00
Anthony J. Thibault	ebb4c0990b	Removed local copy of qtwebchannel.js, use qt resource version instead	2016-09-07 17:14:33 -07:00
Anthony J. Thibault	69bda0de83	Shift key resets after first alpha key.	2016-09-07 13:49:47 -07:00
Anthony J. Thibault	41e0b8732f	fix for occasional crash when deleting web entity	2016-09-07 10:59:16 -07:00
Anthony J. Thibault	dc0d0c2d5c	Merge branch 'master' into feature/tablet-ui-foundation	2016-09-07 09:49:55 -07:00
Anthony J. Thibault	774509ba9e	Changed punctuation button to &123	2016-09-06 17:41:56 -07:00
SamGondelman	8a4d48ca8d	set browserProfile now that Qt bug is fixed	2016-09-06 17:38:47 -07:00
SamGondelman	038aba20e4	disable dropshadows if unsupported (OSX and AMD cards)	2016-09-06 17:36:57 -07:00
SamGondelman	9903e464d8	fix error in FileDialog.qml	2016-09-06 17:36:53 -07:00
SamGondelman	98cb3cc366	updated build instructions	2016-09-06 17:36:52 -07:00
Anthony J. Thibault	73315e3390	Punctuation mode now works	2016-09-06 17:07:41 -07:00