339 commits

Author	SHA1	Message	Date
druiz17	58a00a89d7	remove debug print	2017-09-27 12:58:11 -07:00
druiz17	38096b48d9	fixing entitySelectionTool	2017-09-27 10:52:56 -07:00
Brad Hefta-Gaub	3500705d0c	Merge pull request #11427 from ElderOrb/case7723 ... 7723 Tablet Should Rotate Faster when using Create app	2017-09-26 22:05:45 -07:00
Seth Alves	a871a6db1d	Merge pull request #11430 from sethalves/fix-parent-grab ... Fix parent grab	2017-09-26 13:00:16 -07: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
Dante Ruiz	e397d49564	Merge pull request #11159 from vladest/modal_dialogs_async ... Modal dialogs async	2017-09-26 11:07:42 -07:00
Seth Alves	0b60928dd3	fix rollup-to-parent code to only roll up to entity parents	2017-09-25 19:07:40 -07:00
druiz17	dda20c1ef5	fixing merge conflict	2017-09-25 09:45:29 -07:00
Seth Alves	5741782f45	merge from upstream	2017-09-25 09:16:43 -07:00
druiz17	b8ee60a394	fix scripting error	2017-09-22 17:13:48 -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	53efe6bfb2	working on fix	2017-09-21 18:17:05 -07:00
Seth Alves	24bfb3f3b9	oops	2017-09-21 11:16:00 -07:00
Seth Alves	363a2a3a7a	merge from upstream	2017-09-21 11:08:29 -07:00
Seth Alves	473db92a8e	fix some parent-grab bugs, re-enable adjusting equipped entities, don't trigger guns right when they are equipped	2017-09-21 11:07:47 -07:00
druiz17	2d7d6f85ba	fixing merge conflicts	2017-09-21 09:04:13 -07:00
beholder	8085d0292d	7723 Tablet Should Rotate Faster when using Create app	2017-09-21 16:26:54 +03: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	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
vladest	5585265349	Merge branch 'master' into modal_dialogs_async	2017-09-16 22:06:49 +02:00
vladest	5b033e021a	Merge branch 'master' into modal_dialogs_async	2017-09-16 12:30:07 +02:00
Seth Alves	39e6605f6f	fix grab entity methods + jshint cleanups	2017-09-15 10:50:46 -07:00
Thijs Wenker	af4bc59307	clone local avatar entities	2017-09-14 23:31:51 +02:00
vladest	0bfa29d0d4	Merge branch 'master' into modal_dialogs_async	2017-09-14 20:21:29 +02:00
Anthony J. Thibault	8fb69a9867	Merge branch 'master' into feature/ant-man	2017-09-13 18:23:11 -07:00
druiz17	1b288ef860	make garbbing radius the same as master	2017-09-13 16:15:36 -07:00
Anthony J. Thibault	ae2d0e89b4	Fixes for desktop tablet	2017-09-13 14:18:00 -07:00
Anthony J. Thibault	de5f0ad987	WebTablet.js: calcSpawnInfo works more consistently.	2017-09-13 12:01:41 -07:00
druiz17	b3ff5c86f7	fixed secondary triggers and chest lid	2017-09-12 14:43:06 -07:00
Dante Ruiz	d90f6320a9	Merge pull request #8 from sethalves/controller-dispatcher-1 ... Controller dispatcher 1	2017-09-12 10:54:10 -07:00
druiz17	b634292261	fixing some small issues	2017-09-12 10:53:04 -07:00
Seth Alves	a9aa6df93e	Merge branch 'controller-dispatcher-1' of github.com:sethalves/hifi into controller-dispatcher-1	2017-09-12 10:44:29 -07:00
Seth Alves	2850029f26	add profiling to controller-dispatcher	2017-09-12 10:00:32 -07:00
Anthony J. Thibault	bb5e808051	Fix for some of tablet size issues, on switching domains.	2017-09-11 18:59:52 -07:00
druiz17	a46e41607c	fixed teleport, added avatar scaling, allow laser to be used on tablet when stylus is shown	2017-09-11 15:07:14 -07:00
druiz17	405d8c3afc	fixing cloning and laser	2017-09-08 17:07:27 -07:00
druiz17	f0c12e50dd	some small bug fixes	2017-09-08 11:50:19 -07:00
druiz17	ef050a09f9	made requested changes and also allow entities/overlays to be grabbed by the grip button	2017-09-07 14:42:46 -07:00
Anthony J. Thibault	23ff1b9ead	Fixes for scaling controller display ... Adds MyAvatar.sensorToWorldScaleChanged signal.	2017-09-05 15:03:41 -07:00
Dante Ruiz	3b357ad61e	finshed handControllerGrab refactoring	2017-09-01 17:07:26 -07:00
Anthony J. Thibault	a1b94fd9d2	Bug fixes for laser offset and avatar hold action	2017-08-31 17:26:00 -07:00
Anthony J. Thibault	a0eb8152a6	fix for tablet spawn position	2017-08-31 13:15:46 -07:00