24437 commits

Author	SHA1	Message	Date
David Rowe	c3df741c62	Settings API JSDoc	2018-03-28 17:14:06 +13:00
Seth Alves	46fb2033f2	Merge pull request #12574 from druiz17/remap-keybaord ... changing keyboard mapping	2018-03-27 19:00:05 -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
John Conklin II	7c505a0b85	Merge pull request #12711 from sethalves/serverless-tutorial-rc66 ... Serverless tutorial rc66	2018-03-27 11:17:07 -07:00
Ryan Huffman	d01a58517f	Fix serverless content not using correct directories	2018-03-26 14:32:52 -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	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
Dante Ruiz	96707a2568	fix mappoing conflicts	2018-03-23 16:43:36 -07:00
Dante Ruiz	28e61bcbb1	fix typo	2018-03-23 11:57:01 -07:00
Dante Ruiz	a14d5c6546	make alternate keys work	2018-03-23 11:55:16 -07:00
John Conklin II	563ff61325	Merge pull request #12661 from SamGondelman/android ... Android: Stats, disable IK, reduce impact of InputRecorder	2018-03-23 11:08:50 -07:00
John Conklin II	c61ed697df	Merge pull request #12552 from vladest/assetbrowser_cosmetics ... Wrap text in query dialogs. Add right margins for input field and but…	2018-03-22 17:56:47 -07:00
Dante Ruiz	f36a916fb6	revert comment change	2018-03-22 17:44:17 -07:00
Dante Ruiz	4d52caccde	making some more requested changes	2018-03-22 17:39:22 -07:00
Dante Ruiz	1d17658c80	Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord	2018-03-22 16:29:16 -07:00
Howard Stearns	113670e33b	Merge pull request #12638 from zfox23/commerce_upgrades_1 ... Commerce: Item Updates!	2018-03-22 15:40:22 -07:00
John Conklin II	6d9892856d	Merge pull request #12510 from sethalves/serverless-domains ... Serverless domains	2018-03-22 14:06:49 -07:00
Sam Gondelman	bbded2215d	Merge pull request #12665 from gcalero/android_bottombar_resize ... Android - Resize bottombar after window size changes (to always fill …	2018-03-22 11:15:02 -07:00
John Conklin II	b6920a503c	Merge pull request #12618 from vladest/hificonstants_as_object ... Hificonstants as object	2018-03-22 11:03:05 -07:00
Seth Alves	6c1d713968	review	2018-03-21 19:21:57 -07:00
Seth Alves	ed0778a68a	remove unused json file	2018-03-21 17:07:31 -07:00
Seth Alves	916ed3a0d4	review	2018-03-21 16:18:31 -07:00
Seth Alves	196f621a60	remove unneeded setSessionUUID	2018-03-21 15:21:49 -07:00
Seth Alves	bea7ee42e2	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-03-21 14:30:07 -07:00
Seth Alves	ef52ae13ee	rearrange domain-url-changed signals	2018-03-21 14:30:00 -07:00
Dante Ruiz	9d8770b134	changing speed	2018-03-21 13:25:50 -07:00
John Conklin II	5bd3d0fab9	Merge pull request #12647 from birarda/feat/client-only-installer ... add a CLIENT_ONLY build option and handle for installer	2018-03-21 11:20:36 -07:00
Seth Alves	4033af9b11	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-03-21 11:11:43 -07:00
Dante Ruiz	cce77e3e68	made requested changes	2018-03-21 10:15:42 -07:00
Ken Cooke	f5f4e2a780	Merge pull request #12635 from ctrlaltdavid/21776 ... Fix Window hasFocus(), setFocus(), and raiseMainWindow()	2018-03-21 09:27:51 -07:00
Dante Ruiz	86cd5ffa30	Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord	2018-03-21 08:49:25 -07:00
Sam Gateau	5cc0e24921	Merge pull request #12666 from jherico/fix/web_overlay_crash ... Fix invalid QML surface cache interaction	2018-03-20 14:26:39 -07:00
Stephen Birarda	1405c8fcb3	add a client only option to cmake	2018-03-20 14:20:58 -07:00
Stephen Birarda	0074c0470d	Merge pull request #12524 from birarda/feat/runtime-beside-exe ... switch back to app-local VC runtimes and UCRT	2018-03-20 14:07:27 -07:00
Seth Alves	585a523823	unmangle merge	2018-03-20 11:17:56 -07:00
John Conklin II	40d6e51da8	Merge pull request #12597 from ElderOrb/FB12956 ... Fix for broken 'toggle audio meter' button	2018-03-20 11:03:32 -07:00
Seth Alves	bd10cd6fa9	'disconnect' from serverless domain when transitioning from a serverless-domain to a DNS name (rather than a place name)	2018-03-20 10:53:17 -07:00
Stephen Birarda	cd887b5faf	Merge pull request #12654 from huffman/feat/content-zip-upload ... Add support for .content.zip content uploads	2018-03-20 10:07:53 -07:00
Seth Alves	f61504b814	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-03-19 14:59:18 -07:00
Zach Fox	0b810c3aa8	Various fixes	2018-03-19 14:39:50 -07:00
John Conklin II	47437c9564	Merge pull request #12651 from ctrlaltdavid/21799 ... Fix "text" overlay not clipping to right and bottom margins	2018-03-19 14:12:20 -07:00
Zach Fox	18aa95e0bb	New Checkout flow for updating specific Editions	2018-03-19 13:35:27 -07:00
Zach Fox	daa68768b9	Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1	2018-03-19 12:18:10 -07:00
Seth Alves	a4599fe7ce	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-03-16 20:07:35 -07:00
Sam Gondelman	b96f398274	Merge pull request #12593 from gcalero/android_joystick_rotate_move ... Android joystick rotate move	2018-03-16 17:24:15 -07:00
Dante Ruiz	652faaa116	fixing AddressManager keyboard when switching domains	2018-03-16 16:32:37 -07:00
Brad Davis	2f59283053	Fix initialization of QML overlay surfaces	2018-03-16 14:48:08 -07:00