66465 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Cristian Luis Duarte	a7328f0934	Fix View not attached to windown manager crash when starting the app in landscape mode on Pixel XL	2018-04-12 15:55:20 -03:00
Cristian Luis Duarte	b031c1c070	Merge remote-tracking branch 'gcgithub/android_goto_splash' into android_goto_splash	2018-04-12 14:32:07 -03:00
Gabriel Calero	865e3a05f1	Move jump button to the right. Adjust position of buttons	2018-04-11 19:33:43 -03:00
Gabriel Calero	8010fd2420	New view selector behaviour. Update icons	2018-04-11 18:43:39 -03:00
Cristian Luis Duarte	d993e4938e	Merge remote-tracking branch 'hifi/master' into android_goto_splash	2018-04-11 18:03:16 -03:00
John Conklin II	7a905ed420	Merge pull request #12777 from ctrlaltdavid/21813 ... Fix Window API position and size reporting	2018-04-11 13:48:21 -07:00
John Conklin II	42a3834e1a	Merge pull request #12772 from howard-stearns/commerce-workaround-for-broken-qt5.10 ... Commerce workaround for broken qt5.10	2018-04-11 13:08:42 -07:00
Gabriel Calero	578012b662	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-04-11 16:30:53 -03:00
Gabriel Calero	28b63c2593	Merge branch 'android_goto_splash' of https://github.com/gcalero/hifi into android_goto_splash	2018-04-11 16:29:16 -03:00
John Conklin II	854d3d7804	Merge pull request #12765 from ctrlaltdavid/21822 ... Fix text sizing per text3d overlay lineHeight property	2018-04-11 12:16:51 -07:00
John Conklin II	88a151481d	Merge pull request #12763 from sethalves/ess-can-edit-localX ... allow ESS to make relative-to-parent edits when entity is not in ESS's octree	2018-04-11 12:08:35 -07:00
John Conklin II	19bf793910	Merge pull request #12761 from ctrlaltdavid/21821 ... Add Controller.Actions.Sprint as synonym of Controller.Actions.SPRINT	2018-04-11 12:07:32 -07:00
John Conklin II	2f4bc5bd04	Merge pull request #12701 from misslivirose/fix-edit-grid-color ... Fix for grid color changes not applying	2018-04-11 12:06:09 -07:00
John Conklin II	28168e6e45	Merge pull request #12699 from misslivirose/fix/save-settings-for-editing ... Fix for edit preferences not persisting	2018-04-11 11:59:58 -07:00
MiladNazeri	9f7a765ec3	Merge pull request #12729 from ctrlaltdavid/21814 ... Settings API JSDoc	2018-04-11 11:48:15 -07:00
Zach Fox	0c9d65bc15	Merge pull request #12758 from zfox23/commerce_fixCertificateInfoError ... Commerce: Fix Certificate Info error	2018-04-11 09:38:43 -07:00
Liv	c7be6e0934	Update edit.js ... remove the unneeded manual removal of the create setting - it's handled with the rest of the menu items now, and this was causing it to default to false every start.. tested locally but might have gotten in a weird state, so fixing in GH editor.	2018-04-10 12:15:57 -07:00
Seth Alves	d8f0cfa89a	Merge pull request #12797 from druiz17/update-bake-tool ... update python bake tool	2018-04-10 10:20:38 -07:00
Liv Erickson	20ee169054	two more spaces	2018-04-10 09:23:14 -07:00
Liv Erickson	6c15577653	style fixes for eslint	2018-04-10 09:18:54 -07:00
Sam Gondelman	d781cf43ee	Merge pull request #12775 from Cristo86/android_jump ... Android Control - jump and view sensitivity	2018-04-09 17:32:57 -07:00
Cristian Luis Duarte	1242446c52	Cleanup controller code	2018-04-09 19:57:55 -03:00
Clément Brisset	c62a701a2d	Merge pull request #12838 from highfidelity/RC66 ... RC66 merge back to master	2018-04-09 13:17:12 -07:00
John Conklin II	4dcab95b40	Merge pull request #12828 from Atlante45/fix/skybox-baking ... Fix skybox baking	2018-04-09 11:55:51 -07:00
John Conklin II	890a63afb4	Merge pull request #12833 from ElderOrb/FB14015_RC66 ... Close 'goto' app on pressing 'forward' / 'backward' buttons	2018-04-09 11:42:17 -07:00
John Conklin II	d281d7b2cb	Merge pull request #12819 from Atlante45/fix/location-hostname ... Fix location.hostname	2018-04-09 09:42:41 -07:00
John Conklin II	be3d5d03cc	Merge pull request #12808 from ElderOrb/FB13962_RC66 ... Fix for auto-reopening of closed query dialogs (aka hack-on-top-of-hack)	2018-04-09 09:42:00 -07:00
Gabriel Calero	b30cb25a3f	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-04-09 12:20:35 -03:00
Gabriel Calero	e85f5c97dc	Remove bottom bar. Apply new design for android	2018-04-09 11:41:00 -03:00
Alexander Ivash	faddc556d7	FB14015 - Go To app does not close when selecting forward and back arrows on desktop	2018-04-07 17:57:22 +03:00
Clement	6e7f8a2ef6	Fix value collision for baking version	2018-04-06 17:24:16 -07:00
Sam Gateau	ae0af3ab62	Merge pull request #12823 from druiz17/fix-selection-api ... fix enableHighlightList and disableHihglightList function for Selection API	2018-04-06 15:13:15 -07:00
Cristian Luis Duarte	f556c8d3a7	Merge remote-tracking branch 'hifi/master' into android_jump	2018-04-06 18:02:30 -03:00
Dante Ruiz	00713ab225	fix selection api	2018-04-06 14:00:50 -07:00
John Conklin II	02422ba538	Merge pull request #12820 from birarda/bug/store-serverless-with-tilde ... RC66 - move file ~ expansion from AddressManager to DomainHandler	2018-04-06 13:31:01 -07:00
Clement	dea5382991	Fix location.hostname	2018-04-06 13:19:07 -07:00
John Conklin II	fe5e797a24	Merge pull request #12816 from SamGondelman/web66 ... RC66: Possible fix for QML texture leak	2018-04-06 13:08:50 -07:00
Cristian Luis Duarte	bd6f0fd59e	Make view/rotation control independent of touchUpdate events rate	2018-04-06 16:17:28 -03:00
John Conklin II	f6721d4ad0	Merge pull request #12802 from birarda/client-only-installer-name ... 66 fix - installer changes for client only name and clean install	2018-04-06 11:53:22 -07:00
Zach Fox	0c48ccefa4	Clean up failResponse to make it better	2018-04-06 11:41:17 -07:00
Stephen Birarda	1ff7939735	move file ~ expansion from AddressManager to DomainHandler	2018-04-06 11:05:17 -07:00
Zach Fox	af5a68b282	Merge branch 'master' of github.com:highfidelity/hifi into commerce_fixCertificateInfoError	2018-04-06 10:58:32 -07:00
Stephen Birarda	1d76dea9f6	Merge pull request #12818 from highfidelity/RC66 ... Merge back RC66 to master	2018-04-06 10:43:01 -07:00
John Conklin II	c8d109854b	Merge pull request #12800 from huffman/fix/entity-lock ... Remove lock file recovery in entity server	2018-04-06 10:04:34 -07:00
John Conklin II	55154b670a	Merge pull request #12801 from sethalves/fix-serverless-sharable ... fix -- don't tell steam about serverless domain urls	2018-04-06 10:04:03 -07:00
John Conklin II	384b0a0f41	Merge pull request #12804 from birarda/new-serverless-tutorial ... update to serverless tutorial with RC66 fixes	2018-04-06 10:03:03 -07:00
SamGondelman	d38dadaf58	possible fix for qml texture leak	2018-04-06 09:34:00 -07:00
Stephen Birarda	a2250a2a6d	write an install info ini file to the installation dir	2018-04-05 18:52:07 -07:00
Stephen Birarda	2e3db99f7e	update to serverless tutorial with RC66 fixes	2018-04-05 17:17:00 -07:00
Stephen Birarda	16335a3b4b	only remove selected components on clean install, leave wallet	2018-04-05 17:09:38 -07:00