253 commits

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