25354 commits

Author	SHA1	Message	Date
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
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
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
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	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
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
John Conklin II	3b413d0f72	Merge pull request #13272 from zfox23/MS14615_memoryUsageMinimized ... MS14615: Prevent memory overuse when minimized	2018-06-07 11:16:56 -07:00
David Back	ae5d056ca0	Merge pull request #13292 from dback2/fileChooser ... File Dialog Fixes	2018-06-07 09:38:56 -07:00
Sam Gateau	146732a20f	Merge pull request #13317 from jherico/feature/mac_resources ... Use binary resources on OSX	2018-06-07 09:38:00 -07:00
John Conklin II	2b6fdb6b69	Merge pull request #13217 from Atlante45/fix/ds-memory ... Fix uploaded content archives taking too much memory	2018-06-07 09:37:41 -07:00
Zach Fox	7f04506020	Merge pull request #13318 from zfox23/MS14925_doubleCallingDisplayChanged ... Fix MS14925: Don't double-emit signal for display plugin change	2018-06-07 09:32:50 -07:00
David Back	a246c9f0d1	fix fbx and textures	2018-06-06 15:47:29 -07:00
howard-stearns	8185d1b5f5	cleanup and consistently don't getNextPage at beginning	2018-06-06 15:24:54 -07:00
Bradley Austin Davis	fa51c15849	Use binary resources on OSX	2018-06-06 15:10:52 -07:00
Zach Fox	6869718025	Fix MS14925: Don't double-call signal for display plugin change	2018-06-06 14:41:33 -07:00
Seth Alves	b70ffa5bae	Merge pull request #13297 from ctrlaltdavid/21835 ... Remove some deprecated functions from the Controller API	2018-06-06 14:06:34 -07:00
Sam Gondelman	b4afabee68	Merge pull request #13294 from SamGondelman/overlays ... Add isGroupCulled property to ModelOverlays	2018-06-06 13:52:33 -07:00
David Back	c294dd4ac7	fix path and name	2018-06-06 12:32:47 -07:00
David Back	afd4b5a8ab	update default avatar to fix non-flat feet	2018-06-06 11:48:04 -07:00
Sam Gateau	a1899e80c0	Merge pull request #13290 from AndrewMeadows/update-queryAACube ... update server-side bounding box more correctly for grabbed things	2018-06-06 11:46:09 -07:00
Seth Alves	6c8e514367	Merge pull request #13224 from danteruiz/fix-key-conflicts ... Allow using the key 1,2,3 to swicth views and also to enter text in web entity or overlay	2018-06-06 11:08:04 -07:00
MiladNazeri	082c1fce52	Merge pull request #13251 from ctrlaltdavid/21880 ... JSDoc updates	2018-06-05 19:04:54 -07:00
howard-stearns	335aeaeb38	purchases cleanup, wearables, and edition numbers when multiples seen.	2018-06-05 17:06:08 -07:00
howard-stearns	6aa551b35c	Don't getNextPage when at beginning (even if that is also the end).	2018-06-05 17:04:29 -07:00
howard-stearns	ce41b83bad	Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll	2018-06-05 15:30:04 -07:00
howard-stearns	3d75a793cc	Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll	2018-06-05 13:35:54 -07:00
Zach Fox	2932ce177d	Fix MS15500: Ensure Connection usernames show up in PAL	2018-06-05 10:57:25 -07:00
SamGondelman	968758a022	CR	2018-06-05 09:35:17 -07:00
Ken Cooke	aa19794a94	Merge pull request #13243 from danteruiz/fix-copy-paste-cut-delete ... fix copy delete cut paste commands and menus	2018-06-05 09:17:34 -07:00
Ken Cooke	83dda420ba	Merge pull request #13256 from danteruiz/remove-dead-code ... remove dead code in Application::keyPressEvent	2018-06-05 09:16:28 -07:00
howard-stearns	f72f8c762b	goto client-side filtering (preliminary)	2018-06-04 16:52:20 -07:00
Zach Fox	c5ef5cfccb	Fix MS15582: In My Purchases, invisible buttons shouldn't be clickable	2018-06-04 16:13:18 -07:00
David Back	7b2a9770ba	Merge branch 'master' of https://github.com/highfidelity/hifi into fileChooser	2018-06-04 16:00:13 -07:00
David Rowe	a7a0cfeef2	Remove some deprecated functions from the Controller API	2018-06-05 10:56:19 +12:00
David Back	6b7d9586d1	apply fixes to other file dialogs and fix tablet dialog buttons	2018-06-04 15:56:10 -07:00
howard-stearns	25ee948662	Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll	2018-06-04 15:30:10 -07:00
Sam Gondelman	38e7b31c32	Merge pull request #13176 from SimonWalton-HiFi/low-connectivity ... Try reducing concurrent downloads	2018-06-04 14:48:46 -07:00
Zach Fox	60aff7a224	Whoops	2018-06-04 14:41:18 -07:00
David Rowe	b5028a9626	Merge branch 'master' into 21880 ... # Conflicts: # interface./src/scripting/WindowScriptingInterface.h	2018-06-05 09:13:54 +12:00
Zach Fox	7407507f0b	Fix MS15574: Tiny memory leak in Wallet.h	2018-06-04 14:13:25 -07:00
howard-stearns	5a1b56d573	checkpoint with goto feeds working (but without filtering)	2018-06-04 13:11:06 -07:00