1848 commits

Author	SHA1	Message	Date
David Rowe	d857f943f8	Handle Clara marketplace downloads	2016-12-07 09:16:59 +13:00
David Rowe	2f42f4cfa5	Merge branch 'master' into 21089	2016-12-05 18:33:38 +13:00
David Rowe	a8a04cfbba	Add script injection to Web 3D overlay	2016-12-05 12:19:49 +13:00
Seth Alves	efe9571ab8	Merge pull request #8691 from highfidelity/out-of-body-experience ... Room Scale HMD comfort features.	2016-12-01 11:09:39 -08: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
Andrew Meadows	6bb3dd6830	Merge hifi/master into hifi/out-of-body-experience	2016-11-14 15:08:04 -08:00
howard-stearns	6078b833a1	Merge remote-tracking branch 'origin/group-snapshots-by-place' into no-snapshots-welcome	2016-11-14 13:47:32 -08:00
howard-stearns	4cdda7c20f	Merge remote-tracking branch 'origin/quasi-tabbed-goto' into no-snapshots-welcome	2016-11-14 13:13:58 -08:00
David Rowe	e7d9f98ca4	Get script injection working in new marketplaces window	2016-11-15 09:23:51 +13:00
Atlante45	f8be4227d9	Fix Blast screen typos	2016-11-14 12:06:25 -08:00
Howard Stearns	fac5d1e12e	group snapshots by place	2016-11-12 17:00:54 -08:00
Howard Stearns	17428d7ecb	tab-like filtering of suggestions by type	2016-11-12 15:23:11 -08:00
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
Chris Collins	b9b90cc646	Merge pull request #9047 from jherico/stutter ... Add stutter tracking	2016-11-11 11:39:00 -08:00
Brad Hefta-Gaub	a90a0fe8ba	Merge pull request #8976 from druiz17/FixMenuOutOfView ... Fixed menu out of view with HMD and Xbox controller	2016-11-10 18:49:34 -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
Dante Ruiz	e22c36b4b7	fixed menu pop up delay	2016-11-07 17:16:24 +00:00
Andrew Meadows	ccdf383151	Merge hifi/master into hifi/out-of-body-experience	2016-11-07 08:24:26 -08: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
Andrew Meadows	836aad7d0b	Merge pull request #8997 from howard-stearns/raise-desktop-when-showing-it ... raise desktop when showing it	2016-11-04 10:45:05 -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