1723 commits

Author	SHA1	Message	Date
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
samcake	05304c72e0	Merge branch 'master' of https://github.com/highfidelity/hifi into meta	2017-01-18 17:00:20 -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
David Kelly	3b70fa08a3	Merge pull request #9417 from davidkelly/dk/palLogSpam ... Removing some PAL-related interface log spam	2017-01-18 13:20:57 -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
Philip Rosedale	d60d183c8c	Merge pull request #9403 from humbletim/21118 ... Code Review for Job #21118 - Add on/off switch to ambisonic/ambient sound emitter	2017-01-18 10:29:01 -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
humbletim	6320d872b4	remove commented code	2017-01-18 02:57:13 -05:00
humbletim	f88b39918f	switch to messaging for toggle notifications; cleanup	2017-01-18 02:54:42 -05:00
humbletim	1048c2a3bf	apply default userData values; add error checking; throttle toggle clicks	2017-01-18 01:40:28 -05: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
samcake	5ed3b48f9d	adding the checkbox to show the meta bounds from the debugDeferredLighting.js	2017-01-17 12:15:09 -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
humbletim	7025ed5909	update test script to create a triggerable entity	2017-01-17 03:18:56 -05:00
humbletim	88b7f9ec9d	add ambient sound test	2017-01-17 01:44:03 -05:00
humbletim	27a2367634	update debugPrints	2017-01-17 01:27:48 -05:00
humbletim	c7a561aff9	trim extra debugging code	2017-01-17 01:23:03 -05:00
David Kelly	6c07a9aece	remove debuggng logspam	2017-01-16 19:06:36 -08:00
David Kelly	6c701bb0f0	remove ignored avatars from PAL when they disconnect	2017-01-16 18:22:53 -08:00
humbletim	827aa68d3f	cleanup pass	2017-01-16 19:50:25 -05:00
humbletim	c9fd650e70	update to support click/far-click toggling and userData.disabled setting	2017-01-16 19:37:31 -05:00
David Rowe	a1fe908380	Remove a lingering line of old code	2017-01-17 12:56:56 +13:00
howard-stearns	0a3236dcc9	handControllerGrab update loop change	2017-01-16 14:54:32 -08:00
David Kelly	95aad3140d	Merge pull request #9386 from davidkelly/dk/manageAudioIntervalInPal ... Manage audio interval timer in PAL	2017-01-16 11:29:05 -08:00
Zach Fox	32e330320e	Cleanup after rebase	2017-01-16 11:26:57 -08:00
Zach Fox	6e4a4da92a	Checkpoint	2017-01-16 10:42:29 -08:00
Seth Alves	23ea65e2b5	more changes to handle camera-relative-controller joints.	2017-01-16 10:26:16 -08:00
Seth Alves	b617b3a114	put code to delete prim-stylus tip back in	2017-01-16 07:50:36 -08:00
Seth Alves	756d96c368	fix search ray getting left on. started adding stylus models	2017-01-16 07:46:12 -08:00