23913 commits

Author	SHA1	Message	Date
howard-stearns	3d0e3a3901	Merge branch 'master' of https://github.com/highfidelity/hifi into end-seeding	2018-02-24 13:34:00 -08:00
Seth Alves	9e156deaab	Merge pull request #12494 from druiz17/one-menu ... Remove the avatarEntitiesBookmark menu option	2018-02-23 19:02:25 -08:00
Brad Hefta-Gaub	3d54f4d246	Merge pull request #12484 from ZappoMan/relaxDeadlockWatchdog ... Relax deadlock watchdog	2018-02-23 17:09:30 -08:00
howard-stearns	726c1ed816	receiveAt with new key	2018-02-23 17:05:46 -08:00
howard-stearns	8f44a52140	Merge branch 'end-seeding' of github.com:howard-stearns/hifi into end-seeding	2018-02-23 16:37:00 -08:00
Zach Fox	fe515e949b	New UI for new HFC users	2018-02-23 16:36:20 -08:00
howard-stearns	29a2fa6ca5	Merge branch 'master' of github.com:highfidelity/hifi into end-seeding	2018-02-23 16:19:54 -08:00
Sam Gondelman	e10af9b83d	Merge pull request #12462 from SamGondelman/entityDelete ... Fix EntityItems not getting destroyed	2018-02-23 16:17:52 -08:00
Zach Fox	cc98eb6424	Fix lightbox stuck	2018-02-23 16:14:42 -08:00
howard-stearns	f66e688f41	Merge branch 'master' of github.com:highfidelity/hifi into end-seeding	2018-02-23 16:12:41 -08:00
howard-stearns	53614a1d9f	almost working	2018-02-23 16:12:01 -08:00
Zach Fox	47b25740de	Update commerceLightBox	2018-02-23 15:23:51 -08:00
howard-stearns	34253082d4	always reset when asked	2018-02-23 15:11:08 -08:00
Zach Fox	432e647f7a	Fix 'What's This' link	2018-02-23 15:08:33 -08:00
howard-stearns	3c2626894c	fixes	2018-02-23 14:54:03 -08:00
howard-stearns	050df2ac2a	merge	2018-02-23 14:46:13 -08:00
Zach Fox	9b54ab1080	UI changes, V1	2018-02-23 14:42:05 -08:00
howard-stearns	09091d29f7	more logic framework	2018-02-23 14:35:30 -08:00
howard-stearns	84f9bff330	basic element, but not pretty and not functioning	2018-02-23 13:56:56 -08:00
Dante Ruiz	d0ec84b6c8	remove menu option for booking marking avatar entities	2018-02-23 10:45:59 -08:00
ZappoMan	9f68accb30	add menu for testing unresponsive interface	2018-02-22 17:34:00 -08:00
howard-stearns	1aaae94cc1	checkpoint	2018-02-22 17:04:27 -08:00
John Conklin II	730dce31e3	Merge pull request #12444 from zfox23/commerce_extendedCerts_1 ... Commerce: Extended Certificate Support, V1	2018-02-22 15:19:57 -08:00
ZappoMan	e9cad947d7	add the deadlock watchdog stats to the stats metaverse checkin data	2018-02-22 14:01:56 -08:00
Zach Fox	3d4e6de6ab	Quick bugfix	2018-02-22 10:49:11 -08:00
ZappoMan	af4f51ecfb	Merge branch 'master' of https://github.com/highfidelity/hifi into relaxDeadlockWatchdog	2018-02-22 10:23:36 -08:00
Liv	478ec48b63	Merge pull request #12463 from misslivirose/fix/edit-bugs ... Fix two bugs with Create Menu	2018-02-22 09:43:50 -08:00
Zach Fox	90f05f4db7	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1	2018-02-22 09:23:49 -08:00
ZappoMan	aa5542c54b	Merge branch 'master' of https://github.com/highfidelity/hifi into relaxDeadlockWatchdog	2018-02-22 08:43:13 -08:00
Seth Alves	db195c6184	Merge pull request #12334 from ctrlaltdavid/remove-deprecated-items ... Remove some deprecated JavaScript API items	2018-02-21 16:31:16 -08:00
Liv Erickson	aba1cae36d	get rid of magic number	2018-02-21 16:19:50 -08:00
SamGondelman	4b1217f1f6	move all entity items to main thread	2018-02-21 15:54:07 -08:00
Liv Erickson	990e848de6	fix typo that was breaking popup dialog	2018-02-21 15:54:00 -08:00
Liv Erickson	68f0c0391a	Initial fix - need a little style fixing	2018-02-21 15:44:23 -08:00
Zach Fox	74655bde49	Fix skeletonmodelURLchanged signal	2018-02-21 12:12:20 -08:00
Zach Fox	b548567f5a	Apps protection	2018-02-21 11:17:47 -08:00
Zach Fox	1fbc16aae2	Fix noPermissionGlyph margin	2018-02-21 10:52:17 -08:00
SamGondelman	4dde178b93	fix new material UI	2018-02-21 10:33:15 -08:00
ZappoMan	47a98d9d0f	relax the deadlock time to 2 minutes	2018-02-21 10:12:04 -08:00
Seth Alves	220d9abbfc	Merge pull request #12435 from vladest/fix_flickable_tablethome ... Make sure Flickable for GridView for TabletHome will not flick	2018-02-21 09:21:45 -08:00
Zach Fox	f08c66e3ac	Remove debug code	2018-02-20 14:16:55 -08:00
Zach Fox	fd6f4b569f	Fix active focus issue	2018-02-20 13:19:31 -08:00
Zach Fox	eb29bdf5d2	Don't allow tabs or newlines	2018-02-20 13:06:10 -08:00
Zach Fox	2daa30f125	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1	2018-02-20 12:41:12 -08:00
Zach Fox	9bde9f5a4f	Fix height of Optional Message in Send Money	2018-02-20 12:36:11 -08:00
Zach Fox	11f897beb0	Initial app support	2018-02-20 10:39:36 -08:00
John Conklin II	aa67a98d02	Merge pull request #12426 from ElderOrb/FB11508 ... fix for toolbar slowly drifting on switching between HMD/Desktop modes	2018-02-20 09:30:01 -08:00
Sam Gateau	fd49c0d100	Merge pull request #12401 from SamGondelman/decals ... Material Entities	2018-02-19 10:58:02 -08:00
Brad Hefta-Gaub	0ef2794c35	Merge pull request #12395 from druiz17/fix-qml-tablet-apps ... Prevent adding the same tablet url to the tabletApps list	2018-02-18 19:10:24 -08:00
Cain Kilgore	47ed45b5e9	Fixed extra " in backup_instructions.html	2018-02-17 18:14:44 +00:00