349 commits

Author	SHA1	Message	Date
luiscuenca	c1aa5e9308	Add mutex to setter	2018-10-01 12:54:47 -07:00
luiscuenca	2c6003e40b	Add mutex	2018-10-01 11:44:08 -07:00
luiscuenca	5ccbc5c029	Disable Hand Touch when Leap Motion is running	2018-10-01 10:47:06 -07:00
Seth Alves	b69d0f3997	get interface building and working with clang-7 on ubuntu 18	2018-09-28 13:46:51 -07:00
SamGondelman	c522d1bc93	merge with master	2018-09-14 00:57:13 -07:00
Anthony Thibault	584d39744f	Merge pull request #13918 from hyperlogic/bug-fix/avatars-with-no-eyes-in-hmd-mode ... HMD mode bug fix for avatars with no eyes	2018-09-05 10:57:21 -07:00
SamGondelman	9b75c7e07f	trying to separate colors and vectors	2018-09-04 17:20:05 -07:00
Anthony Thibault	b21fa1037f	Code review feedback and bug fixes for calibraiton matrices	2018-09-04 11:55:52 -07:00
SamGondelman	5f08ed5027	misc perf improvements	2018-08-30 16:55:15 -07:00
SamGondelman	283c0c0311	s i m p l i f y	2018-08-23 11:47:56 -07:00
SamGondelman	9929529f30	vec3 conversion	2018-07-11 14:18:22 -07:00
David Rowe	a7a0cfeef2	Remove some deprecated functions from the Controller API	2018-06-05 10:56:19 +12:00
David Rowe	6d4f704279	Regularize some JSDoc usage	2018-05-21 09:32:10 +12:00
Clement	da9fb9c751	Fix non self-sufficient headers	2018-05-04 16:26:41 -07:00
David Rowe	1aa28b7f54	Merge remote-tracking branch 'upstream/master' into 21856-d ... # Conflicts: # interface/src/LODManager.h	2018-05-02 07:50:55 +12:00
David Rowe	2482da3c25	Miscellaneous JSDoc fixes noticed in passing	2018-05-01 21:55:45 +12:00
David Rowe	2cc3ed6287	List which contexts each namespace and object is available in	2018-04-28 20:00:28 +12:00
David Rowe	3792b28a3e	Add input recorder examples	2018-04-21 14:53:40 +12:00
David Rowe	748052614f	Doc review	2018-04-21 12:45:00 +12:00
David Rowe	9f83c606e9	Controller API JSDoc	2018-04-17 11:46:40 +12:00
John Conklin II	ef133806be	Merge pull request #12813 from ctrlaltdavid/21826 ... Fix Controller.getActions(), .getHardware(), and .getStandard()	2018-04-12 10:42:25 -07:00
John Conklin II	19bf793910	Merge pull request #12761 from ctrlaltdavid/21821 ... Add Controller.Actions.Sprint as synonym of Controller.Actions.SPRINT	2018-04-11 12:07:32 -07:00
David Rowe	8d25a745f0	Fix Controller.getActions(), .getHardware(), and .getStandard()	2018-04-06 17:21:49 +12:00
David Rowe	ab8ee20960	Add Controller.Actions.Sprint as synonym of Controller.Actions.SPRINT	2018-04-03 10:00:19 +12:00
Anthony J. Thibault	ca3fe28b05	JavaScript exceptions during Controller system callbacks are now logged ... (cherry picked from commit d3aec12e9e76e4aeb8ecbd449cc76afda1a0e35d)	2018-03-28 14:01:21 -07:00
Dante Ruiz	b8796db1e5	Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord	2018-03-26 09:13:58 -07:00
SamGondelman	06c0b3afd3	disable IK on android, input recorder doesn't do anything if off	2018-03-16 16:52:12 -07:00
Dante Ruiz	fe363e7f2a	changing keybaord mapping	2018-03-06 14:16:25 -08:00
Anthony J. Thibault	f0985a8a01	Code review feedback ... clamp _rotationConstant and _translationConstante between 0 and 1. re-organized apply structure, to prevent transforming invalid values.	2018-01-04 14:21:53 -08:00
Anthony J. Thibault	42424d32f1	Added exponential smoothing filter ... Tuned coefficients to maximize glitch and vibration damping while minimizing latency.	2017-12-08 09:29:54 -08:00
SamGondelman	cf34fe3345	laserpointers generate pointerevents	2017-10-26 12:01:09 -07:00
Bradley Austin Davis	b93e91b9f3	New android toolchain	2017-09-19 13:45:12 -07:00
Anthony J. Thibault	98bbe887b9	Merge branch 'master' into feature/secondary-pose-support	2017-08-04 16:11:13 -07:00
seefo	106b0ad8bb	Added Vive pucks as an input channel	2017-08-02 13:08:43 -07:00
Anthony J. Thibault	78c6564174	Merge branch 'master' into feature/secondary-pose-support	2017-07-27 09:09:32 -07:00
Chris Collins	853101fcbc	Merge pull request #10928 from 1P-Cusack/21362 ... Add point and thumb up gestures to the Vive.	2017-07-26 22:07:14 -07:00
1P-Cusack	9e25c3b7d8	Renaming 'not' route to 'logicalNot'. ... Build was failing on non-windows platforms because 'not' is a reserved word in C++ (which Visual Studio happily ignores).	2017-07-25 14:47:34 -04:00
1P-Cusack	af751c8b8c	Add filter to map the boolean negation of a flag.	2017-07-17 10:53:37 -04:00
Anthony J. Thibault	c85e187c61	first stab at secondary target pose support	2017-07-13 18:12:33 -07:00
David Rowe	07697c5083	Merge branch 'master' into 21418 ... # Conflicts: # interface/resources/qml/hifi/dialogs/GeneralPreferencesDialog.qml # interface/resources/qml/hifi/tablet/TabletGeneralPreferences.qml Removed stray "Vive Controller Picks" configuration item which no longer exists.	2017-07-01 11:19:00 +12:00
David Rowe	88ed69a4a1	Code review	2017-06-29 08:58:27 +12:00
David Rowe	31714675c3	Remove unused Sixense preference and associated methods	2017-06-26 16:14:57 +12:00
David Rowe	bed0e8ef87	Merge branch 'master' into 21396 ... # Conflicts: # interface/src/avatar/MySkeletonModel.cpp	2017-06-26 12:07:25 +12:00
Seth Alves	05f0ec267e	fix an initialization order fiasco	2017-06-24 18:53:00 -07:00
David Rowe	6ff8aed5e3	Merge branch 'master' into 21396	2017-06-22 23:54:15 +12:00
David Rowe	3bdf267900	Implement fingers control	2017-06-22 23:32:06 +12:00
Brad Davis	a69cf31f4b	PR feedback and cmake fixes	2017-06-16 16:59:58 -07:00
Seth Alves	d91b3700a7	Merge branch 'master' of github.com:highfidelity/hifi into head-controller	2017-06-02 10:07:50 -07:00
Seth Alves	48ee546545	Merge branch 'master' of github.com:highfidelity/hifi into head-controller	2017-06-01 16:15:03 -07:00
Dante Ruiz	77eb75db95	add .json to extension	2017-06-01 22:48:59 +01:00
Dante Ruiz	6bc53388f8	Merge branch 'master' of github.com:highfidelity/hifi into record-standard	2017-06-01 22:34:57 +01:00
Dante Ruiz	725388043f	removed double semi-colons	2017-06-01 22:30:50 +01:00
Dante Ruiz	2a5c43026a	gzip recording data	2017-06-01 22:27:51 +01:00
Dante Ruiz	9a8030cc09	Merge branch 'recorder-fix' into record-standard	2017-06-01 19:01:54 +01:00
Dante Ruiz	0e82b33d6d	final changes	2017-06-01 19:00:31 +01:00
Dante Ruiz	e52765b641	playback recording back through the standard inputs	2017-06-01 18:51:24 +01:00
Dante Ruiz	c686acc071	fixing build issue	2017-06-01 18:20:56 +01:00
Seth Alves	eb94c48c5b	merge from upstream	2017-06-01 10:10:11 -07:00
Dante Ruiz	23a9209285	Merge branch 'master' of github.com:highfidelity/hifi into recorder-fix	2017-06-01 18:06:37 +01:00
Dante Ruiz	a1e0737928	saving work	2017-06-01 18:06:06 +01:00
Sam Cake	d19956f93c	Fixing warnings	2017-05-31 22:02:47 -07:00
Dante Ruiz	cca0fa6600	fixed some input recorder design issue	2017-06-01 00:23:37 +01:00
Seth Alves	ffe844a8e7	Merge branch 'master' of github.com:highfidelity/hifi into head-controller	2017-05-30 13:42:20 -07:00
Seth Alves	af5ba3a90a	ask display-plugins if they are head-controllers	2017-05-25 15:14:10 -07:00
Seth Alves	3823ece153	Merge branch 'master' of github.com:highfidelity/hifi into head-controller	2017-05-25 10:57:46 -07:00
Seth Alves	bdbc6ddcc1	change some code to look at head-controller position rather than hmd position	2017-05-25 10:50:41 -07:00
Dante Ruiz	8cb9bfcc81	fixed merge conflict	2017-05-24 19:35:41 +01:00
Dante Ruiz	ac3c9655ec	added arms	2017-05-24 01:28:08 +01:00
Dante Ruiz	d98e7d5bc6	adding left and right arm	2017-05-23 00:26:12 +01:00
Dante Ruiz	78f6d2e850	fix low velocity filter	2017-05-18 21:22:42 +01:00
Dante Ruiz	90ddc16d09	add calibration data to filters	2017-05-18 17:07:28 +01:00
Dante Ruiz	b0fa26e390	fix wierd calibration effect due to low velocity filter	2017-05-16 16:38:01 +01:00
Dante Ruiz	975b1ab077	moved low velocity filter in the input system	2017-05-16 00:15:06 +01:00
Dante Ruiz	c689b9949c	fixed merge conflict	2017-05-15 16:11:28 +01:00
Dante Ruiz	655483182c	daving work	2017-05-12 23:38:20 +01:00
Dante Ruiz	6155d31513	removed debug statment	2017-05-12 19:48:31 +01:00
Dante Ruiz	1f328cc923	made requested changes	2017-05-12 19:46:12 +01:00
Dante Ruiz	9a0fd78e41	fixed indentation	2017-05-12 19:34:13 +01:00
Dante Ruiz	026daef842	fixed input recorder crash	2017-05-12 19:26:37 +01:00
Dante Ruiz	0cae299192	fix issue when loading file to the input recorder	2017-05-11 00:20:21 +01:00
Seth Alves	b82a333a5e	Merge pull request #10196 from ZappoMan/poseFilters ... support for input controller pose filters	2017-05-02 09:46:22 -07:00
Anthony J. Thibault	2120e63e3a	Merge branch 'master' into feature/head-standard-action	2017-04-27 17:51:13 -07:00
ZappoMan	829fa2b323	Merge branch 'master' of https://github.com/highfidelity/hifi into poseFilters	2017-04-27 08:17:59 -07:00
Anthony J. Thibault	ef43ff4b99	Add default pose matrices to InputCalibrationData structure	2017-04-26 11:55:24 -07:00
Dante Ruiz	79d827c6be	added requested features	2017-04-26 16:52:51 +01:00
Anthony J. Thibault	1fc9f4c93d	Hips and Spine are routed thru input system properly	2017-04-25 17:22:47 -07:00
Seth Alves	0cd2863df4	start on routing HMD position and rotation through controller interface ... (cherry picked from commit bca5241bae7674ff7e41c037d84bb78e5152046a)	2017-04-25 11:01:52 -07:00
Dante Ruiz	8c020a0ec2	saving work	2017-04-25 18:01:19 +01:00
Dante Ruiz	2a997f2a4d	fix for ubuntu build error	2017-04-24 23:08:02 +01:00
Dante Ruiz	8705db07e5	removed dead code	2017-04-24 22:22:49 +01:00
Dante Ruiz	367a6ac03c	first prototype	2017-04-24 22:09:01 +01:00
Dante Ruiz	d057dfebf0	got input recording to work	2017-04-24 19:57:38 +01:00
Dante Ruiz	64fcfd33a4	working on loading files	2017-04-21 22:38:53 +01:00
Dante Ruiz	07f674eabe	exprting compressed file	2017-04-19 20:41:56 +01:00
Dante Ruiz	1cf9485143	fixed compile issue	2017-04-19 00:23:05 +01:00
Dante Ruiz	5cd4007aaa	got input recording working	2017-04-18 21:53:23 +01:00
Dante Ruiz	cd095915ef	removed emacs junk file from my repo	2017-04-18 00:32:30 +01:00
Dante Ruiz	c298886896	hooking up the input playback	2017-04-18 00:17:14 +01:00
druiz17	4bf3fa56f8	saving work	2017-04-16 21:26:09 -07:00
ZappoMan	8ff1ca8af6	swap the velocity components	2017-04-12 16:11:06 -07:00