6124 commits

Author	SHA1	Message	Date
David Kelly	ff5b37c785	new --scripts switch overrides default scripts location	2017-06-22 14:09:05 -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
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
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
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
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
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
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	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
Seth Alves	39fb94d76d	fix bug that causes hmd avatar eyes to be all the way to the side when there's not another avatar to look at	2017-06-19 11:21:08 -07:00
Zach Fox	08eb07242d	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-19 10:31:31 -07:00
Vladyslav Stelmakhovskyi	59a77c16bd	Cleanup	2017-06-18 20:59:22 +02:00
Vladyslav Stelmakhovskyi	b8bb8026ca	Merge branch 'master' into fix_tablet_buttons_qt59	2017-06-17 22:30:00 +02:00
Vladyslav Stelmakhovskyi	5a0783c38c	Send mouse events before touch event. It seems the order is important for Qt 5.9	2017-06-17 22:24:27 +02:00
Brad Davis	a69cf31f4b	PR feedback and cmake fixes	2017-06-16 16:59:58 -07:00
Dante Ruiz	da29157a3c	fixed merge conflict'	2017-06-17 00:40:50 +01:00
Zach Fox	7a76c9cf7f	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-16 14:59:23 -07:00
Brad Davis	fece438602	Cleanup and refactoring	2017-06-15 18:58:56 -07:00
Zach Pomerantz	3093a73ce1	Merge branch 'master' of github.com:highfidelity/hifi into audio/parity	2017-06-15 15:04:06 -04:00
Zach Fox	60549075dd	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-15 10:09:07 -07:00
Brad Hefta-Gaub	035a9e898f	Merge pull request #10684 from howard-stearns/avatar-whitelist ... avatar whitelist	2017-06-15 08:45:16 -07:00
Dante Ruiz	d65c0dfbac	Merge branch 'master' of github.com:highfidelity/hifi into controller-ui	2017-06-15 16:24:59 +01:00
Brad Davis	7a6df850c5	Fix crash on exit when tablet is open	2017-06-14 13:22:53 -07:00
Howard Stearns	87f3ce7699	reset avatar on domain change if the last domain imposed something on us	2017-06-13 19:30:01 -07:00
Zach Pomerantz	b24681125d	rm debugging	2017-06-13 18:16:16 -04:00
Zach Pomerantz	d4797dc9f8	update shift-x	2017-06-13 17:44:59 -04:00
Zach Pomerantz	a8f69bb2e0	Merge branch 'master' of github.com:highfidelity/hifi into audio/parity	2017-06-13 17:41:52 -04:00
Zach Pomerantz	4a39798a97	sticky audio selection	2017-06-13 14:38:52 -04:00
NeetBhagat	9646eba873	Complete console.trace and added a testcases for all 13 functions.	2017-06-13 23:52:48 +05:30
Zach Fox	ec162327a2	Merge branch 'spectator-camera' into flash	2017-06-13 10:22:02 -07:00
Zach Fox	7d1a7f4c0b	Merge branch 'master' of https://github.com/highfidelity/hifi into ... spectator-camera - INCLUDING MERGE CONFLICT FIXES	2017-06-13 09:42:14 -07:00
Zach Pomerantz	89bd895054	mv showAudioTools to just AvatarInputs	2017-06-13 12:31:05 -04:00
NeetBhagat	b0e9c62c12	Merge branch 'master' of https://github.com/highfidelity/hifi into 21369	2017-06-13 10:10:44 +05:30
Sam Cake	f973f7b5e3	Fix the background not rendering on the second frame, this was imply due to a bug in the GLBackend	2017-06-12 21:25:27 -07:00