18842 commits

Author	SHA1	Message	Date
Dante Ruiz	0f3ac2831e	fix tablet menu selection issue	2017-01-18 17:20:42 +00:00
Dante Ruiz	1c13f538f7	removed debug output	2017-01-18 17:08:13 +00:00
Dante Ruiz	fa3bea52cd	fixed bug with menu	2017-01-18 16:45:27 +00:00
Dante Ruiz	baff07b0f9	controller with menus finally work	2017-01-18 07:41:25 -08:00
Dante Ruiz	9a61b6030b	tabletFocus update	2017-01-18 07:40:15 -08:00
Dante Ruiz	d3fa7651c9	some what working d-pad	2017-01-18 07:40:15 -08:00
dante ruiz	865a78a8c8	saving work	2017-01-18 07:40:14 -08:00
Seth Alves	b57803057d	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-18 06:38:44 -08:00
Seth Alves	0abb41ca2d	Merge pull request #9413 from hyperlogic/tablet-ui ... clara.io marketplace works on tablet	2017-01-18 06:37:55 -08:00
Brad Davis	cbc89e77ab	Consume fewer resources in AssetServer when interface is running locally	2017-01-17 18:15:39 -08:00
Faye Li Si Fi	d7209ef7f7	syntax	2017-01-17 16:56:54 -08:00
Faye Li Si Fi	42a96a94b4	fix	2017-01-17 16:54:40 -08:00
Faye Li Si Fi	126bfba512	fix tablet menu scrolling issue	2017-01-17 16:40:12 -08:00
Zach Fox	7a568ed8a7	Merge pull request #9401 from zfox23/PAL_DisplayName ... PAL: Editable Display Names & Immediate Update	2017-01-17 16:00:41 -08:00
Anthony J. Thibault	56fc42a2bd	clara.io marketplace works on tablet	2017-01-17 15:38:44 -08:00
Zach Fox	59ff970d5b	CR feedback	2017-01-17 15:01:02 -08:00
Seth Alves	c8382e6853	Merge pull request #9412 from fayeli/menu-fix ... Fixes for Tablet Menu Issues	2017-01-17 14:58:47 -08:00
David Kelly	341ac685e9	Merge pull request #9404 from davidkelly/dk/removeKilledAvatarsFromPalLists ... remove ignored avatars from PAL when they disconnect	2017-01-17 14:21:36 -08:00
Seth Alves	be165b567e	remove XXX comments	2017-01-17 13:32:58 -08:00
Seth Alves	e76f1c5937	if another avatar has something hung from their camera, don't act like their camera is my camera	2017-01-17 13:28:13 -08:00
Faye Li Si Fi	20ac96a7f9	fix clicking on checkboxes in menus or on ghosted menu items slides in a blank page	2017-01-17 12:29:38 -08:00
David Kelly	9b1aaf3bfe	CR feedback	2017-01-17 12:09:47 -08:00
Faye Li Si Fi	965f9ab0a7	fix tapping menu when already at the top-level menu blanks the tablet	2017-01-17 11:58:48 -08:00
Stephen Birarda	1e04aebb8d	add --fast-hearbeat command line switch for 1s stats	2017-01-17 11:25:40 -08:00
David Kelly	2460e89a57	CR feedback	2017-01-17 09:53:04 -08:00
Seth Alves	6bace4f451	merge from upstream	2017-01-17 09:29:30 -08:00
David Kelly	6c701bb0f0	remove ignored avatars from PAL when they disconnect	2017-01-16 18:22:53 -08:00
Seth Alves	f900629cdb	Merge pull request #9390 from sethalves/load-models-in-keyhole ... fix physics not starting up when a model is close behind	2017-01-16 18:06:23 -08:00
Zach Fox	3b56f46206	Style changes	2017-01-16 13:18:24 -08:00
Zach Fox	32e330320e	Cleanup after rebase	2017-01-16 11:26:57 -08:00
Stephen Birarda	1993e358d6	Merge pull request #9318 from birarda/ovr-platform-entitlement ... handle OVR Platform entitlement checks	2017-01-16 11:16:31 -08:00
Zach Fox	2f176f50fa	Another checkpoint	2017-01-16 10:44:54 -08:00
Zach Fox	6e4a4da92a	Checkpoint	2017-01-16 10:42:29 -08:00
Zach Fox	117e302b2a	First pass	2017-01-16 10:39:11 -08:00
Zach Fox	d2c7342a62	Merge pull request #9352 from zfox23/PerAvatarVolume ... PAL: Per-Avatar Volume Slider; visual tweaks	2017-01-16 10:34:31 -08:00
Seth Alves	bd67715cd2	don't early-exit from the loop that checks for loaded collision hulls because the check is what causes the hulls to be constructed	2017-01-16 08:54:56 -08:00
Chris Collins	2557c797af	Merge pull request #9300 from zzmp/graphics/forward-opaque ... Add opaques/skinned to forward rendering path	2017-01-16 08:48:18 -08:00
Seth Alves	756d96c368	fix search ray getting left on. started adding stylus models	2017-01-16 07:46:12 -08:00
Seth Alves	36fdaa6350	avoid a little pop when grabbing something with ignore-ik as true	2017-01-15 10:10:54 -08:00
Zach Fox	a5343d9aa9	Final tweaks before PR!	2017-01-13 17:20:29 -08:00
Zach Fox	a89868dcad	Make sliders appear only when row is selected	2017-01-13 15:41:17 -08:00
Zach Fox	8343769352	NameCard improvements & user feedback	2017-01-13 15:25:07 -08:00
Zach Fox	a69a10b8e4	Cleanup after rebase	2017-01-13 13:15:01 -08:00
Zach Fox	a9226e303c	Pull out visual changess & move them to other PR	2017-01-13 13:00:23 -08:00
Zach Fox	b0b6aeac6c	Ken's feedback	2017-01-13 13:00:03 -08:00
Zach Fox	b9cddc31a9	Checkpoint before implementing Ken's suggestions	2017-01-13 13:00:03 -08:00
Zach Fox	503468e49b	Style changes	2017-01-13 12:59:23 -08:00
Zach Fox	dcff873cd4	Modify slider function	2017-01-13 12:57:35 -08:00
Zach Fox	8bb200902f	First pass	2017-01-13 12:57:35 -08:00
Seth Alves	9de8144f0d	merge from upstream	2017-01-13 10:17:03 -08:00