6658 commits

Author	SHA1	Message	Date
David Rowe	8464a70c9e	Fix initial tablet scale	2018-09-29 12:42:41 +12:00
David Rowe	7b7447739a	Remove unused code noticed in passing	2018-09-28 14:23:20 +12:00
David Rowe	45993ba475	Provide mini tablet details via API instead of messages	2018-09-28 14:23:08 +12:00
David Rowe	d98e7cea4e	Fix not being able to grab tablet with other hand	2018-09-28 11:09:16 +12:00
David Rowe	1088a0f9ae	Fix invalid state transition in desktop mode	2018-09-28 10:19:17 +12:00
David Rowe	fc78d0582e	Tidying	2018-09-28 10:18:00 +12:00
David Rowe	2456fd0e99	Merge branch 'master' into M17428-f	2018-09-28 08:41:57 +12:00
Zach Fox	6a3fa28fad	Merge branch 'master' of github.com:highfidelity/hifi into notificationsForFourApps	2018-09-26 15:12:04 -07:00
Zach Fox	9a21354c27	Merge branch 'notificationsForFourApps' of github.com:zfox23/hifi into notificationsForFourApps	2018-09-26 15:08:20 -07:00
Zach Fox	6877af04f1	Fix GOTO notifs; fix WALLET notifs (pending backend change)	2018-09-26 14:57:32 -07:00
John Conklin II	7df90881cd	Merge pull request #14007 from kkurian/marketplace-item-tester ... Marketplace item tester interface	2018-09-26 11:25:53 -07:00
John Conklin II	d1771b2928	Merge pull request #14058 from danteruiz/fix-dispacther-module-order ... fix equip while keeping new functionality	2018-09-26 11:06:45 -07:00
Kerry Ivan Kurian	28ec98be9e	Uninstall marketplace item tester on wallet shutdown	2018-09-25 19:24:46 -07:00
Kerry Ivan Kurian	e6249e690e	Remove duplicate line	2018-09-25 15:52:26 -07:00
Kerry Ivan Kurian	ff83713365	Use persistent object id counter	2018-09-25 00:58:01 -07:00
Kerry Ivan Kurian	ca1da9c830	Implement delete-from-list functionality in marketplace item tester	2018-09-25 00:57:59 -07:00
Kerry Ivan Kurian	505e08b841	Resolve merge conflicts	2018-09-25 00:57:43 -07:00
Zach Fox	1ac2800e18	Fix wallet dot logic	2018-09-24 17:50:37 -07:00
Zach Fox	be304ea975	Small bugfixes again	2018-09-24 17:33:23 -07:00
Kerry Ivan Kurian	697f556a60	Persist list of marketplace items in test ... The list of resources between runs of the marketplace item tester now persist between runs of the tester.	2018-09-24 16:30:49 -07:00
Zach Fox	a76c3f028d	Small bugfixes	2018-09-24 14:46:00 -07:00
John Conklin II	55848e6959	Merge pull request #14008 from sethalves/fix-local-angular-velocity ... fix bug that caused localAngularVelocity to get zeroed out	2018-09-24 14:32:57 -07:00
John Conklin II	1f6f51993d	Merge pull request #14029 from huffman/fix/keyboard-logging-in-edit ... Remove verbose logging of keyboard messages in edit.js and gridTool.js	2018-09-24 12:54:43 -07:00
John Conklin II	9916496118	Merge pull request #14041 from huffman/fix/entity-list-no-highlight-74 ... Fix entity list selection failing when selecting entities not in list	2018-09-24 11:02:36 -07:00
Zach Fox	57c303440b	Merge branch 'master' of github.com:highfidelity/hifi into notificationsForFourApps	2018-09-24 09:32:53 -07:00
Dante Ruiz	d4450ac780	fix equip and keeping new functionallity	2018-09-21 15:59:00 -07:00
John Conklin II	ea7bc26ad8	Merge pull request #14038 from wayne-chen/fixInterstitialButton ... Fix Interstitial GoTo button stretch	2018-09-21 11:44:48 -07:00
Zach Fox	6284074ff9	Don't show banner when app is open but continue updating data	2018-09-21 10:47:59 -07:00
David Rowe	b1bbcb9e5e	Tidying	2018-09-21 13:48:28 +12:00
David Rowe	9426f72652	Make mini tablet disappear when using grip the same as the trigger	2018-09-21 13:45:10 +12:00
David Rowe	eac1666e01	Disable grabbing the mini tablet with the grip button	2018-09-21 12:44:55 +12:00
David Rowe	0ae7fdc7b1	Remove ability to grab the mini tablet with the other hand	2018-09-21 12:02:46 +12:00
David Rowe	5719b7020d	Merge branch 'master' into M17428-f	2018-09-21 10:47:56 +12:00
Zach Fox	33c04631ea	Comments on Confluence doc	2018-09-20 14:37:46 -07:00
Kerry Ivan Kurian	ae4352f450	Rez entity in marketplace item tester	2018-09-20 13:55:22 -07:00
Ryan Huffman	1ee655c8f8	Fix sorting of entity list not working as expected	2018-09-20 13:51:00 -07:00
Ryan Huffman	72adfb7ff0	Fix entity list selection failing when selecting entities not in list	2018-09-20 13:46:22 -07:00
Zach Fox	87e91a4401	GOTO doesn't care about SINCE; reduce data for PEOPLE	2018-09-20 13:36:50 -07:00
Wayne Chen	8bd698b143	leaving button in natural dims	2018-09-20 11:13:27 -07:00
Zach Fox	ed84b49ece	Small bugfixes and using original endpoints	2018-09-19 16:15:59 -07:00
Ryan Huffman	8805ce49e3	Remove verbose logging of keyboard messages in edit.js and gridTool.js	2018-09-19 15:06:58 -07:00
Zach Fox	144771b77b	Request JSON from server	2018-09-19 11:35:17 -07:00
Zach Fox	f70ecdad16	Small bugfix	2018-09-18 17:00:53 -07:00
Zach Fox	9db11aeda7	Bugfixes and new algo for PAL notifs	2018-09-18 16:35:53 -07:00
Zach Fox	4987164706	Notifications for GOTO (using a cool algorithm)	2018-09-18 15:30:43 -07:00
Zach Fox	55a0f77697	Notifications for MARKET	2018-09-18 14:45:14 -07:00
Zach Fox	04b44d0594	Fix small since bug	2018-09-18 12:38:33 -07:00
Zach Fox	a97f9eb79a	Logic for Wallet notifications; some bugfixes	2018-09-18 12:28:03 -07:00
Zach Fox	d487914656	Prevent text notification from appearing when not necessary	2018-09-18 11:28:59 -07:00
Kerry Ivan Kurian	f2a046da91	Install marketplace item tester	2018-09-18 00:08:09 -07:00