24535 commits

Author	SHA1	Message	Date
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
Liv Erickson	1244559618	remove spaces for clean-ness	2018-03-22 15:37:12 -07:00
Liv Erickson	0647155c30	re-add experimental image removal	2018-03-22 15:33:23 -07:00
Liv Erickson	f62e1ed54e	disable add button on model until text is entered	2018-03-22 15:29:41 -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
David Rowe	8df6cd58c6	Document Overlays.getOverlayObject's use for web3d event bridge	2018-03-21 15:50:22 +13:00
David Rowe	05efc5a231	Revert "Remove Overlays.getOverlayObject() from JavaScript API" ... This reverts commit 8e2a3e8c99.	2018-03-21 15:36:39 +13:00
Olivier Prat	143a315f1d	Fade edited objects are now selected with ray picking	2018-03-20 15:29:50 -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
vladest	faf8328d6a	Fix invalid message if cancel adding asset to AssetServer	2018-03-20 15:47:30 +01: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
Dante Ruiz	1dcdcffa69	hopefully the last fix	2018-03-16 13:52: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
Ryan Huffman	bee8899c46	Add support for uploading .content.zip files	2018-03-15 12:17:21 -07:00
Seth Alves	a5b94f22fa	works now	2018-03-15 10:31:55 -07:00
Seth Alves	b22e0f6209	use TAG_BITS_1 for cam rather than TAG_BITS_ALL	2018-03-15 09:55:42 -07:00
David Rowe	a7cd5a240a	Fix "text" overlay not clipping to right and bottom margins	2018-03-15 17:31:02 +13:00
Zach Fox	2d57c444b6	Don't auto apply 'updatable' filter	2018-03-14 16:02:33 -07:00
Seth Alves	afcbb6751b	disable loading of serverless-domains over http(s), for now	2018-03-14 15:53:35 -07:00
Zach Fox	cc4726b24b	Some bugfixes	2018-03-14 15:47:19 -07:00
Zach Fox	f3efdda6b0	Fix content set filter	2018-03-14 14:34:15 -07:00
Seth Alves	e63558dc05	code review	2018-03-14 14:33:17 -07:00
Seth Alves	93978209d8	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-03-14 13:49:46 -07:00
Zach Fox	6647475f5c	Wrong sign	2018-03-14 11:19:55 -07:00
Zach Fox	74e24ec289	Final touches?	2018-03-14 10:58:18 -07:00
Zach Fox	70b3d0fe5f	Merge branch 'filterBar' into commerce_upgrades_1	2018-03-14 09:53:02 -07:00
Zach Fox	98cdbbb3e6	Small update to dot before merging in filterBar	2018-03-14 09:45:42 -07:00
Dante Ruiz	d6b3e91de1	removing debug statement	2018-03-14 09:35:22 -07:00
Dante Ruiz	2fb1fbe027	fix sorting	2018-03-14 09:17:22 -07:00
Seth Alves	21088cfbcc	Merge branch 'master' of github.com:highfidelity/hifi into overlay-visible-in-2nd-cam	2018-03-14 09:00:21 -07:00
David Rowe	966d711e56	Fix Window.raiseMainWindow()	2018-03-14 13:38:48 +13:00
Zach Fox	e2326a3733	Initial work for 'messages waiting' light	2018-03-13 17:05:16 -07:00
David Rowe	025d2807f4	Fix Window.setFocus() JSDoc	2018-03-14 12:59:27 +13:00
David Rowe	c8b4217a96	Fix Window.hasFocus()	2018-03-14 12:57:23 +13:00
Seth Alves	602bc37b1a	oops	2018-03-13 16:39:56 -07:00
Seth Alves	271badfa62	provide an overlay property to control if the overlay is visible in the secondary camera view	2018-03-13 16:33:32 -07:00
Dante Ruiz	2d85669b08	fix backedColumn width	2018-03-13 16:30:43 -07:00
Dante Ruiz	f9413dfe1b	fixing mirror mode	2018-03-13 15:59:10 -07:00
Zach Fox	882e4d6b45	Parse the string that comes from the backend	2018-03-13 15:13:41 -07:00
Zach Fox	7b6b08fd26	Upgrade specific edition	2018-03-13 13:51:10 -07:00
Zach Fox	f42255f46b	Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1	2018-03-13 13:42:42 -07:00
Zach Fox	86115a8578	Merge branch 'master' of github.com:highfidelity/hifi into filterBar	2018-03-13 13:42:13 -07:00
Zach Fox	a949208988	Design tweaks	2018-03-13 13:23:32 -07:00
Zach Fox	5563edd957	Focus fix; Switch to QQC2	2018-03-13 13:11:59 -07:00
Zach Fox	50e709c738	Add updates; drop shadow	2018-03-13 12:13:14 -07:00
SamGondelman	4adc357534	apply taa to text and web entities/overlays	2018-03-13 11:57:14 -07:00
Cristian Luis Duarte	a3811c2844	Coding style corrections	2018-03-13 15:56:13 -03:00
Dante Ruiz	00fa5cfd06	Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord	2018-03-13 10:08:00 -07:00
Dante Ruiz	f521a129b6	fixing issues	2018-03-13 10:07:34 -07:00
Seth Alves	b39c7eadd2	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-03-13 09:24:18 -07:00
John Conklin II	5be2f0acc7	Merge pull request #12490 from Zvork/taa ... Temporal Anti-Aliasing	2018-03-13 09:03:50 -07:00
David Rowe	16aefea2e1	Merge branch 'master' into 21776	2018-03-13 14:46:07 +13:00
Zach Fox	bce7fb1ff1	Improvements	2018-03-12 16:54:10 -07:00
Zach Fox	9c7d857ecb	Fix some focus issues	2018-03-12 16:15:50 -07:00
Zach Fox	f1121db4da	It's working!	2018-03-12 15:54:11 -07:00
Gabriel Calero	3117ec9015	Merge remote-tracking branch 'upstream/master' into android_hifi_audio_codec	2018-03-12 19:44:24 -03:00
Zach Fox	db7eea543e	Initial progress	2018-03-12 15:11:09 -07:00
Sam Gondelman	c59d29f4ee	Merge pull request #12623 from SamGondelman/android ... Android: Fix corruption on startup	2018-03-12 15:03:07 -07:00
John Conklin II	7f7d20738a	Merge pull request #12553 from vladest/mac_combobox_misplaced ... Fix CheckBox on Mac	2018-03-12 14:47:39 -07:00
MiladNazeri	e054f16c46	Merge pull request #12526 from ctrlaltdavid/21709 ... Entities API JSDoc	2018-03-12 14:40:09 -07:00
Gabriel Calero	7778ddfdcb	Merge remote-tracking branch 'upstream/master' into android_hifi_audio_codec	2018-03-12 18:33:05 -03:00
SamGondelman	9953e7051f	Merge remote-tracking branch 'upstream/master' into android	2018-03-12 14:15:31 -07:00
SamGondelman	4bef033d6f	cleanup, don't compress rcc file to fix corruption	2018-03-12 13:05:03 -07:00
Dante Ruiz	e289d37210	min diff	2018-03-12 12:59:30 -07:00
Dante Ruiz	1079cfb264	fixing some issues	2018-03-12 12:57:56 -07:00
Cristian Luis Duarte	9e429e9f03	Merge remote-tracking branch 'hifi/master' into android_joystick_rotate_move	2018-03-12 15:51:46 -03:00
Dante Ruiz	272f71b940	making changes	2018-03-12 11:48:17 -07:00
Olivier Prat	aad571f6bd	Merge branch 'master' of http://github.com/highfidelity/hifi into taa	2018-03-12 14:22:57 -04:00
Cristian Luis Duarte	b87a07a7d0	Android - Improve View controller making it like a drag rather than like a joystick (reference touch is updated at every frame and is not only the initial touch anymore)	2018-03-12 14:55:20 -03:00
Alexia Mandeville	748507f1e3	Increasing speed on mousescroll - zooming in/out of avatar	2018-03-10 22:20:00 -08:00
Alexia Mandeville	2598be16f8	Updating default mouse pitch/yaw input to be more stabilized	2018-03-10 21:46:20 -08:00
vladest	e84704165f	Remove reference to non existing id	2018-03-10 16:35:17 +01:00
vladest	7ca0c76b1c	QtObject dousnt support inner instances	2018-03-10 16:18:32 +01:00
vladest	d6a42a9a49	HifiConstants is not visual item, just a placeholder for constants	2018-03-10 14:49:04 +01:00
samcake	10016756b7	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-03-09 16:32:37 -08:00
Cristian Luis Duarte	ce0d76be2b	Merge remote-tracking branch 'hifi/master' into android_joystick_rotate_move	2018-03-09 20:51:21 -03:00
Seth Alves	c781f88239	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-03-09 15:43:14 -08:00
Seth Alves	5b5ea11a18	changes to openUrl aren't needed for serverless domains	2018-03-09 15:43:05 -08:00
samcake	c78df4d967	Setting the correct Job config for ssao check box and fixing typo	2018-03-09 15:41:56 -08:00
Cristian Luis Duarte	f0e68ecffa	Android - Touch to rotate inverted X and Y axis and less sensitive.	2018-03-09 20:33:06 -03:00
samcake	fec30b8363	Fixing the menu for Shadow and AO to do the correct path to engine config	2018-03-09 15:04:14 -08:00
John Conklin II	42a686ad93	Merge pull request #12578 from druiz17/use-correct-audio-api ... use correct scripting api for audio in Audio.qml	2018-03-09 13:41:20 -08:00
samcake	10447bf10e	Fix the fact that all avatars should cast shadows, not just MyAvatar. since this is always a SkeletonMOdel class let s just turn it on by default there	2018-03-09 13:04:04 -08:00
Sam Gateau	d0de5b2d96	Merge pull request #12496 from AndrewMeadows/faster-raypick ... faster per-entity raypick culling and time-boxed picks	2018-03-09 13:01:52 -08:00
Cristian Luis Duarte	3d933e1810	Android - Joystick hidden when opening login and shown after Cancel.	2018-03-09 17:41:05 -03:00
Seth Alves	621e6a62d6	merge from upstream	2018-03-09 12:07:24 -08:00
Seth Alves	58bc42990c	merge from upstream	2018-03-09 12:03:26 -08:00
John Conklin II	25b93d9fd7	Merge pull request #12606 from ElderOrb/FB12956_RC65 ... Fix for broken 'toggle audio meter' button	2018-03-09 11:20:27 -08:00
Dante Ruiz	c949b44f0c	conforming to coding standards	2018-03-09 10:42:19 -08:00
Dante Ruiz	e21c4988fb	stereo checkbox text change	2018-03-09 10:11:25 -08:00
Dante Ruiz	3a39fca268	made requested changes	2018-03-09 10:09:51 -08:00
John Conklin II	6969f014fc	Merge pull request #12601 from howard-stearns/clear-wallet-when-picking-a-new-one ... clear wallet when picking a new one	2018-03-09 10:09:41 -08:00
John Conklin II	407dfec342	Merge pull request #12603 from howard-stearns/RC65-clear-wallet-when-picking-a-new-one ... clear wallet when picking a new one	2018-03-09 10:09:24 -08:00
John Conklin II	209dd7fb43	Merge pull request #12602 from zfox23/RC65_fixFontsAgain ... RC65: Fix font loading for MacOS via completely different font loading method	2018-03-09 09:53:46 -08:00
Zach Fox	2b137f94a6	Merge pull request #12596 from zfox23/fixFontsAgain ... Fix font loading for MacOS via completely different font loading method	2018-03-09 09:49:56 -08:00
Dante Ruiz	cfa85b5137	Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord	2018-03-09 09:37:08 -08:00
Dante Ruiz	c49d0557fc	fixing check box issues	2018-03-09 09:29:37 -08:00
Brad Hefta-Gaub	5437ffb2c8	Merge pull request #12536 from ctrlaltdavid/21700 ... Remove deprecated Window.openFileChanged() signal from API	2018-03-09 08:47:57 -08:00
Dante Ruiz	8703e9e002	Merge branch 'master' of github.com:highfidelity/hifi into use-correct-audio-api	2018-03-09 08:42:50 -08:00
Andrew Meadows	9fbe7ec194	time-box Picks and solve in round-robin sequence	2018-03-09 08:35:18 -08:00
Olivier Prat	da6bd92ff6	Merged with master	2018-03-09 10:07:25 +01:00