3563 commits

Author	SHA1	Message	Date
Dante Ruiz	37c51a7246	Merge branch 'menu-updates' of github.com:vladest/hifi into menu-updates	2018-05-16 10:41:40 -07:00
Dante Ruiz	e676348c4f	fixing some menu reog bugs	2018-05-16 10:40:28 -07:00
vladest	72838f6d34	Implemented radio button preferences. Reimplemented snap smooth turn to radio buttons	2018-05-16 17:06:31 +02:00
vladest	5127cb0ea6	Merge branch 'master' into menu-updates	2018-05-16 14:37:00 +02:00
John Conklin II	a6cda2166a	Merge pull request #13158 from highfidelity/stable ... RC67.1 stable mergeback to master	2018-05-15 14:01:06 -07:00
vladest	7ea6181520	Merge branch 'master' into menu-updates	2018-05-15 21:54:45 +02:00
vladest	e2a8ee2a4c	Fixed About date format. Increased space between logo and build info	2018-05-15 20:02:29 +02:00
vladest	a6ef459723	Open browser within Interface	2018-05-15 16:07:32 +02:00
vladest	fee3cc0aca	Implemented backend for About dialog	2018-05-15 15:49:20 +02:00
vladest	58f04121b7	Correct link colors	2018-05-15 06:22:10 +02:00
Dante Ruiz	82422edb59	fixinig the controller settings page and have menu option on by default	2018-05-14 18:51:39 -07:00
vladest	2a3004079e	About UI	2018-05-14 23:22:06 +02:00
Zach Fox	83cae54601	Show 'invalidated' label for valid = false	2018-05-14 13:34:20 -07:00
Zach Fox	2a1c2ba7b1	PurchasedItem logic	2018-05-14 09:54:05 -07:00
Zach Fox	81ebb681bb	Show invalidated items in My Purchases	2018-05-14 09:35:34 -07:00
vladest	f8ebe7e669	remoed no more used LOD dialogs. Fixed Slider properties min and max settings	2018-05-12 16:01:43 +02:00
vladest	0a67fc3b36	Merge conflicts	2018-05-12 11:24:35 +02:00
Dante Ruiz	4eba727849	fix qml crash on start up	2018-05-11 10:47:41 -07:00
Dante Ruiz	9e9852d67b	Merge pull request #12989 from Triplelexx/21774_file_browser ... Worklist #21774: Fix Windows.browseAssets() bugs	2018-05-11 08:50:17 -07:00
Anthony J. Thibault	0ac12fa317	Bug fix for Vive Tracker Calibration Settings ... This issue was inadvertently introduced by the name change of the Vive display plugin.	2018-05-10 17:56:54 -07:00
Triplelexx	a061e84ad7	remove unused commented code	2018-05-10 19:40:02 +01:00
vladest	62aa2df836	Merge branch 'master' into menu-updates	2018-05-10 10:36:38 +02:00
Zach Fox	22c26c348d	MS14937: Fix Replace button for content sets during Checkout	2018-05-08 16:37:11 -07:00
Zach Fox	540f200b99	MS14937: Fix Replace button for content sets during Checkout	2018-05-08 16:34:28 -07:00
Stephen Birarda	4165ab3667	Merge branch 'RC67' of github.com:highfidelity/hifi into 67-to-master	2018-05-08 14:08:21 -07:00
John Conklin II	bec015db5c	Merge pull request #13116 from ElderOrb/FB14818 ... Fix for 'Login page for steam is blank'	2018-05-07 11:26:39 -07:00
John Conklin II	286bed25bd	Merge pull request #13106 from zfox23/RC67_MS14758 ... RC67: MS14758: Fix avatar reset when gifting worn avatar	2018-05-07 10:10:41 -07:00
Alexander Ivash	b4cfea2fbc	FB14818 Login page for steam is blank	2018-05-06 17:17:06 +03:00
vladest	c7ab1f3dbf	Merge branch 'master' into menu-updates	2018-05-05 20:48:40 +02:00
vladest	5a5bfcfe02	Merge branch 'master' into menu-updates	2018-05-05 07:11:39 +02:00
Zach Fox	4ebed7605c	MS14758: Fix avatar reset when gifting worn avatar	2018-05-04 16:04:05 -07:00
John Conklin II	b314d496ec	Merge pull request #13103 from zfox23/MS14699_clearCachedPasscode ... MS14699: Prevent Wallet passcode from being sticky in certain cases	2018-05-04 15:22:41 -07:00
Zach Fox	53fe0bc616	MS14699: Prevent Wallet passcode from being sticky in certain cases	2018-05-04 14:08:21 -07:00
Zach Fox	e48d39ec38	MS14758: Fix avatar reset when gifting worn avatar	2018-05-04 10:10:48 -07:00
Gabriel Calero	c15ef56d90	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-05-02 14:38:10 -03:00
vladest	53350b471b	Merge branch 'master' into menu-updates	2018-05-02 19:02:11 +02:00
vladest	ea66e04ab8	Removed unwanted code	2018-05-02 18:58:40 +02:00
vladest	aef62d09c7	Merge branch 'master' into menu-updates	2018-05-01 21:47:46 +02:00
John Conklin II	250aa3ab43	Merge pull request #13027 from jherico/fix/web_crash2 ... Some fixes for QML surfaces	2018-05-01 12:39:46 -07:00
vladest	617b49fe14	Added mouse sensivity UI. Reworked advanced movements. TODO: properties interface complitely broken in Tablet mode	2018-05-01 21:22:48 +02:00
Zach Fox	9b80c500e3	Merge pull request #13039 from zfox23/sideloadAppJson ... Enable sideloading .app.json Apps from local disk	2018-04-30 11:14:24 -07:00
John Conklin II	b6afaccdf3	Merge pull request #13041 from RebeccaStankus/newModelDialog-Fix ... New model dialog fix	2018-04-30 10:08:54 -07:00
vladest	a16b2c0d20	Restore preferences dialogs buttons spacing	2018-04-29 12:38:37 +02:00
vladest	be22f49c32	Merge branch 'master' into menu-updates	2018-04-28 20:22:28 +02:00
Brad Davis	8e42bb8c87	Restore the stop functionality for a browser view when it's being destroyed	2018-04-27 17:35:38 -07:00
RebeccaStankus	269a7f0e15	Changed maximum line count for warning message	2018-04-27 14:34:08 -07:00
Zach Fox	dbd7d7e2b4	Small cleanup	2018-04-27 14:19:58 -07:00
Zach Fox	ea716f2a1e	Enable sideloading .app.json Apps from local disk	2018-04-27 14:08:53 -07:00
Zach Fox	c0fe504713	Merge pull request #13030 from zfox23/finalize_14295_14559 ... Finalize work on MS14295 and MS14559	2018-04-27 13:49:02 -07:00
Zach Fox	684d2b08ba	Finalize work on MS14295 and MS14559	2018-04-27 12:03:54 -07:00