3791 commits

Author	SHA1	Message	Date
beholder	8c7462f012	fine-tuning based on discussion with Anshuman	2017-10-12 22:21:40 +03:00
beholder	9c15af9fbe	raise highlight above button overlay to reduce flickering	2017-10-12 14:46:01 +03:00
beholder	ef732fb547	enable 'close' button overlay on hover/leave with stylys/lasers	2017-09-27 01:07:32 +03:00
beholder	6409580b03	ignore intersection for 'close' button highlight overlay	2017-09-27 01:06:47 +03:00
beholder	24a12a2f8f	7722 Add onHover Outline to Tablet "X" Button	2017-09-26 22:31:56 +03:00
Seth Alves	81f74f9297	Merge pull request #11444 from druiz17/module-handcontrollerPointer ... Made handControllerPointer into modules in hope of preventing mouse cursor interference with tablet	2017-09-26 12:21:03 -07:00
Seth Alves	91f5f61ea3	Merge pull request #11456 from druiz17/bugs-handControllerGrab ... Correctly grab tablet in 3rd person	2017-09-26 12:19:20 -07:00
Seth Alves	913d3c4d12	Merge pull request #11422 from hyperlogic/feature/ant-man2 ... Secondary IPD fixes	2017-09-26 11:53:45 -07:00
Dante Ruiz	e397d49564	Merge pull request #11159 from vladest/modal_dialogs_async ... Modal dialogs async	2017-09-26 11:07:42 -07:00
druiz17	6332a53ee2	able to grab tablet in 3rd person	2017-09-25 16:36:29 -07:00
druiz17	ec40df711d	fix tablet grabbing and eslint changes	2017-09-25 14:31:13 -07:00
druiz17	b1b31444f0	fix mouse visiblity	2017-09-25 11:34:18 -07:00
druiz17	dda20c1ef5	fixing merge conflict	2017-09-25 09:45:29 -07:00
Brad Hefta-Gaub	030da7d850	Merge pull request #11401 from druiz17/module-scale-entities ... ScaleEntity Module	2017-09-25 09:10:32 -07:00
Andrew Meadows	cf0dd6f8c3	Merge pull request #11371 from cain-kilgore/21542 ... WL 21542 - Allow Scripts to change Avatar Gravity [Experimental]	2017-09-23 22:20:52 -07:00
Zach Fox	921ebc221e	Merge pull request #11431 from zfox23/contextOverlayInterface_fixEnabled ... Enable Inspection Mode for all; change Commerce setting name	2017-09-22 17:52:27 -07:00
druiz17	b8ee60a394	fix scripting error	2017-09-22 17:13:48 -07:00
druiz17	2c7b8cdb4f	fixing script issues	2017-09-22 16:26:41 -07:00
druiz17	ee9ac3e7f9	undo unnessary changes	2017-09-22 15:38:39 -07:00
druiz17	28d8af0b44	Merge branch 'master' of github.com:highfidelity/hifi into module-handcontrollerPointer	2017-09-22 15:33:17 -07:00
druiz17	e965b7fff1	hand controller pointer	2017-09-22 15:32:40 -07:00
Zach Fox	0eafdeab14	Fix hover -> unhover overlay behavior	2017-09-22 13:32:11 -07:00
Zach Fox	bb9db3ef6d	Updates to behavior and shader appearance	2017-09-22 11:24:30 -07:00
druiz17	53efe6bfb2	working on fix	2017-09-21 18:17:05 -07:00
Anthony J. Thibault	54e627e2c5	Merge branch 'master' into feature/ant-man2	2017-09-21 13:59:47 -07:00
Zach Fox	57b5a23373	Enable Inspection Mode for all; change Commerce setting name	2017-09-21 11:18:21 -07:00
Seth Alves	61efaf7fc2	Merge pull request #11420 from druiz17/fix-parenting-overlay-module ... nearParentGrab module now sets the correct previous parent id when switching grabbed overlays from one hand to another	2017-09-21 09:44:07 -07:00
druiz17	65e0c99618	small change	2017-09-21 09:07:49 -07:00
druiz17	2d7d6f85ba	fixing merge conflicts	2017-09-21 09:04:13 -07:00
Anthony Thibault	03e278c5ae	Merge pull request #11416 from druiz17/stylus-pos ... Pull back the stylus position in hand.	2017-09-20 17:40:22 -07:00
druiz17	2c55419c60	change tablet forward offset	2017-09-20 16:49:45 -07:00
Seth Alves	90c97319ea	Merge pull request #11408 from druiz17/fix-tablet-input ... fixing/improving and cleanup tablet inputs	2017-09-20 16:36:07 -07:00
druiz17	949c343604	fixing nearGrabParentModule switching grabbed overlays	2017-09-20 15:34:01 -07:00
Cain Kilgore	a4655b9c73	Merge branch 'master' of https://github.com/highfidelity/hifi into 21542	2017-09-20 23:25:26 +01:00
Cain Kilgore	796e9e7ab3	Fixed things	2017-09-20 23:23:30 +01:00
Thijs Wenker	7ea1968b33	Tip, Code Writer which comes standard with Windows 10, does enter tabs by default when using the tab key. >=)	2017-09-20 14:59:15 -07:00
Thijs Wenker	60a566768a	removed debug spam from makeUserConnection, to reactivate it set Settings.setValue('MAKE_USER_CONNECTION_DEBUG', true); and reload the script	2017-09-20 14:39:13 -07:00
druiz17	92f3dfe2ab	move the stylus back a bit	2017-09-20 14:23:43 -07:00
druiz17	c20c5ee2b5	fixed tablet grabbing issue	2017-09-20 14:10:10 -07:00
druiz17	2ce6dcf89d	fixing spelling error	2017-09-20 11:45:42 -07:00
druiz17	5d87036f32	make changes requests and slight fixes	2017-09-20 11:41:31 -07:00
vladest	c17ca955db	Listener disconnects in C++ now	2017-09-20 20:03:53 +02:00
Daniela	8144841258	Add Edit.js Entities spawn up according to the orientation of the avatar.	2017-09-20 09:21:16 -07:00
Anthony J. Thibault	0873b88347	code review feedback	2017-09-20 09:21:15 -07:00
druiz17	e78d8bc132	tablet on wiki planet	2017-09-20 09:11:06 -07:00
druiz17	9c66a25d83	fixing and cleanup tablet inputs	2017-09-19 17:03:53 -07:00
vladest	67771bc297	Merge branch 'master' into modal_dialogs_async	2017-09-19 21:51:02 +02:00
druiz17	e2921661e9	scaling entities	2017-09-19 09:35:22 -07:00
druiz17	9df3b6c211	change tablet spawn position	2017-09-18 13:29:05 -07:00
Anthony J. Thibault	0757f513af	Merge branch 'master' into feature/ant-man	2017-09-18 11:36:39 -07:00