1054 commits

Author	SHA1	Message	Date
Dante Ruiz	ef55e3181d	moveing controllerDispatchaer pointers to pointerUtils.js	2017-11-09 16:48:52 -08:00
Dante Ruiz	86439eff07	fixing merge conflict	2017-11-09 13:07:55 -08:00
SamGondelman	5a78c9ebfe	integrated stylus into pointer system, need to update controller module	2017-11-09 11:59:17 -08:00
Dante Ruiz	bdd31b63ed	update functions call names to match pointer API changes	2017-11-06 17:23:40 -08:00
Dante Ruiz	3e9eaa727b	Merge branch 'ui' of github.com:SamGondelman/hifi into ui	2017-11-06 16:39:10 -08:00
Dante Ruiz	b6e3262164	removing the last remaining laserPointers	2017-11-02 11:31:13 -07:00
Dante Ruiz	0580e23686	fixed edit mode and allow to scroll off tablet	2017-11-01 15:16:02 -07:00
Dante Ruiz	66f07cb21b	eslint controller modules	2017-11-01 11:36:36 -07:00
Brad Davis	f061b9c2da	Add stylus functionality to pointer manager	2017-11-01 11:27:57 -07:00
Dante Ruiz	abb6f786fa	added homebutton message and scripts cleanup	2017-11-01 11:03:48 -07:00
Dante Ruiz	cde5208151	fixing merge conflict	2017-11-01 08:56:55 -07:00
SamGondelman	5a7298f15b	Merge remote-tracking branch 'upstream/master' into pointers	2017-10-31 17:33:52 -07:00
Dante Ruiz	f44025a8b1	completely removed non-need laserPointers	2017-10-31 15:57:57 -07:00
Dante Ruiz	30332c3d00	removing more laserPointers	2017-10-31 14:13:42 -07:00
Brad Hefta-Gaub	fbcd813d7b	Merge pull request #11694 from ElderOrb/FB8315 ... 8315 Stylus appears in wrong place on hand	2017-10-30 18:00:56 -07:00
Dante Ruiz	e5600e4f1e	one universal controller pointer for all modules	2017-10-30 16:58:14 -07:00
Dante Ruiz	bea0df8e60	implemented remebering equiping entities offset	2017-10-27 14:46:04 -07:00
SamGondelman	a44e8efb99	merge from master	2017-10-26 12:14:53 -07:00
beholder	ddd25da430	8315 Stylus appears in wrong place on hand	2017-10-26 19:39:15 +03:00
Dante Ruiz	2ec8f3f625	made non-dynamic entities collisionless during far-grab	2017-10-25 11:29:32 -07:00
Brad Davis	befe583c5e	Merge remote-tracking branch 'upstream/master' into HEAD	2017-10-24 11:50:07 -07:00
SamGondelman	7686948daf	resolve conflicts and cleanup	2017-10-20 15:23:17 -07:00
SamGondelman	fb969964f3	generalized scripting interfaces	2017-10-20 14:37:10 -07:00
Brad Hefta-Gaub	26ea8bea6a	Merge pull request #11612 from highfidelity/pointers ... Fix tablet intersection bug and start of Pointer migration work (WIP)	2017-10-20 13:53:52 -07:00
Brad Hefta-Gaub	e2ccfb84f9	Merge pull request #11626 from Delanir/BubbleScaleMaster ... 7429 IPD Secondary Task List: bubble.js Scale	2017-10-19 09:31:15 -07:00
Melissa Brown	1a3821e984	Merge pull request #11591 from ctrlaltdavid/21568 ... Add some Quat and Uuid JavaScript helper properties	2017-10-18 22:07:06 -07:00
luiscuenca	6e8756e8af	Debug mode has been turned off	2017-10-18 15:40:03 -07:00
Daniela	e9f3dd6e44	Merge BubbleScale for IPD with hifi master.	2017-10-18 22:29:12 +01:00
SamGondelman	58172cfbd4	merge from master	2017-10-17 18:05:59 -07:00
David Rowe	8d4e979dc8	Replace usages of AVATAR_SELF_ID previously missed	2017-10-17 16:38:05 +13:00
David Rowe	ed1c974f75	Use MyAvatar.SELF_ID instead of Uuid.SELF	2017-10-17 15:58:51 +13:00
David Rowe	1e3a2b3e4e	Merge branch 'master' into 21568	2017-10-17 15:15:49 +13:00
SamGondelman	429905de51	update scripts to use ignoreItems, fix caching bug	2017-10-16 15:52:17 -07:00
SamGondelman	aee817fbbc	scale end sphere in c++ for controller modules	2017-10-16 13:31:25 -07:00
Seth Alves	fe9f142bf6	Merge pull request #11562 from druiz17/fix-release-grab ... include release message to controller modules	2017-10-13 13:06:18 -07:00
David Rowe	fc4e440dc4	Update system scripts to use new properties	2017-10-14 08:32:14 +13:00
druiz17	6799b9ca13	fix stylus	2017-10-13 09:34:08 -07:00
druiz17	67944c40a1	Merge branch 'master' of github.com:highfidelity/hifi into fix-release-grab	2017-10-11 09:13:01 -07:00
Atlante45	6dd49f5c32	Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master	2017-10-10 16:53:34 -07:00
Sam Gateau	f143c28625	Merge pull request #11542 from SamGondelman/bubbleBoy ... Move HUD and HUD overlay rendering out of display plugin	2017-10-10 14:26:20 -07:00
druiz17	e77ac9fd10	include release message	2017-10-10 13:47:33 -07:00
druiz17	013e15c9a2	made requested changes	2017-10-10 10:54:56 -07:00
druiz17	a179df29fb	mouse grab non-dynamic entities	2017-10-10 10:31:40 -07:00
druiz17	d0eb6a3ad0	remove comments	2017-10-10 09:45:41 -07:00
druiz17	003395b256	removing whitespace	2017-10-10 09:43:02 -07:00
druiz17	fc41155ce1	saving work	2017-10-10 09:17:01 -07:00
Thijs Wenker	77a36bf788	Merge pull request #10892 from ctrlaltdavid/vr-edit-a ... VR edit app	2017-10-07 02:19:00 +02:00
SamGondelman	7e6d5d9d98	merge with master	2017-10-06 14:57:08 -07:00
druiz17	3139f5ef2a	improve mouseHMD exit logic	2017-10-05 15:12:58 -07:00
druiz17	ba50fcc509	fix mouse dissapearing in desktop mode	2017-10-05 15:07:49 -07:00