24404 commits

Author	SHA1	Message	Date
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
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
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
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
Ken Cooke	f5f4e2a780	Merge pull request #12635 from ctrlaltdavid/21776 ... Fix Window hasFocus(), setFocus(), and raiseMainWindow()	2018-03-21 09:27:51 -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
Brad Davis	2f59283053	Fix initialization of QML overlay surfaces	2018-03-16 14:48:08 -07:00
Zach Fox	a792bcc3d3	Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1	2018-03-16 13:24:17 -07:00
Zach Fox	eb8cfcd8e9	Bugfix	2018-03-16 13:13:38 -07:00
Seth Alves	50b9716a17	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-03-16 14:45:49 -04:00
Zach Fox	ad33e775f1	Fix bottom anchor for listView when banner is showing	2018-03-16 11:28:03 -07:00
Cristian Luis Duarte	e6a8b322b1	Android bottom bar - remove extra semicolon	2018-03-16 15:15:00 -03:00
Brad Davis	1dfde86680	Fix typo	2018-03-16 11:11:08 -07:00
Cristian Luis Duarte	18682d854c	Android bottom bar - Put height up at the top of the Item definition it's clearer where relocateAndResize gets its height from	2018-03-16 15:06:12 -03:00
Brad Davis	ca38b9fe34	Fix invalid QML surface cache interaction	2018-03-16 10:53:59 -07:00
Brad Hefta-Gaub	634e642db3	Merge pull request #12634 from sethalves/overlay-visible-in-2nd-cam ... Overlays visible in 2nd cam	2018-03-16 10:07:26 -07:00
Seth Alves	4f72503d2d	put default home back to sandbox	2018-03-16 09:39:42 -07:00
Seth Alves	e3022da787	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-03-16 09:34:38 -07:00
Cristian Luis Duarte	79ff2df860	Android - Resize bottombar after window size changes (to always fill the screen horizontally)	2018-03-16 13:03:50 -03:00
SamGondelman	0fa73c73ce	stats	2018-03-15 16:05:46 -07:00
Zach Fox	eb2f8aa169	New notification flow for item updates	2018-03-15 16:03:49 -07:00
Atlante45	d96f7553d9	Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master	2018-03-15 15:22:43 -07:00
Stephen Birarda	f8df90e36d	disable the sixense plugin by default	2018-03-15 13:53:10 -07:00
Cristian Luis Duarte	03cbadece5	Merge remote-tracking branch 'hifi/master' into android_joystick_rotate_move	2018-03-15 17:11:40 -03:00
Ryan Huffman	03c8c14f61	Fix content replacement being allowed from all URLs	2018-03-15 12:49:22 -07:00