26327 commits

Author	SHA1	Message	Date
Seth Alves	83718ca06d	Merge pull request #13746 from alexiamandeville/emoteIcon ... updating emote app icon	2018-08-15 08:29:48 -07:00
Kerry Ivan Kurian	6a34bde49c	Merge pull request #13825 from roxanneskelly/autoScroll ... Auto scroll	2018-08-14 20:56:53 -07:00
John Conklin II	032e67fd8e	Merge pull request #13748 from ElderOrb/FB16831 ... FB16831 qml-related warnings in log	2018-08-14 16:40:07 -07:00
Roxanne Skelly	50b0a458ce	Changes as requested by zfox23 - Start and stop timers on hover only if scroll is enabled.	2018-08-14 16:32:56 -07:00
Seth Alves	3623590e90	Merge pull request #13784 from sethalves/far-point-joints ... Far point joints	2018-08-14 15:40:07 -07:00
Roxanne Skelly	5a8da4ce97	Fix 'hover-to-pause' functionality of AutoScroll Featured Stories list in the goto app	2018-08-14 15:28:22 -07:00
Roxanne Skelly	987d8569ae	Merge branch 'autoScrollGoTo' of https://github.com/zfox23/hifi into autoScroll	2018-08-14 15:27:22 -07:00
John Conklin II	a5bace4e4d	Merge pull request #13706 from ElderOrb/FB17062 ... use updated 'Last Legends: Male' from Mukul	2018-08-14 14:18:39 -07:00
Ryan Huffman	19f27ec911	Merge pull request #13810 from ctrlaltdavid/M11360 ... Don't auto-action entry in HMD file dialog when single-click	2018-08-14 12:57:28 -07:00
Seth Alves	dce7b6eae6	Merge pull request #13714 from sabrina-shanman/safe-teleport-target ... Create CollisionPick API	2018-08-14 09:56:51 -07:00
Seth Alves	e5e9339a7b	Merge pull request #13819 from ElderOrb/FB16914 ... Avatar bookmarks missing from Avatar Favorites	2018-08-14 09:46:37 -07:00
Seth Alves	527b27da96	pseudo-joints for far-grab positions	2018-08-14 08:55:20 -07:00
Seth Alves	832eefd3a2	Merge pull request #13752 from ctrlaltdavid/M17208 ... Improve text in Avatar app's pop-ups	2018-08-14 08:48:04 -07:00
sabrina-shanman	e5cb078133	Merge branch 'master' of github.com:highfidelity/hifi into safe-teleport-target	2018-08-13 14:51:37 -07:00
Seth Alves	0a5c96ecc1	Merge pull request #13792 from luiscuenca/attachmentsAPImgr ... Attachments API returns avatar entities	2018-08-13 14:21:13 -07:00
Alexander Ivash	f910757ec4	FB16914 - Avatar bookmarks missing from Avatar Favorites	2018-08-13 22:57:07 +03:00
Zach Fox	57d2f04f14	Merge pull request #13799 from davidkelly/dk/17340 ... Only update gain if it really changed	2018-08-10 16:20:24 -07:00
luiscuenca	dd93055d89	Convert and load attachments when rig is ready	2018-08-10 16:15:30 -07:00
Sam Gateau	d5c5bd714f	Merge pull request #13785 from AndrewMeadows/no-update-fading-avatars ... don't call Avatar::simulate() on fading avatars	2018-08-10 15:44:07 -07:00
Zach Fox	096be16bb1	Only restart timer if feedMouseArea doesn't contain mouse	2018-08-10 15:32:44 -07:00
Zach Fox	1a6a55680c	PropagateComposedEvents	2018-08-10 15:30:32 -07:00
John Conklin II	644ff1eafa	Merge pull request #13655 from amantley/animationBlendChanges ... New Default Strafe Animations Plus Animation Tuning Support	2018-08-10 15:03:30 -07:00
David Rowe	3a356de49f	Don't auto-action entry in HMD file dialog when single-click on it	2018-08-11 09:46:11 +12:00
John Conklin II	61f0e9323a	Merge pull request #13800 from samcake/zvork-shadow ... Fixing PR13731 shader error on Mac	2018-08-10 14:10:47 -07:00
sabrina-shanman	e5e1a72598	Use 'orientation' for Collision Pick API, not 'rotation'	2018-08-10 10:52:21 -07:00
Wayne Chen	6b73a0bba5	Merge pull request #13801 from wayne-chen/fixMyAvatarScale-case-17434 ... MS17434: modifying MyAvatar.scale get property	2018-08-10 10:45:53 -07:00
Zach Fox	f514fde6fd	Merge pull request #13789 from zfox23/MS17469_listModelFix ... v0.72.0: Fix MS17469: Fix conditionals for needing more paginated results when ListView changes	2018-08-10 10:24:01 -07:00
David Kelly	2b5ecd6b5f	remove extraneous log	2018-08-10 10:12:32 -07:00
Zach Fox	e39dd250cd	Things will 'just work' once backend is in place	2018-08-10 10:01:09 -07:00
amantley	74186b0162	changed back speed to 2.2 m/s and the end frame for strafe left and right to 33, and the end frame for wlk_bkwd to 27	2018-08-10 09:56:24 -07:00
Zach Fox	9124e5cf22	Merge branch 'master' of github.com:highfidelity/hifi into autoScrollGoTo	2018-08-10 09:47:10 -07:00
Zach Fox	1699d3ed6a	Wording change in Availability	2018-08-10 09:35:40 -07:00
sabrina-shanman	660178e5bb	Remove 'plane' from list of supported Collision Pick shapeTypes, since it turns out ShapeFactory does not support it	2018-08-09 17:41:46 -07:00
Wayne Chen	769e7eab03	removing domainLimitedScale property and changing read property of scale	2018-08-09 17:38:58 -07:00
amantley	c8a31bc59f	created a backward walk speed constant 1.6m/s and changed the characteristic speed for strafe right left to 1.3	2018-08-09 17:38:57 -07:00
Wayne Chen	d533e3b341	adding domainLimitedScale property	2018-08-09 17:29:13 -07:00
sabrina-shanman	4c367fa443	Fix outdated explanation of when CollisionPickResult.intersects is true	2018-08-09 17:26:54 -07:00
sabrina-shanman	b32b811fff	Move up buildObjectIntersectionsMap in CollisionPick.cpp	2018-08-09 17:24:09 -07:00
John Conklin II	2d9cbe91bb	Merge pull request #13780 from hyperlogic/bug-fix/perftimer-memory-corruption ... Fix memory corruption in PerformanceTimer when Stats are active	2018-08-09 17:16:03 -07:00
sabrina-shanman	26ae688d59	Refactor CollisionPickResult::toVariantMap	2018-08-09 17:11:32 -07:00
sabrina-shanman	c5e9f02372	Finalize Collision Pick API naming convention for intersectingObjects	2018-08-09 16:59:23 -07:00
Alexia Mandeville	38973f0840	Adding icon states to emote app, active state	2018-08-09 16:00:36 -07:00
sabrina-shanman	4f077080b0	Change API naming for intersectingObjects in CollisionPickResult and update docs	2018-08-09 15:29:21 -07:00
sabrina-shanman	4d31863484	Fix missing jsdoc note for getPrevPickResult on existence of ParabolaPickResult	2018-08-09 15:08:27 -07:00
David Kelly	3b7d1cb6cf	Only update gain if it really changed ... and only fire UserActivity if we really do change the gain	2018-08-09 14:55:07 -07:00
John Conklin II	6481aea2f4	Merge pull request #13715 from SamGondelman/parabolic ... Enable parabolic teleport	2018-08-09 13:12:17 -07:00
John Conklin II	59977fe1d3	Merge pull request #13764 from r3tk0n/17249-safe-landing ... Relocate Avatar Spawn Point from the Hips to the Feet	2018-08-09 12:45:30 -07:00
David Back	9779ce1b80	Merge pull request #13777 from dback2/reloadContentScriptCache ... Clear script cache with reload content	2018-08-09 12:19:39 -07:00
luiscuenca	9ca0ee05dc	Fix wanings	2018-08-09 12:13:03 -07:00
Zach Fox	c0e2b3a240	Happening Now -> Featured	2018-08-09 11:49:29 -07:00