3878 commits

Author	SHA1	Message	Date
John Conklin II	02f53c4ee5	Merge pull request #13808 from dback2/createEntitiesGrabbable ... Use Create Entities as Grabbable option when adding asset to world	2018-08-16 09:22:23 -07:00
Kerry Ivan Kurian	6a34bde49c	Merge pull request #13825 from roxanneskelly/autoScroll ... Auto scroll	2018-08-14 20:56:53 -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
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
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	832eefd3a2	Merge pull request #13752 from ctrlaltdavid/M17208 ... Improve text in Avatar app's pop-ups	2018-08-14 08:48:04 -07:00
unknown	c622a587e3	Merge branch 'master' of https://github.com/highfidelity/hifi into createEntitiesGrabbable	2018-08-11 07:59:56 -07: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
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
unknown	5d1cc3696a	Merge branch 'master' of https://github.com/highfidelity/hifi into createEntitiesGrabbable	2018-08-10 12:10:57 -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
Zach Fox	1699d3ed6a	Wording change in Availability	2018-08-10 09:35:40 -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
Zach Fox	c0e2b3a240	Happening Now -> Featured	2018-08-09 11:49:29 -07:00
Zach Fox	4248f342b4	Fix MS17469: Fix conditionals for needing more paginated results when ListView changes	2018-08-09 10:22:09 -07:00
David Back	8db0711b5b	set grabbable user data in addModelEntity, pass grabbable from asset browser	2018-08-08 16:33:47 -07:00
Zach Fox	af9dc8acca	Turn on only for Annoucements	2018-08-07 11:51:38 -07:00
Zach Fox	4cee6b720a	Implement auto-scrolling on Places cards (TODO for Connections)	2018-08-07 11:50:38 -07:00
amantley	08889b627a	Merge remote-tracking branch 'upstream/master' into animationBlendChanges	2018-08-06 09:16:53 -07:00
John Conklin II	00a8b73814	Merge pull request #13751 from danteruiz/fix-flying ... fix flying	2018-08-03 19:27:47 -07:00
Dante Ruiz	9bebd1e623	making changes	2018-08-03 18:11:55 -07:00
amantley	375d726535	added the new animations for strafe and walk to the resource file and updated the avatar-animation.json file	2018-08-03 16:48:43 -07:00
David Rowe	f9d9324a14	Improve text in Avatar app's pop-ups	2018-08-04 10:55:57 +12:00
Sam Gateau	c1951da2bb	Merge pull request #13737 from jherico/fix/fb16633_a ... Don't allow Web surfaces created by non-client scripts to access files	2018-08-03 15:25:41 -07:00
amantley	bd88d5f15b	merging with ik leg fix code in master	2018-08-02 09:48:04 -07:00
Zach Fox	67528cb646	Fix MS17215: Auto-show Confirmed txns in Recent Activity when many Pending txns present	2018-08-01 15:49:53 -07:00
Brad Davis	4b317a84d8	Don't allow Web surfaces created by non-client scripts to access files	2018-08-01 15:12:45 -07:00
Zach Fox	7905c91289	Merge pull request #13727 from zfox23/MS17168_filterWhenViewing ... Fix MS17168: Filter My Purchases when clicking View link on Confirmation	2018-08-01 14:23:26 -07:00
John Conklin II	c444bb11ba	Merge pull request #13668 from ElderOrb/base_bluebuttons_on_uit ... Avatarapp: base 'SquareLabel' on button from Uit	2018-08-01 13:10:33 -07:00
John Conklin II	082a3bca89	Merge pull request #13679 from ElderOrb/FB16840 ... FB16840 - Qml spinboxes in UI toolkit should focus the underlying fie…	2018-08-01 11:46:59 -07:00
John Conklin II	bda9ed7f1a	Merge pull request #13680 from ElderOrb/adjust_wearables_button_fix ... use 'light' color scheme	2018-08-01 11:23:10 -07:00
Zach Fox	4b41804326	Fix MS17168: Filter My Purchases when clicking View link on Confirmation	2018-07-31 14:52:01 -07:00
Alexander Ivash	6e6eae2160	Avatarapp: base 'SquareLabel' on button from Uit	2018-07-31 22:03:34 +03:00
John Conklin II	09d1964f1d	Merge pull request #13670 from ElderOrb/animate_get_more_avatars ... Avatarapp: hover animation for 'get more avatars' button	2018-07-31 09:51:58 -07:00
John Conklin II	221dd3ee88	Merge pull request #13673 from ElderOrb/avatarapp-update-messageboxes ... FB16992 - Layout changes to the two lightboxes in the Avatar app	2018-07-31 09:36:16 -07:00
John Conklin II	bd2ab38bfe	Merge pull request #13701 from ElderOrb/FB16702 ... FB16702 - Avatar App does not save Animation JSON Override URL	2018-07-30 14:51:32 -07:00
John Conklin II	200292c18e	Merge pull request #13675 from howard-stearns/forget-you ... pal refresh fixes	2018-07-30 14:38:24 -07:00
amantley	637a214165	added the anim stack print out static object for the list of motion and weights	2018-07-27 17:25:00 -07:00
John Conklin II	9c37e30fe6	Merge pull request #13678 from ElderOrb/FB17023 ... FB17023 - Make visible avatar url in the avatar app	2018-07-27 14:57:25 -07:00
amantley	b28ce40f09	adding the anim stack print out feature half way done	2018-07-27 08:46:40 -07:00
Alexander Ivash	29f7cab7df	FB16702 - Avatar App does not save Animation JSON Override URL ... note: PR also changes logic of 'hint' - previously it showed hard-coded senseless text, now - current value of 'animation URL'	2018-07-27 02:08:44 +03:00
howard-stearns	9b61e8c4ad	Merge branch 'master' of github.com:highfidelity/hifi into forget-you	2018-07-26 11:50:15 -07:00
amantley	91b9865f27	Merge remote-tracking branch 'upstream/master' into animationBlendChanges	2018-07-24 17:14:24 -07:00
Zach Fox	eea4630d2b	Fix MS16704: Remove worn Avatar/Wearable before updating	2018-07-24 14:29:05 -07:00
Alexander Ivash	c9d9f7363a	use 'light' color scheme	2018-07-24 23:19:11 +03:00