17915 commits

Author	SHA1	Message	Date
Brad Davis	fe7d4b1d23	Remove dependency between codec plugins and UI	2017-06-23 12:25:18 -07:00
David Kelly	63279f4525	Merge pull request #10790 from davidkelly/dk/scriptsSwitch ... Command line switch to override default scripts location	2017-06-23 08:53:40 -07:00
druiz17	91ce9235ea	Merge pull request #10747 from zzmp/audio/select-log ... Log audio selections	2017-06-23 07:54:03 -07:00
Zach Pomerantz	a82cc0ec09	retab	2017-06-23 09:35:48 -04:00
David Kelly	06d1ac8bf7	Merge remote-tracking branch 'upstream/master' into dk/scriptsSwitch	2017-06-22 14:14:54 -07:00
David Kelly	ff5b37c785	new --scripts switch overrides default scripts location	2017-06-22 14:09:05 -07:00
Andrew Meadows	62e862fef0	Merge pull request #10733 from Menithal/21384 ... 21384: Added Support to Disabling flight from client side	2017-06-22 13:38:01 -07:00
David Kelly	34edd95926	Merge pull request #10776 from davidkelly/dk/avatarUrlSwitch ... new switches to override avatarURL	2017-06-22 07:11:29 -07:00
David Kelly	5da01f0074	updated comments	2017-06-22 07:09:24 -07:00
Seth Alves	c70365d04a	Merge pull request #10729 from druiz17/hand-pucks ... Hand pucks and Calibration UI	2017-06-21 18:10:15 -07:00
Howard Stearns	ea5b074f6e	Merge pull request #10758 from howard-stearns/event-installer-interface-options ... Event installer interface options	2017-06-21 16:46:06 -07:00
David Kelly	92cbb86e8b	remove debugging	2017-06-21 16:09:08 -07:00
David Kelly	94a33fea94	new switches to override avatarURL	2017-06-21 16:03:05 -07:00
Chris Collins	f3ae1d8078	Merge pull request #10750 from Atlante45/master ... Stable -> Master	2017-06-21 13:34:28 -07:00
Anthony Thibault	a12109ed26	Merge pull request #10761 from hyperlogic/bug-fix/avatar-no-eyes ... Bug Fixes for Eyeless Avatars	2017-06-21 10:59:55 -07:00
Brad Hefta-Gaub	f7d42c782d	Merge pull request #10764 from thoys/feat/ac-location-jsapi ... Expose location scripting interface to Agent (AC script)	2017-06-21 10:22:48 -07:00
Thijs Wenker	47643e1efe	Expose location API to Agent scripts (side-effect, agents now can teleport)	2017-06-21 06:31:36 +02:00
Howard Stearns	fea8a95fc7	Don't leave running markers around if they weren't there before and we quit after reporting (protocol)version.	2017-06-20 18:09:27 -07:00
Howard Stearns	ac1d4d9636	Merge branch 'master' of https://github.com/highfidelity/hifi into event-installer-interface-options	2017-06-20 17:57:12 -07:00
Dante Ruiz	5e82b13d65	removed double include	2017-06-21 01:15:17 +01:00
Dante Ruiz	b7286db523	fixed merge conflict	2017-06-21 01:10:54 +01:00
Dante Ruiz	2c3db0fb91	finished calibration-ui	2017-06-21 01:07:12 +01:00
Atlante45	6bd1946e96	Merge branch 'stable' of https://github.com/highfidelity/hifi	2017-06-20 16:36:57 -07:00
Zach Pomerantz	8e1cf763e3	Merge pull request #10756 from zzmp/audio/input-level ... Update chrome for the audio input level meter	2017-06-20 15:33:17 -07:00
Zach Pomerantz	7e84f67391	Merge pull request #10744 from zzmp/audio/output-sample ... Add "Play sample sound" to audio setting	2017-06-20 15:32:57 -07:00
howard-stearns	41003bd307	Merge branch 'master' of https://github.com/highfidelity/hifi into event-installer-interface-options	2017-06-20 13:25:38 -07:00
howard-stearns	480ff784b9	add a skipTutorial option, that does not change settings	2017-06-20 13:25:03 -07:00
Zach Pomerantz	f55d842fac	add SoundCache to tablet for PlaySampleSound	2017-06-20 12:16:08 -07:00
Matti Lahtinen	256484cd21	Removed Whitespace	2017-06-20 21:44:32 +03:00
Zach Pomerantz	8436d0cc6b	rm unused AvatarInputs props	2017-06-20 11:43:02 -07:00
Brad Hefta-Gaub	cbded766b1	Merge pull request #10676 from NeetBhagat/21369 ... WL 21369 - Implement parts of the JS "console" object	2017-06-20 11:06:34 -07:00
Anthony J. Thibault	29e3af820b	Fix for avatars with no eyes. ... The calculation of the centerEyeCalibration matrix (and several others) were incorrect.	2017-06-20 10:14:34 -07:00
howard-stearns	d71666f337	Remove useless command line arg for steam, but add one for version.	2017-06-20 09:59:15 -07:00
howard-stearns	974768390c	Merge branch 'master' of https://github.com/highfidelity/hifi into event-installer-interface-options	2017-06-20 09:47:52 -07:00
Anthony J. Thibault	21c0e45d87	recenter rotation while driving. ... This should reduce foot sliding in HMD mode.	2017-06-20 09:43:38 -07:00
Dante Ruiz	13dff29bd5	adding calibration screen	2017-06-20 01:19:10 +01:00
Zach Pomerantz	497ee3a522	add Audio.inputLevel	2017-06-19 17:07:43 -07:00
Zach Pomerantz	4bff925506	rm unused bools	2017-06-19 17:01:39 -07:00
Zach Pomerantz	3d80774317	clean up select_audio_device	2017-06-19 15:57:24 -07:00
Zach Pomerantz	837f37220a	log selected_audio_device	2017-06-19 15:11:02 -07:00
Zach Pomerantz	5f236bd025	simplify device settings	2017-06-19 15:11:02 -07:00
Zach Pomerantz	5c0e9e7496	improve wording for MyAvatar.qmlPosition doc	2017-06-19 14:52:32 -07:00
Zach Pomerantz	a7e1b75909	stopgap with MyAvatar.qmlPosition	2017-06-19 14:41:01 -07:00
howard-stearns	91656a5fe5	Merge branch 'master' of https://github.com/highfidelity/hifi into event-installer-interface-options	2017-06-19 14:22:12 -07:00
Zach Fox	2e215e6544	Fix build problems	2017-06-19 14:04:51 -07:00
Zach Fox	cbdffce88e	Merge branch 'master' of https://github.com/highfidelity/hifi into spectatorCamera_mergeable_20170619	2017-06-19 13:53:29 -07:00
Dante Ruiz	cfffb74a29	Merge branch 'master' of github.com:highfidelity/hifi into hand-pucks	2017-06-19 21:40:26 +01:00
Brad Davis	ed6620fc51	Merge pull request #10718 from jherico/frame_thread ... Cleanup and refactoring	2017-06-19 13:31:44 -07:00
howard-stearns	c6d66d439b	report and quit command line switches	2017-06-19 12:57:26 -07:00
Matti Lahtinen	82df64d5e7	flyingAllowed to zoneAllowsFlying	2017-06-19 21:44:43 +03:00