23921 commits

Author	SHA1	Message	Date
John Conklin II	e586a35d38	Merge pull request #12489 from vladest/fix_table_sort_indicator ... Make sure sort indicator is attached to the right of title	2018-02-26 10:33:27 -08:00
John Conklin II	3201d2ba21	Merge pull request #12407 from NissimHadar/shadowControlsOffZvork ... Shadow control for zones, models and shapes	2018-02-26 10:13:40 -08:00
NissimHadar	c0f20900a0	Merge pull request #12458 from NissimHadar/snapshotDefaultNameFix ... Corrected edge case of creating a snapshot with "" as the filename.	2018-02-26 09:39:16 -08:00
Zach Fox	b5c42bfeca	Merge pull request #12480 from zfox23/commerce_extendedCerts_apps ... Commerce: Extended Certificates - Apps!	2018-02-26 08:24:53 -08:00
vladest	62f2ba0dad	More intellectual calculation of title positions taking in account actual sort indicator glyph size	2018-02-24 09:32:08 +01: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
Sam Gondelman	e10af9b83d	Merge pull request #12462 from SamGondelman/entityDelete ... Fix EntityItems not getting destroyed	2018-02-23 16:17:52 -08:00
Dante Ruiz	d0ec84b6c8	remove menu option for booking marking avatar entities	2018-02-23 10:45:59 -08:00
Zach Fox	5ee28297f3	Don't use eventLoop, since that will block the UI	2018-02-23 10:19:00 -08:00
vladest	b8102cfbd7	Make sure sort indicator is attached to the right of title	2018-02-23 10:06:16 +01:00
ZappoMan	9f68accb30	add menu for testing unresponsive interface	2018-02-22 17:34:00 -08:00
Zach Fox	249f0568a1	New loader	2018-02-22 17:14:23 -08:00
Zach Fox	e3ccfc9935	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_apps	2018-02-22 16:39:26 -08:00
Zach Fox	f14673bc50	Fixup Checkout for apps	2018-02-22 16:38:38 -08:00
Zach Fox	33f73fef0d	YAY!	2018-02-22 16:26:35 -08:00
Zach Fox	10fa3fa346	It's working!	2018-02-22 16:09:01 -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
Zach Fox	de0eee52d6	cool	2018-02-22 14:45:32 -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	4d2d7fa51f	lots of fun initial progress!	2018-02-22 13:56:46 -08:00
NissimHadar	c6580f642a	Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork	2018-02-22 13:45:00 -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
Nissim Hadar	a843a53427	Improved JSDoc comments.	2018-02-22 10:17:20 -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
Nissim Hadar	049beba157	Corrected edge case of creating a snapshot with "" as the filename.	2018-02-21 14:15:41 -08:00
Nissim Hadar	b519ebd6f1	Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork	2018-02-21 12:36:56 -08:00
Nissim Hadar	bf4ba07b72	Added parameters to canCastShadow - still sucks.	2018-02-21 12:36:34 -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
Nissim Hadar	af484d0af6	Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork	2018-02-20 23:48:12 -08:00
Nissim Hadar	6f84e4c977	Moved shadows and ambient occlusion to menu checkboxes.	2018-02-20 23:45:07 -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