1401 commits

Author	SHA1	Message	Date
Dante Ruiz	672deb903c	correct switch icons	2017-01-20 10:34:09 -08:00
Seth Alves	6641f9bafd	Merge pull request #9444 from druiz17/homeButtonFix ... Home button is now an overlay	2017-01-20 10:32:31 -08:00
Seth Alves	2d220a557f	unmangle merge	2017-01-20 10:29:18 -08:00
Seth Alves	c492319be2	merge from upstream	2017-01-20 10:14:11 -08:00
Seth Alves	caae804318	re-enable haptic pulse when stylus touches tablet overlay	2017-01-20 10:12:15 -08:00
Ryan Downe Karpf	03851d4188	Merge pull request #9441 from davidkelly/dk/makeUsSomeAnalytics ... Some initial analytics for PAL usage	2017-01-20 08:30:46 -08:00
Anthony J. Thibault	4e4545ac00	Updated orientation of tablet when no hand controllers are present.	2017-01-19 20:27:06 -08:00
Anthony J. Thibault	8304aa7b19	Added ability to mouse move the tablet in 2d desktop mode.	2017-01-19 18:04:08 -08:00
David Kelly	5adc2cc593	Couple improvements ... Only send one message when gain is changed. Eliminated the bool and now just sending un-personalMute, etc...	2017-01-19 17:22:39 -08:00
Dante Ruiz	e1c2c73e5f	clean up	2017-01-20 01:04:14 +00:00
Dante Ruiz	a319db3cb4	removed duplicate code	2017-01-20 00:57:48 +00:00
Dante Ruiz	1e7e4576cc	comparing with ID instead of strings	2017-01-19 16:38:55 -08:00
Anthony J. Thibault	2c3c96b600	Fix for broken entity scrolling introduced by 23ea65e2 ... this.grabbedEntity was being cleared before entityTouchingExit transition could send the release event.	2017-01-19 14:23:43 -08:00
Seth Alves	47b59ffae3	don't save tablet to Settings when logging out or switching domains	2017-01-19 14:10:48 -08:00
Zach Fox	64ef3d5665	Merge pull request #9426 from zfox23/PAL_AdminLabel ... PAL: Admin Labels, Updated Letterboxes	2017-01-19 13:48:05 -08:00
Seth Alves	18e9b476c5	Merge pull request #9439 from hyperlogic/tablet-ui ... Improved stylus and laser input deadspot	2017-01-19 12:43:02 -08:00
David Kelly	d9fbf832e2	Some initial analytics for PAL usage	2017-01-19 11:35:17 -08:00
Seth Alves	41ddfbfd27	clean up grab.js. provide a way to delete old tablets that got saved into Settings on exit	2017-01-19 11:34:38 -08:00
Zach Fox	534fcd9399	Potential fix	2017-01-19 10:20:36 -08:00
Seth Alves	0e9ff7f7fc	make tablet be an avatar-entity	2017-01-19 10:12:06 -08:00
Seth Alves	eb25e1c12d	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-19 09:41:49 -08:00
Chris Collins	601223aa98	Merge pull request #9402 from ctrlaltdavid/clara-tidying ... Remove a line of old code in Clara.io download	2017-01-19 09:15:58 -08:00
Dante Ruiz	30b57b62da	toggle help	2017-01-19 08:12:49 -08:00
Anthony J. Thibault	2fd691d844	Improved stylus and laser input deadspot	2017-01-18 18:23:00 -08:00
Seth Alves	7c938728e5	don't do constant haptics if stylus touches tablet frame. home button triggers only once per click	2017-01-18 16:56:39 -08:00
Seth Alves	c4d85c91d0	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui	2017-01-18 15:51:54 -08:00
Seth Alves	3517daaad2	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-18 15:49:12 -08:00
Anthony J. Thibault	56c897cc2f	Process the tablet stylus even when reticle is over 2d HUD overlay.	2017-01-18 15:36:09 -08:00
Anthony J. Thibault	fc5c2c8def	Fix for glitchy scrolling	2017-01-18 15:32:38 -08:00
Anthony J. Thibault	448e3fda0c	fix for JSON parse exception	2017-01-18 15:32:37 -08:00
Anthony J. Thibault	28dac9d802	Lasers now interact with the tablet in edit mode.	2017-01-18 15:32:36 -08:00
Zach Fox	7f57251a0e	Remove logs also removed in Master	2017-01-18 13:38:19 -08:00
Zach Fox	e9d3c36873	Final commit?	2017-01-18 12:55:25 -08:00
Zach Fox	346cfbfe02	First checkpoint	2017-01-18 12:55:24 -08:00
Seth Alves	02b708feaf	Merge pull request #9419 from druiz17/buttonsMissing ... Fixed pal on tablet	2017-01-18 11:04:10 -08:00
Seth Alves	a8038ce64e	cleanups	2017-01-18 10:50:02 -08:00
Seth Alves	1f92b57bf2	switch to model stylus	2017-01-18 10:46:18 -08:00
Dante Ruiz	8172329ec3	Fixed pal	2017-01-18 10:33:58 -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
Anthony J. Thibault	03f8a310fc	Fix for exception on script ending	2017-01-17 18:17:41 -08:00
Anthony J. Thibault	c6f3eb138a	Adjusted tablet spawn position and orientation to be more natural	2017-01-17 18:16:40 -08:00
David Kelly	f5300d3862	Removing some PAL-related interface log spam ... Probably more, but these _seem_ to be the worst	2017-01-17 17:06:18 -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
Seth Alves	89d7b8bfc6	call releaseEquip when an equipped entity is dropped with a secondary press	2017-01-17 13:27:01 -08:00
Seth Alves	5c205f5800	avoid an unhook loop if two different hands have passed something back and forth more than once	2017-01-17 10:24:30 -08:00
David Kelly	2460e89a57	CR feedback	2017-01-17 09:53:04 -08:00
Seth Alves	1eb7b668bf	merge from upstream	2017-01-17 09:33:49 -08:00
Seth Alves	6bace4f451	merge from upstream	2017-01-17 09:29:30 -08:00