1488 commits

Author	SHA1	Message	Date
Andrew Meadows	02e3b22621	remove hot-key for disable of scripted motor	2017-12-20 08:43:56 -08:00
Andrew Meadows	f82de05f9c	defang accidental disable of MyAvatar's default motor	2017-12-20 08:42:42 -08:00
Brad Davis	9f7b6f543d	Merge remote-tracking branch 'upstream/master' into HEAD	2017-12-18 11:17:07 -08:00
Andrew Meadows	74a1f5de96	remove bullet stats when physics stats disabled	2017-12-11 11:31:00 -08:00
Zach Fox	a81a981676	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-08 09:44:52 -08:00
Zach Fox	b2bafed2bb	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-07 11:21:24 -08:00
luiscuenca	390c59b45c	Change menu and minor fixes	2017-12-04 15:29:01 -08:00
luiscuenca	ad02118588	fixed menu error	2017-11-26 23:43:13 -07:00
luiscuenca	027d2d323c	Measure tool and corrections	2017-11-26 22:28:34 -07:00
Alexander Ivash	c4aa937108	adjust to coding standards	2017-11-18 11:16:40 +03:00
Brad Davis	d162e1cff6	Whitelist functionality for tablet apps	2017-11-04 15:14:06 -07:00
vladest	2f86658308	Move Tablet becomes toolbar menu from General to Developer menu	2017-09-14 16:37:02 +02:00
Chris Collins	47a2e57e26	Merge pull request #10625 from humbletim/21180-C++ ... CR 21180-C++ Camera app -- core changes	2017-08-30 07:20:00 -07:00
beholder	cbbe03cee7	6788: You can deselect your current view mode	2017-08-25 02:33:11 +03:00
humbletim	9348048387	Merge remote-tracking branch 'upstream/master' into 21180-C++	2017-08-24 16:23:47 -04:00
Anthony J. Thibault	49adf04913	Added Developer > Avatar > Show Detailed Collision menu option	2017-08-10 16:36:09 -07:00
humbletim	3bcbec87e0	Merge remote-tracking branch 'upstream/master' into 21180-C++	2017-07-30 16:15:34 -04:00
Seth Alves	9c9cfad4c4	use ctrl rather than alt to activate camera-mode shortcuts	2017-07-26 15:56:08 -07:00
Seth Alves	766c6f48c3	third person camera is alt+G rather than alt+O	2017-07-24 17:43:01 -07:00
Seth Alves	82a787a753	use alt+h for mirror-mode	2017-07-24 16:04:11 -07:00
Seth Alves	e53badf88b	use alt+f for 1st person camera and alt+o for 3rd	2017-07-24 15:56:37 -07:00
humbletim	f9e0e616f7	Merge remote-tracking branch 'upstream/master' into 21180-C++	2017-07-18 17:34:39 -04:00
Andrew Meadows	364600c447	fix rendering of simulation ownership debug icons	2017-07-12 11:12:47 -07:00
Zach Fox	3d14d3755e	Merge pull request #10898 from 1P-Cusack/21425 ... Add View->Enter First Person Mode in HMD checkbox.	2017-07-07 14:01:36 -07:00
Andrew Meadows	57842ce5a5	Merge pull request #10878 from mnafees/21355 ... CR for Job #21355 - Clean up and remove menu hotkeys	2017-07-07 14:01:21 -07:00
1P-Cusack	77001712ab	Default 'Enter First Person Mode in HMD' to true.	2017-07-07 15:35:32 -04:00
Dante Ruiz	9e4b5693c7	fixed merge conflicts	2017-07-06 18:49:46 +01:00
Mohammed Nafees	eb354a4333	Cleanup menu shortcut keys	2017-07-05 14:50:48 +05:30
1P-Cusack	38baeabbe5	Add View->Enter First Person Mode in HMD checkbox. ... When checked, changing to an HMD display will switch the user to first person mode. WL 21425.	2017-07-03 15:21:40 -04:00
humbletim	026e05f80c	Merge remote-tracking branch 'upstream/master' into 21180-C++	2017-07-03 11:55:59 -04:00
David Rowe	6e266dfbac	Merge branch 'master' into 21396	2017-06-24 09:19:12 +12:00
humbletim	f6262ad54d	Merge remote-tracking branch 'upstream/master' into 21180-C++	2017-06-23 16:37:10 -04:00
Brad Hefta-Gaub	dc649e84df	Merge pull request #10792 from jherico/qml_crashes ... Trying to fix QtQml/QtScript crashes	2017-06-23 12:41:43 -07:00
David Rowe	9d0407cbdf	Merge branch 'master' into 21396	2017-06-23 16:52:04 +12:00
Brad Davis	4439de240a	Trying to fix QtQml/QtScript crashes	2017-06-22 16:39:57 -07: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 Rowe	6ff8aed5e3	Merge branch 'master' into 21396	2017-06-22 23:54:15 +12:00
Dante Ruiz	2c3db0fb91	finished calibration-ui	2017-06-21 01:07:12 +01:00
Dante Ruiz	13dff29bd5	adding calibration screen	2017-06-20 01:19:10 +01:00
Dante Ruiz	da29157a3c	fixed merge conflict'	2017-06-17 00:40:50 +01:00
humbletim	fc33e95e2d	Merge branch 'master' into 21180-C++	2017-06-16 16:16:42 -04:00
David Rowe	a8501a7ac6	Remove old Leap Motion code	2017-06-15 14:45:40 +12:00
Menithal	c92e22fd20	21384: Added Menu Option	2017-06-14 19:05:00 +03:00
Zach Pomerantz	b24681125d	rm debugging	2017-06-13 18:16:16 -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	b37a0239b0	up to reverb (needs cherry-picking)	2017-06-12 18:00:52 -04:00
Zach Pomerantz	2b99f299c8	testing	2017-06-06 17:54:52 -04:00
Dante Ruiz	038ffe920a	fixing merge conflicts	2017-06-06 16:42:08 +01:00