22226 commits

Author	SHA1	Message	Date
Wayne Chen	ccebf3edef	omitting keyboard focus hack	2018-10-08 17:18:40 -07:00
divya	91df342ae9	Merge pull request #14094 from wayne-chen/interstitialMerged ... Merged interstitial page/redirect domain improvements	2018-10-08 10:32:29 -07:00
Wayne Chen	f758438dcc	Merge pull request #9 from danteruiz/interstitialMerged ... fix for failing to enter domain	2018-10-05 16:19:25 -07:00
Dante Ruiz	36c2cceb57	fix for failing to enter domain	2018-10-05 15:39:51 -07:00
Andrew Meadows	c3478dc018	remove expired avatarEntities from their avatars	2018-10-05 13:48:35 -07:00
Wayne Chen	8abbd51bb1	removing unused variable	2018-10-04 23:11:27 -07:00
danteruiz	d285080197	remmoving some debug statements	2018-10-04 18:38:25 -07:00
Dante Ruiz	5d011bafb2	small tweaks	2018-10-04 17:02:44 -07:00
Dante Ruiz	2a3b4a85c7	debugging	2018-10-04 15:57:05 -07:00
Dante Ruiz	651f37aceb	Merge branch 'interstitialMerged' of github.com:wayne-chen/hifi into interstitialMerged	2018-10-04 15:01:39 -07:00
Dante Ruiz	bda9735b5d	fix loading progress	2018-10-04 15:01:16 -07:00
divya	7aa715c383	Merge pull request #14141 from luiscuenca/transitFirstPacketFix ... Fix avatars transit on domain enter	2018-10-04 13:08:59 -07:00
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
luiscuenca	a05e493e06	Long distance avatars should not be new	2018-10-03 17:09:51 -07:00
luiscuenca	bb98457d09	Fix avatars transit on domain enter	2018-10-03 16:23:09 -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
sabrina-shanman	2ef85dfdba	Merge branch 'master' into stt_parenting2	2018-10-03 11:39:00 -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	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	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
sabrina-shanman	67dc526ee2	Merge branch 'master' of github.com:highfidelity/hifi into stt_parenting2	2018-10-01 17:17:32 -07: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	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
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
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
Dante Ruiz	652ec2210d	fixing loading issues	2018-10-01 13:58:14 -07:00
sabrina-shanman	b988382918	Remove smaller RayPick constructor	2018-10-01 11:07:02 -07:00
luiscuenca	5ccbc5c029	Disable Hand Touch when Leap Motion is running	2018-10-01 10:47:06 -07:00
sabrina-shanman	7a89f959d1	Fix not mentioning pick parenting in all pick parenting jsdocs for ... parentID	2018-10-01 09:34:21 -07:00
Wayne Chen	eab57633a5	Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged	2018-10-01 09:21:26 -07:00
sabrina-shanman	0cf7e954cc	Simplify a RayPick and StylusTip constructor	2018-10-01 09:20:59 -07:00
sabrina-shanman	f0de3ef31c	jsdocs: Do not list scaleWithAvatar as separate property, and document 0 as default for parentJointIndex	2018-10-01 09:18:52 -07:00
sabrina-shanman	728f8aeecd	Scale Parabola Pick acceleration before rotating it	2018-10-01 09:02:46 -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