3533 commits

Author	SHA1	Message	Date
Brad Davis	ae07036f20	Add ideal resource texture memory stat	2018-05-18 09:23:53 -07:00
Zach Fox	585957409d	Merge pull request #13141 from zfox23/spectatorCameraImprovements ... Spectator Camera V2	2018-05-16 13:38:07 -07: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
Zach Fox	e607c68bea	Thanks Mukul!	2018-05-14 16:48:40 -07: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
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
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
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
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
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
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
Howard Stearns	f8ad36afd0	Merge pull request #13028 from zfox23/updateCommerceFor67 ... Allow gifting of Pending items; remove PoP verification rescheduling on Pending items	2018-04-27 11:55:40 -07:00
Zach Fox	bbc15cdc63	Finalize work on MS14295 and MS14559	2018-04-27 11:04:46 -07:00
Zach Fox	c163ae63b8	Allow gifting of Pending items; remove PoP verification rescheduling on Pending items	2018-04-27 10:28:59 -07:00
Zach Fox	0f36fb113d	Allow gifting of Pending items; remove PoP verification rescheduling on Pending items	2018-04-27 10:20:55 -07:00
Brad Hefta-Gaub	e4f5eb9cca	Merge pull request #13020 from zfox23/MS14295_GiftsUIFixes ... MS14295: Fix lingering Gifts UI Bugs	2018-04-27 07:30:14 -07:00
Zach Fox	e3b14bf478	MS14295: Fix lingering Gifts UI Bugs	2018-04-26 15:57:37 -07:00
Zach Fox	fc324f67bd	MS14559: Fix sometimes being unable to click on 'Nearby' orb when sending Gift/HFC	2018-04-26 15:09:53 -07:00
Triplelexx	bd6b6c9423	fix content within 128 columns	2018-04-25 12:57:46 +01:00
Triplelexx	bd72350287	describe magic number	2018-04-25 12:47:55 +01:00
Triplelexx	99ad51189c	fix browse asset filtering ... added support for list of filters using formatting consistent with other implementations, e.g: (*.png *.wav)	2018-04-24 23:03:56 +01:00
John Conklin II	236e75b6c6	Merge pull request #12903 from druiz17/add-more-hmd-data ... Get the correct device name connect to OpenVr	2018-04-24 13:29:41 -07:00
vladest	60115752ad	Fixed saving after editing	2018-04-21 20:18:24 +02:00
vladest	0e28e41107	Fix various issues with SpinBox-es and Sliders	2018-04-20 19:15:29 +02:00
vladest	b8577bd791	Merge branch 'master' into fix_spinbox	2018-04-20 18:09:16 +02:00
Gabriel Calero	adfbaac18f	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-04-19 19:40:00 -03:00
Gabriel Calero	f2184bf456	Handle android back button. Remove unused resources. Fix compilation errors.	2018-04-19 17:31:25 -03:00
Howard Stearns	6d151f022d	Merge pull request #12910 from zfox23/MS12217_letterboxMessageFix ... Only dismiss letterbox when clicking on grey areas	2018-04-19 11:47:10 -07:00
vladest	663af09605	Fix SpinBox. attempt 1	2018-04-19 20:43:48 +02:00
Gabriel Calero	c8fe45eb8f	Remove debug statements and unused code. Put JNI code in a separated file.	2018-04-19 11:41:59 -03:00