267 commits

Author	SHA1	Message	Date
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