24257 commits

Author	SHA1	Message	Date
John Conklin II	b6920a503c	Merge pull request #12618 from vladest/hificonstants_as_object ... Hificonstants as object	2018-03-22 11:03:05 -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
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
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
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
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
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
Brad Davis	1dfde86680	Fix typo	2018-03-16 11:11:08 -07: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
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
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
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
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
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
Gabriel Calero	3117ec9015	Merge remote-tracking branch 'upstream/master' into android_hifi_audio_codec	2018-03-12 19:44:24 -03: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
Cristian Luis Duarte	9e429e9f03	Merge remote-tracking branch 'hifi/master' into android_joystick_rotate_move	2018-03-12 15:51:46 -03: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
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
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