25419 commits

Author	SHA1	Message	Date
Dante Ruiz	f1d11f9566	Merge branch 'master' of github.com:highfidelity/hifi into tablet-imporvments	2018-06-12 10:21:12 -07:00
Sam Gateau	f769b63c3d	Merge pull request #13308 from jherico/fix/13677 ... Fix for black text rendering white in web elements	2018-06-11 16:17:31 -07:00
Sam Gondelman	e8ec32c7f8	Merge pull request #13340 from SamGondelman/modelTextures ... Try to fix ModelOverlay texture loading	2018-06-11 16:09:10 -07:00
Dante Ruiz	6685fbbfc4	Merge branch 'master' of github.com:highfidelity/hifi into tablet-imporvments	2018-06-11 13:56:54 -07:00
Zach Fox	7fbc7bf1a5	Merge pull request #13347 from zfox23/MS15721_deleteApp ... Fix MS15721: Delete app.json if installed script isn't running	2018-06-11 13:28:05 -07:00
Zach Fox	15129e37db	Merge pull request #13341 from zfox23/MS13761_hideOverlayFix ... Fix MS13761: Change the move conditions under which overlays hide	2018-06-11 11:44:26 -07:00
Zach Fox	56bd7e3d37	Remove dead function declaration from header	2018-06-11 10:58:01 -07:00
Stephen Birarda	10e34000aa	Merge pull request #13278 from SimonWalton-HiFi/tablet-popup-remains ... Domain-unreachable message remaining on slow connects	2018-06-11 10:46:55 -07:00
Zach Fox	c26b03f480	Cleanup	2018-06-11 10:40:13 -07:00
Zach Fox	c7c06590ac	Merge branch 'master' of github.com:highfidelity/hifi into MS13761_hideOverlayFix	2018-06-11 10:16:35 -07:00
Howard Stearns	5ce122f148	Merge pull request #13307 from howard-stearns/infinite-scroll ... Infinite scroll	2018-06-11 10:03:52 -07:00
Sam Gondelman	be28097279	Merge pull request #13339 from SamGondelman/avatarHash ... Possibly fix avatarHash crash	2018-06-11 09:39:40 -07:00
Sam Gondelman	535dc92213	Merge pull request #13334 from SamGondelman/tablet ... Fix tablet not disappearing	2018-06-11 09:34:57 -07:00
Dante Ruiz	ba86c9753d	Merge branch 'master' of github.com:highfidelity/hifi into tablet-imporvments	2018-06-11 09:13:14 -07:00
howard-stearns	020d622302	don't depend on matching handlers with overlapping requests	2018-06-09 17:34:49 -07:00
howard-stearns	421edbfa1e	PSFListModel isa ListModel instead of hasa	2018-06-09 16:03:45 -07:00
howard-stearns	d2cf042a88	Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll	2018-06-09 14:09:42 -07:00
Anthony Thibault	044d142635	Merge pull request #13133 from amantley/nativeCGCode ... Center of Gravity Leaning	2018-06-08 17:53:55 -07:00
howard-stearns	d68415c47c	code feedback	2018-06-08 16:47:06 -07:00
howard-stearns	f0d486a6a5	remove the unused client-side stuff from model	2018-06-08 15:48:39 -07:00
howard-stearns	d9daa3495a	remove comments / dead code	2018-06-08 15:36:10 -07:00
howard-stearns	ce322a4794	Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll	2018-06-08 15:33:07 -07:00
John Conklin II	bc3edbc7fc	Merge pull request #13333 from zfox23/MS15681_securityImageProviderCrash ... Fix MS15673: Ensure offscreenUI exists before updating SecurityImageProvider	2018-06-08 15:14:32 -07:00
howard-stearns	210cb23de6	Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll	2018-06-08 14:54:15 -07:00
Stephen Birarda	112abc9d7e	Merge pull request #13148 from birarda/feat/new-version-numbers ... add SHA to PR/master version, add build_type (stable/master/pr/dev)	2018-06-08 14:44:22 -07:00
howard-stearns	36a0adf553	strip snapshot stacking code - we'll do it on server or not at all	2018-06-08 14:24:24 -07:00
Zach Fox	95faad23e2	Merge pull request #13329 from zfox23/MS15664_15663_fixWalletAuthStep ... Fix MS15663/15664: Don't set Wallet Status to 'ready' too early	2018-06-08 14:20:21 -07:00
Zach Fox	812c28ef48	Fix MS13761: Change the move conditions under which overlays hide	2018-06-08 14:15:42 -07:00
SamGondelman	310e2ee063	attempt to fix first time model overlay loading	2018-06-08 13:56:21 -07:00
Dante Ruiz	5843c24309	adding perfectly straight model and adjusting ovelray	2018-06-08 13:56:00 -07:00
howard-stearns	3ade31bdf6	always show edition	2018-06-08 12:57:40 -07:00
howard-stearns	dd0f3c64ec	Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll	2018-06-08 12:12:21 -07:00
Zach Fox	9f0864944c	Fix Friending in Connections tab - READ FIXME	2018-06-08 11:37:02 -07:00
SamGondelman	a7d75b121f	fix avatarHash crash	2018-06-08 11:20:41 -07:00
Zach Fox	d4a19e7bc9	Fix MS15721: Delete app.json if installed script isn't running	2018-06-08 10:52:14 -07:00
David Back	e8aece4c11	Merge pull request #13315 from dback2/avatarFeet ... Fix default avatar feet	2018-06-08 10:00:43 -07:00
howard-stearns	21ed081eae	proper name for updated type filter of inventory endpoint	2018-06-08 09:52:11 -07:00
howard-stearns	64e466ee7d	snapshot stacks	2018-06-07 21:10:40 -07:00
howard-stearns	595a0d8733	restore lost code	2018-06-07 19:24:05 -07:00
howard-stearns	348d5fc359	inventory text filter	2018-06-07 17:01:48 -07:00
SamGondelman	c7007c089f	fix tablet not disappearing	2018-06-07 16:35:22 -07:00
howard-stearns	2761688d39	Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll	2018-06-07 16:14:57 -07:00
howard-stearns	8b08505116	using filter/sort endpoint parameters	2018-06-07 16:14:18 -07:00
Zach Fox	c1b971a269	Fix MS15673: Ensure offscreenUI exists before updating SecurityImageProvider	2018-06-07 16:10:44 -07:00
Zach Fox	f9b6e3e2ac	Merge pull request #13300 from zfox23/MS15582_PurchasesButtonClicks ... Fix MS15582: In My Purchases, invisible buttons shouldn't be clickable	2018-06-07 15:10:00 -07:00
druiz17	8c83bd29a3	making requested changes	2018-06-07 14:04:39 -07:00
Zach Fox	7d8e02e714	Fix MS15663/15664: Don't set Wallet Status to 'ready' too early	2018-06-07 14:01:52 -07:00
Zach Fox	d33875e142	Merge pull request #13295 from zfox23/MS15574_WalletMemoryLeak ... Fix MS15574: Tiny memory leak in Wallet.h	2018-06-07 12:42:24 -07:00
howard-stearns	890c97e7cb	Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll	2018-06-07 12:24:27 -07:00
John Conklin II	1646f543cd	Merge pull request #13273 from danteruiz/fix-show-overlays-menu ... fixing show overlays menu item on start up	2018-06-07 11:34:30 -07:00