1157 commits

Author	SHA1	Message	Date
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
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