4978 commits

Author	SHA1	Message	Date
David Rowe	87ff6dd56d	Fix play area sizing and positioning for different base avatar sizes	2018-10-02 10:53:31 +13:00
David Rowe	6ccd73ea47	Merge branch 'master' into M18586	2018-10-02 10:17:24 +13:00
David Rowe	7560a2a923	Short circuit unnecessary repetition	2018-09-29 16:00:44 +12:00
John Conklin II	130e8dfbe9	Merge pull request #14023 from dback2/selectEntityEveryFrameFix ... Only call selectEntity once triggered when using edit handles	2018-09-28 16:38:10 -07:00
David Rowe	545c2591e3	Merge branch 'master' into M18586	2018-09-28 16:19:44 +12:00
David Rowe	7f518d0aa1	Make teleport parabolas semi-transparent	2018-09-28 16:13:25 +12:00
Howard Stearns	f96c7f4db4	minimal time handshake	2018-09-27 17:05:18 -07:00
David Rowe	3284b2a90e	Immediately hide fading overlays if other hand starts teleporting	2018-09-27 15:20:43 +12:00
David Rowe	6ae206677d	Add Settings > Controls option for displaying play area	2018-09-27 14:55:53 +12:00
David Rowe	b9c6811fdc	Restructure post-teleport fading code	2018-09-27 14:44:30 +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
David Rowe	496e0a6304	Update teleport FBX models	2018-09-26 17:20:56 +12: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
David Rowe	a00cacc03e	Fix post-teleport display; hide immediately avatar moves	2018-09-25 16:02:19 +12: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
David Rowe	03f0b95a3f	Fix unwanted hexagonal occlusion artefact	2018-09-25 12:03:41 +12:00
David Rowe	7396bf0dbe	Immediately hide post-teleport play area if start teleporting again	2018-09-25 11:39:41 +12:00
David Rowe	06b4f51a08	Misc fixes	2018-09-25 11:33:08 +12: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
David Rowe	90ef109476	Remove superseded Pointers API functions	2018-09-25 11:11:53 +12:00
David Rowe	4927ffece3	Misc fixes	2018-09-25 10:33:49 +12:00
David Rowe	991ceb643c	Fix teleport not working after script reload in HMD mode	2018-09-25 10:18:52 +12:00
David Rowe	858abaf6fc	Fix sensor overlays not displaying after re-enter HMD mode	2018-09-25 09:49:11 +12: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
David Rowe	5ff2c36917	Get play area displaying and working again	2018-09-24 15:53:47 +12:00
David Rowe	e29b403abc	Merge branch 'master' into M18586 ... # Conflicts: # interface/src/raypick/PointerScriptingInterface.cpp # interface/src/raypick/PointerScriptingInterface.h # interface/src/raypick/StylusPointer.h # libraries/pointers/src/Pointer.h # scripts/system/controllers/controllerModules/teleport.js	2018-09-24 11:44:28 +12: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
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