81430 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David Rowe	5292dddc39	Rewrite toolbarTest.js	2019-10-12 10:10:41 +13:00
David Rowe	f944604120	Deprecate Toolbar API's addButton() and removeButton() methods	2019-10-12 10:10:27 +13:00
Sam Gateau	93e266cde5	Merge pull request #16333 from highfidelity/revert-16307-colossal-cave ... Revert "DEV-1811: apply deletion rules to linked entities"	2019-10-11 13:13:55 -07:00
dooglifeSF	0b3823645b	Merge branch 'master' into Fix-stand-talk-pops	2019-10-11 13:08:26 -07:00
Zach Fox	222b1fbd20	Fix bug with debugFTUE === 1	2019-10-11 12:26:12 -07:00
Maia Hansen	330b09d012	Merge pull request #16330 from highfidelity/Fix-erratic-seated-idles-and-fidgets ... Fix erratic seated idles and fidgets.	2019-10-11 11:23:20 -07:00
Brad Hefta-Gaub	51669e1ac3	Revert "DEV-1811: apply deletion rules to linked entities"	2019-10-11 11:06:10 -07:00
dooglifeSF	96510429ba	Fix stand talking pops	2019-10-11 10:44:50 -07:00
dooglifeSF	df11977b39	remove all transitions from seated except idle via isNotSeated	2019-10-11 09:54:10 -07:00
dante ruiz	e52d2ff342	fix mac TextFields	2019-10-10 20:57:30 -07:00
Clement	3b21dfcd0a	CR	2019-10-10 17:49:51 -07:00
Clement	0df6661f5b	Fix incorrect assert	2019-10-10 15:57:05 -07:00
Clement	390c7b14c9	Don't post account settings after pull ... Account settings would always get pushed after a pull even if they hadn't changed	2019-10-10 15:55:19 -07:00
Clement	2f8c3f2f24	Add bullet patch for clang 8 compatibility	2019-10-10 15:52:36 -07:00
Zach Fox	19acd76854	Modify InteractiveWindow positions in C++ instead of JS, resulting in huge speedup	2019-10-10 15:48:40 -07:00
Ken Cooke	8325ee2c8e	Merge pull request #16327 from kencooke/audio-device-sleep-wake ... DEV-1901: No audio in Interface when restoring from sleep	2019-10-10 15:12:07 -07:00
Ken Cooke	ec67b67966	On waking from sleep/hibernate, restart the audio devices	2019-10-10 14:10:47 -07:00
Maia Hansen	07b916f0b7	Merge pull request #16307 from AndrewMeadows/colossal-cave ... DEV-1811: apply deletion rules to linked entities	2019-10-10 13:24:43 -07:00
Zach Fox	eb697f1dc2	Merge pull request #16325 from zfox23/removeRunClientTest ... DEV-2386: Remove 'Run Client Script Test'	2019-10-10 15:06:12 -04:00
Zach Fox	7256abc6b0	Merge pull request #16326 from zfox23/shadowsTooltip ... DEV-2379: Modify Shadow-related tooltips in Create	2019-10-10 14:55:15 -04:00
Zach Fox	3f00c524fb	DEV-2379: Modify Shadow-related tooltips in Create	2019-10-10 11:47:40 -07:00
Zach Fox	240f904b85	DEV-2386: Remove 'Run Client Script Test'	2019-10-10 11:11:27 -07:00
dante ruiz	e505174041	fix mac compile problem	2019-10-10 09:52:07 -07:00
Sam Gateau	597d4b1af7	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-10-10 09:02:44 -07:00
Brad Hefta-Gaub	1316f9b046	Merge pull request #16301 from dooglifeSF/drivekey_anim_triggers ... Drivekey anim triggers	2019-10-09 18:25:10 -07:00
Ryan Huffman	4f0936d384	Merge branch 'qt-launcher' of github.com:danteruiz/hifi into qt-launcher	2019-10-09 17:00:43 -07:00
Ryan Huffman	859e8b4ea9	Update qt launcher messaging to reflect feedback	2019-10-09 17:00:34 -07:00
dante ruiz	ac4346125d	fix home location problem	2019-10-09 16:39:31 -07:00
Zach Fox	a5caa36f07	Merge pull request #16318 from MiladNazeri/dev-2082/cannont-click-yourself-in-third-person-for-nametag ... dev-2082/cannot-click-yourself-in-third-person-for-nametag	2019-10-09 19:34:00 -04:00
Shannon Romano	a52b8acf4d	Merge pull request #16306 from huffman/feat/hq-launcher-serverless ... DEV-2374: Add serverless content back to launcher builds	2019-10-09 16:15:58 -07:00
Brad Hefta-Gaub	3efc24d49c	Merge pull request #16319 from sethalves/LOD-20-20-for-android ... force LOD to be 20-20 on android, and force lodAngleDeg to 0.248	2019-10-09 16:02:01 -07:00
Zach Fox	609f6f9a25	Fix minimize bug; fix bug where FTUE window appears behind Interface window	2019-10-09 15:46:50 -07:00
Maia Hansen	6b5f90f641	Merge pull request #16315 from jherico/qt_5.13 ... Qt 5.13 changes	2019-10-09 15:04:07 -07:00
Zach Fox	2220234d68	Removed yellow	2019-10-09 14:33:28 -07:00
Zach Fox	bed1192d70	A bunch of fixes, plus added a debug mode Settings switch	2019-10-09 14:18:36 -07:00
Seth Alves	1ce3cebe1f	force LOD to be 20-20 on android, and force lodAngleDeg to 0.248	2019-10-09 14:04:44 -07:00
milad	77d17e0ff7	removed extra disconnect function	2019-10-09 13:26:53 -07:00
Zach Fox	601f7ac5e9	Merge branch 'master' of github.com:highfidelity/hifi into friction	2019-10-09 13:26:21 -07:00
milad	e2fee5361d	updated startup/shutdown	2019-10-09 13:09:38 -07:00
milad	06244338d6	updated nametags to work in selfie mode	2019-10-09 12:36:44 -07:00
luiscuenca	fc018257e1	Select avatar to look using API. Blink when look at change	2019-10-09 12:20:35 -07:00
dooglifeSF	85b681e70e	switch abs() to fabsf()	2019-10-09 11:07:14 -07:00
Shannon Romano	f71dfa065c	Merge pull request #16314 from huffman/fix/oculus-touch-calibration-crash ... DEV-841: Fix oculus calibration screen crash if touch is not turned on	2019-10-09 10:44:03 -07:00
dooglifeSF	2a1258968a	Change macro to const float, use floats in control flow.	2019-10-09 10:10:45 -07:00
Sam Gateau	ff36b7a390	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-10-09 10:00:56 -07:00
Shannon Romano	b3d974504a	Merge pull request #16316 from luiscuenca/fixForwardEyeLookAt ... DEV-2285: Fix eye look at forward vector	2019-10-09 09:13:02 -07:00
Ryan Huffman	38e4545830	Merge branch 'qt-launcher' of github.com:danteruiz/hifi into qt-launcher	2019-10-09 09:04:10 -07:00
Ryan Huffman	4d990d3634	Disable submit button in qt launcher if fields empty	2019-10-09 09:03:49 -07:00
Ryan Huffman	3196770152	Update qtlite on Windows	2019-10-09 09:00:55 -07:00
dooglifeSF	8a262a3d1a	Merge branch 'master' into drivekey_anim_triggers	2019-10-09 07:37:38 -07:00