27036 commits

Author	SHA1	Message	Date
Wayne Chen	c785efec84	removing extraneous bool	2018-10-04 10:56:04 -07:00
Wayne Chen	0a7102b4d3	Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged	2018-10-04 08:59:26 -07:00
Dante Ruiz	b46d2319b1	fix spelling error	2018-10-03 15:22:53 -07:00
Dante Ruiz	78268001c4	reverting logic change	2018-10-03 15:13:42 -07:00
John Conklin II	4805d3564a	Merge pull request #14075 from ctrlaltdavid/M18586 ... Teleport with play area	2018-10-03 11:02:33 -07:00
Dante Ruiz	b28c375ad3	better loading check logic	2018-10-03 09:57:32 -07:00
John Conklin II	05609384b7	Merge pull request #14111 from zfox23/newConnectionsQuery ... Fix MS18608: Use new connections api endpoint	2018-10-03 09:04:58 -07:00
John Conklin II	8bd8d05409	Merge pull request #14118 from luiscuenca/handTouchLMFix ... Disable Hand Touch when Leap Motion is running	2018-10-03 09:03:43 -07:00
Brad Hefta-Gaub	bb78a8dd5c	Merge pull request #14134 from jherico/fix/fb19088 ... Fix avatar thumbnails	2018-10-03 09:01:33 -07:00
Wayne Chen	2d85f882b8	adding buttons	2018-10-02 17:47:09 -07:00
Brad Davis	ffbb144a7c	Fix avatar thumbnails	2018-10-02 16:31:24 -07:00
Brad Hefta-Gaub	6b9842d4da	Merge pull request #14131 from Atlante45/feat/deadlock-backtrace ... Better deadlock crash	2018-10-02 16:03:20 -07:00
Sam Gondelman	cd947f0a66	Merge pull request #14054 from gcalero/android_signup ... Android signup	2018-10-02 12:37:57 -07:00
Clement	3c4e543b3c	Better deadlock crash	2018-10-02 11:51:15 -07:00
John Conklin II	898ba20f1c	Merge pull request #14068 from hyperlogic/bug-fix/bad-avatar-pointer-static-cast ... Fix for bad static_pointer_cast on exit.	2018-10-02 11:31:47 -07:00
Gabriel Calero	13e2b99dfa	Merge remote-tracking branch 'upstream/master' into android_signup	2018-10-02 09:24:09 -03:00
David Rowe	f7fd76b316	Merge branch 'master' into M18586 ... # Conflicts: # interface/src/scripting/HMDScriptingInterface.h	2018-10-02 16:49:16 +13:00
Brad Hefta-Gaub	7c9464572a	Merge pull request #14027 from huffman/feat/deprecate-undo-stack ... Remove UndoStack API	2018-10-01 17:13:48 -07:00
John Conklin II	9cbd819a39	Merge pull request #13965 from ctrlaltdavid/M17428-f ... Mini tablet in palm	2018-10-01 16:56:36 -07:00
John Conklin II	3ab83731b9	Merge pull request #14087 from sethalves/quiet-asan ... fix several uninitialized reads	2018-10-01 16:48:54 -07:00
John Conklin II	dd5cd5de82	Merge pull request #14091 from gcalero/fix-case-18465 ... Fix case 18465: redirect to domain after login	2018-10-01 16:48:27 -07:00
John Conklin II	878d2a6f25	Merge pull request #14102 from howard-stearns/account-managed-wallet-punchlist2 ... Account-managed wallet flow improvements	2018-10-01 16:43:01 -07:00
John Conklin II	8ad5ca5a67	Merge pull request #14105 from luiscuenca/bookmarkOnFloorFix ... Fix avatar warp into floor when navigating to a saved bookmark	2018-10-01 16:36:31 -07:00
Gabriel Calero	1422c178a4	Merge remote-tracking branch 'upstream/master' into android_signup	2018-10-01 20:36:27 -03:00
John Conklin II	87b39f690c	Merge pull request #14106 from jherico/fix/mac_gl1 ... Fix some Mac rendering issues	2018-10-01 16:35:57 -07:00
Seth Alves	c144671c97	Merge pull request #14110 from sethalves/fix-clang-7-build ... get interface building and working with clang-7 on ubuntu 18	2018-10-01 16:32:39 -07:00
Brad Hefta-Gaub	6290b56383	Merge pull request #14079 from luiscuenca/simpleAvatarTransit ... Simple avatar transit	2018-10-01 16:24:46 -07:00
Brad Hefta-Gaub	ef063a4072	Merge pull request #14026 from huffman/fix/edit-rotation ... Fix edit rotation handle fidgeting	2018-10-01 16:15:32 -07:00
Brad Hefta-Gaub	8b03a21799	Merge pull request #14025 from ElderOrb/FB18061 ... use current wearable index, not joint index!	2018-10-01 16:14:33 -07:00
Wayne Chen	8f36bc0850	Merge pull request #4 from danteruiz/interstitialMerged ... Interstitial screen updates	2018-10-01 15:43:04 -07:00
Dante Ruiz	66bb5f68d2	updating interstitialmode	2018-10-01 15:26:56 -07:00
David Rowe	6ccd73ea47	Merge branch 'master' into M18586	2018-10-02 10:17:24 +13:00
Dante Ruiz	652ec2210d	fixing loading issues	2018-10-01 13:58:14 -07:00
luiscuenca	5ccbc5c029	Disable Hand Touch when Leap Motion is running	2018-10-01 10:47:06 -07:00
Wayne Chen	189e7e15fe	Merge branch 'master' into fixMainTextContainerQML	2018-10-01 09:48:42 -07:00
Wayne Chen	eab57633a5	Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged	2018-10-01 09:21:26 -07:00
David Rowe	9dfbaa9201	Remove "Reset Sensors" button from Settings > Controls	2018-09-29 14:17:55 +12:00
Anthony Thibault	58df72af60	Merge branch 'master' into bug-fix/bad-avatar-pointer-static-cast	2018-09-28 16:32:12 -07:00
Zach Fox	59eabbbb5d	Fix MS18608: Use new connections api endpoint	2018-09-28 14:28:50 -07:00
Seth Alves	b69d0f3997	get interface building and working with clang-7 on ubuntu 18	2018-09-28 13:46:51 -07:00
Howard Stearns	2d29906e3c	Merge branch 'master' of github.com:highfidelity/hifi into account-managed-wallet-punchlist2	2018-09-28 11:22:57 -07:00
Gabriel Calero	b7c421ba47	Fixes according to review	2018-09-28 14:39:15 -03:00
David Rowe	1c4bde3e84	Fix build warnings	2018-09-28 18:38:38 +12:00
Kerry Ivan Kurian	440e2062f5	Fix application uninstall in marketplace item tester	2018-09-27 22:14:02 -07:00
David Rowe	545c2591e3	Merge branch 'master' into M18586	2018-09-28 16:19:44 +12:00
David Rowe	f2c13f193c	Don't jump in HMD mode unless option is set	2018-09-28 16:05:20 +12:00
David Rowe	868a3a9219	Tweak vertical spacing	2018-09-28 15:42:48 +12:00
David Rowe	45993ba475	Provide mini tablet details via API instead of messages	2018-09-28 14:23:08 +12:00
Bradley Austin Davis	3dea4fd10a	Fix some Mac rendering issues	2018-09-27 19:21:50 -07:00
David Rowe	4813f4d042	Show/hide jumping & flying checkbox depending on movement mode	2018-09-28 13:02:27 +12:00