5901 commits

Author	SHA1	Message	Date
Seth Alves	a75544a9fb	Merge pull request #10319 from hyperlogic/feature/head-standard-action ... Head, Hips and Chest IK can now be controlled from Controller inputs	2017-05-01 13:03:23 -07:00
Brad Davis	40e4e2f307	Merge pull request #10327 from jherico/face_tracker_refactor ... Remove Faceshift	2017-05-01 12:14:55 -07:00
Brad Davis	2b43a1989f	Moving face and eye trackers out of interface	2017-04-28 23:28:17 -07:00
Brad Davis	5e1bc0d908	Remove faceshift	2017-04-28 16:34:54 -07:00
Stephen Birarda	c518aa55be	Merge pull request #10312 from birarda/upload-new-models-to-entity ... add an entity file replacement via domain-server content page	2017-04-28 16:06:05 -07:00
Anthony J. Thibault	108cd80bb5	Merge branch 'master' into feature/head-standard-action	2017-04-28 10:41:29 -07:00
Stephen Birarda	9bc0609b1e	address code review comments	2017-04-28 10:17:48 -07:00
Anthony J. Thibault	2120e63e3a	Merge branch 'master' into feature/head-standard-action	2017-04-27 17:51:13 -07:00
Stephen Birarda	038ac745c8	clear domain octree details if ES killed	2017-04-27 17:47:18 -07:00
Zach Fox	3ce81844da	Snapshot JS interface for better Settings handling	2017-04-27 14:01:08 -07:00
Zach Fox	16b4af8a9d	Rearchitecture	2017-04-27 14:01:06 -07:00
ZappoMan	c0df82ff69	Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL	2017-04-26 18:49:24 -07:00
ZappoMan	834a447d62	remove debugging code	2017-04-26 18:36:44 -07:00
anshuman64	d146431e9b	Merge pull request #10268 from druiz17/input-recorder ... Input recorder/ input playback system for all input actions	2017-04-26 16:20:20 -07:00
Ryan Huffman	8ba56a96df	Merge pull request #10240 from zzmp/fix/hmd-tutorial ... Condition tutorial on active HMD	2017-04-26 14:00:02 -07:00
Anthony J. Thibault	ef43ff4b99	Add default pose matrices to InputCalibrationData structure	2017-04-26 11:55:24 -07:00
ZappoMan	5dd6daaad7	send identity on nodeActivated not nodeAdded	2017-04-26 11:42:38 -07:00
Dante Ruiz	d8e6e8e7d0	Merge branch 'master' of github.com:highfidelity/hifi into input-recorder	2017-04-26 16:53:02 +01:00
ZappoMan	65801cbb4d	Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL	2017-04-25 18:21:17 -07:00
ZappoMan	5164aa4056	hacking	2017-04-25 18:21:09 -07:00
ZappoMan	90cdeb9582	Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL	2017-04-25 16:09:59 -07:00
Atlante45	33f58f99d1	CR	2017-04-25 16:09:31 -07:00
Dante Ruiz	5a9cf554e7	Merge branch 'master' of github.com:highfidelity/hifi into input-recorder	2017-04-25 23:57:48 +01:00
Atlante45	a450f52427	Start to setup image library	2017-04-25 15:56:22 -07:00
Brad Hefta-Gaub	1962a49f3b	Merge pull request #10225 from sethalves/bullet-constraints-1 ... Bullet constraints + far-grab bootstrap fix	2017-04-25 13:36:47 -07:00
Zach Pomerantz	d2bfcce3f7	Merge pull request #10242 from zzmp/fix/display-log ... Send changed_display_mode after it changes	2017-04-25 16:36:12 -04: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
ZappoMan	aa955ee360	Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL	2017-04-24 17:36:30 -07:00
ZappoMan	c9aad6b762	new approach to the tpose fix, as well as other improvements	2017-04-24 17:36:05 -07:00
Dante Ruiz	f69691afd5	Merge branch 'master' of github.com:highfidelity/hifi into input-recorder	2017-04-24 19:57:48 +01:00
Dante Ruiz	d057dfebf0	got input recording to work	2017-04-24 19:57:38 +01:00
Seth Alves	17b83dd64c	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1	2017-04-21 17:19:47 -07:00
Ken Cooke	a5ed3007b3	Merge pull request #10248 from vladest/notify-sound-inject ... Notify sound inject	2017-04-21 09:26:36 -07:00
Dante Ruiz	641a7390ba	Merge branch 'master' of github.com:highfidelity/hifi into input-recorder	2017-04-21 16:46:55 +01:00
Vladyslav Stelmakhovskyi	2665ede06f	Audio injector cleanup	2017-04-20 21:32:14 +02:00
Vladyslav Stelmakhovskyi	b2533b6106	Code nitpick. Pointer cleanup on exit	2017-04-20 21:12:57 +02:00
Zach Pomerantz	b77917b8d1	Merge pull request #10241 from zzmp/fix/display-fail ... Update Display menu on unsuccesful selection	2017-04-20 12:04:51 -04:00
Vladyslav Stelmakhovskyi	06406ef7de	Merge branch 'master' into notify-sound-inject	2017-04-20 17:46:08 +02:00
Vladyslav Stelmakhovskyi	023d03d9f8	Implemented snap sound using sound injector	2017-04-20 17:43:16 +02:00
Seth Alves	f7378abb08	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1	2017-04-20 02:40:10 -07:00
Zach Fox	50456f71ed	Merge pull request #10142 from Triplelexx/21258 ... 21258 - Don't render (or heavily use GPU) when window in minimized	2017-04-19 16:26:49 -07:00
Dante Ruiz	d4c8d06575	Merge branch 'master' of github.com:highfidelity/hifi into input-recorder	2017-04-19 20:42:11 +01:00
Dante Ruiz	07f674eabe	exprting compressed file	2017-04-19 20:41:56 +01:00
Zach Pomerantz	e0cb809f58	add hmd:bool to changed_display_mode	2017-04-18 18:48:28 -04:00
Zach Pomerantz	858a1db38b	only log changed_display_mode on successful change	2017-04-18 18:48:23 -04:00
Zach Pomerantz	c7a7fa90ec	update Display menu on unsuccesful selection	2017-04-18 18:47:57 -04:00
Zach Pomerantz	a310acd37f	check HMD usage for tutorial teleport	2017-04-18 18:46:53 -04:00
Dante Ruiz	f8ec49eb96	Merge branch 'master' of github.com:highfidelity/hifi into input-recorder	2017-04-18 21:53:37 +01:00
Dante Ruiz	5cd4007aaa	got input recording working	2017-04-18 21:53:23 +01:00
Seth Alves	0807e036e8	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1	2017-04-18 11:59:23 -07:00