66317 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
amantley	4b1f974561	fixed merge conflict for declaring _hmdLeanRecenterEnabled in MyAvatar.h	2018-03-28 11:57:48 -07:00
Zach Fox	0175028a88	Ensure location is correctly updated when replacing set from Checkout page	2018-03-28 11:31:51 -07:00
John Conklin II	5a7267a844	Merge pull request #12671 from Triplelexx/21794_inspect_avatars ... WL#21794: Modify inspect.js to work with Avatars as well as entities	2018-03-28 10:44:30 -07:00
amantley	95f1d0e4fa	added get and set functions for the activate recenter variables	2018-03-28 10:33:00 -07:00
Zach Fox	ca2fba675d	Merge branch 'master' of github.com:highfidelity/hifi into newUpdateCertLocation	2018-03-28 10:28:32 -07:00
Brad Hefta-Gaub	16df773de4	Merge pull request #12721 from highfidelity/RC66 ... RC66 - Mergeback	2018-03-28 09:55:46 -07:00
John Conklin II	586fb4829c	Merge pull request #12637 from druiz17/fix-asset-server-qml ... Fix asset server qml sorting	2018-03-28 09:35:53 -07:00
John Conklin II	d59a721f16	Merge pull request #12724 from sethalves/fix-entity-import ... fix entity importing	2018-03-28 09:18:20 -07:00
Brad Davis	9be162de95	Synchronously shut down QML rendering threads	2018-03-28 09:13:46 -07:00
Brad Davis	aacfe92751	Don't trigger crashes from timers while waiting for some operation on exit	2018-03-28 09:09:56 -07:00
Olivier Prat	7fa5e384b9	Merge branch 'master' of http://github.com/highfidelity/hifi into fade	2018-03-28 11:21:07 -04:00
Seth Alves	46fb2033f2	Merge pull request #12574 from druiz17/remap-keybaord ... changing keyboard mapping	2018-03-27 19:00:05 -07:00
Seth Alves	bb101956a6	fix entity importing	2018-03-27 18:25:43 -07:00
amantley	9f3b82a417	added the functions triggerVerticalRecenter,triggerHorizontalRecenter,and triggerRotationRecenter to MyAvatar.h, these allow java script calls to recenter the avatar on the fly	2018-03-27 18:21:14 -07:00
Dante Ruiz	ad9ca0da20	fix tablet version	2018-03-27 16:03:06 -07:00
John Conklin II	a258a330d3	Merge pull request #12676 from druiz17/fix-keyboard ... fixing AddressManager keyboard when switching domains	2018-03-27 15:34:23 -07:00
Dante Ruiz	197662fd5e	fix contextOverlay highlighing all entities	2018-03-27 15:22:22 -07:00
Brad Davis	29106fbbbe	Prevent potential double delete of QML overlays	2018-03-27 14:18:19 -07:00
Brad Davis	eb20181b60	Shut down the overlay interface on exit	2018-03-27 14:18:01 -07:00
Dante Ruiz	3d7f7f0e62	fix parent tree grabbing	2018-03-27 14:05:43 -07:00
John Conklin II	0862f345fe	Merge pull request #12717 from sethalves/workaround-dialog-crash ... fix -- work around asset-upload dialog crash	2018-03-27 13:35:50 -07:00
Clément Brisset	d8042f78e8	Merge pull request #12713 from highfidelity/RC66 ... RC66 - Merge Back	2018-03-27 13:01:14 -07:00
John Conklin II	bcd2de3bf8	Merge pull request #12660 from alexiamandeville/awayImage-update ... Update away image and image paths	2018-03-27 12:46:37 -07:00
John Conklin II	7c505a0b85	Merge pull request #12711 from sethalves/serverless-tutorial-rc66 ... Serverless tutorial rc66	2018-03-27 11:17:07 -07:00
Seth Alves	4f7d856a1c	don't free dialogs to avoid crash in setKeyboardRaised	2018-03-27 09:28:55 -07:00
David Rowe	d1d58eceab	Add Window.raise() as replacement for Window.raiseMainWindow()	2018-03-27 13:04:50 +13:00
unknown	194b00d732	fix translate arrow normals	2018-03-26 16:31:58 -07:00
Zach Fox	db2f3451bd	Support .content.zip content sets	2018-03-26 16:20:29 -07:00
Zach Fox	00c70278c8	Add getCreatedAgo()	2018-03-26 15:03:10 -07:00
Zach Fox	bf48ecda6d	Fix cert location for content sets	2018-03-26 14:48:05 -07:00
Alexander Ivash	06410ec342	temporarily select 'similar-by-title' device if previously selected one was unlplugged; re-select originally selected device if it was re-plugged	2018-03-27 00:44:17 +03:00
John Conklin II	3e23ad4900	Merge pull request #12709 from zfox23/RC66_commerce_fixCheckoutInfiniteLoad ... RC66: Fix infinite loading when authing wallet during Checkout	2018-03-26 14:33:57 -07:00
Seth Alves	60ed033667	new content md5	2018-03-26 14:33:08 -07:00
Ryan Huffman	d01a58517f	Fix serverless content not using correct directories	2018-03-26 14:32:52 -07:00
Seth Alves	6948de7e24	default to serverless tutorial	2018-03-26 14:32:40 -07:00
Stephen Birarda	787947b6a8	add a default tutorial json for dev interface	2018-03-26 14:32:26 -07:00
Stephen Birarda	b52a877d8d	optionally grab serverless tutorial, on for installers	2018-03-26 14:32:11 -07:00
Zach Fox	a588776b47	Fix infinite loading when authing wallet during Checkout	2018-03-26 13:19:40 -07:00
Dante Ruiz	0c6f5bb04d	adding python baking scripts	2018-03-26 10:51:25 -07:00
Dante Ruiz	1f23e7ab8b	fixing more edge cases	2018-03-26 10:15:15 -07:00
Dante Ruiz	b8796db1e5	Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord	2018-03-26 09:13:58 -07:00
Cristian Luis Duarte	6cb5cd7f92	Merge remote-tracking branch 'hifi/master' into android_ui_not_move_camera	2018-03-26 11:19:42 -03:00
Alexander Ivash	8e551f4dc0	re-select re-plugged device	2018-03-25 13:49:59 +03:00
Alexander Ivash	3c45f17d70	remove unused code	2018-03-25 13:44:16 +03:00
Alexander Ivash	f6bbdec902	remove 'isHMD' from input parameters of AudioDeviceList::onDevicesChanged ... note: having 'isHMD' as a parameter doesn't make sense because function rebuilds model which is used by both HMD and Desktop	2018-03-25 13:43:51 +03:00
Sam Gondelman	11f5e7812b	Merge pull request #12702 from SamGondelman/android ... Android: Fix tonemapping	2018-03-23 17:43:57 -07:00
Dante Ruiz	96707a2568	fix mappoing conflicts	2018-03-23 16:43:36 -07:00
Cristian Luis Duarte	686af4ff77	Clean code that manually checked for windows coordinates to disable radar touch	2018-03-23 20:02:51 -03:00
Cristian Luis Duarte	242b009562	Android - Use mouse events for interacting with UI. Now LoginDialog UI interation does not move radar camera. Remove repeated tooggle call in audio.js. Adapt button to simulated mouse events.	2018-03-23 18:59:55 -03:00
SamGondelman	a19f71e759	fix tonemapping on android	2018-03-23 14:16:47 -07:00