27158 commits

Author	SHA1	Message	Date
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	de5ff20968	Merge pull request #12664 from gcalero/android_websurface_check_nocrash ... Android - Prevent crash when setting the url property to _webSurface.	2018-03-20 11:40:08 -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	91db0ab00f	Merge pull request #12650 from ctrlaltdavid/21798 ... Messages API JSDoc	2018-03-19 13:56:57 -07:00
Cristian Luis Duarte	17fddd9e0e	RenderableWebEntityItem root item check moved to hasWebSurface and buildWebSurface	2018-03-19 15:33:14 -03: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
Stephen Birarda	472e7c003f	Merge pull request #11860 from huffman/feat/obj-baker-update ... OBJ Baking	2018-03-16 13:54:07 -07:00
Cristian Luis Duarte	e29fc9b461	Android - Rotate View control increased sensitivity	2018-03-16 16:28:58 -03:00
Cristian Luis Duarte	ee6c65c1ac	Android - Prevent crash when setting the url property to _webSurface.	2018-03-16 12:03:26 -03:00
Cristian Luis Duarte	03cbadece5	Merge remote-tracking branch 'hifi/master' into android_joystick_rotate_move	2018-03-15 17:11:40 -03:00
Cristian Luis Duarte	f8f5655561	Android view control sensitivity increased. Constant replaced for a private value member.	2018-03-15 17:10:14 -03:00
Anthony J. Thibault	f6c4f6b9c4	Fix for arm IK jitter ... When in HMD mode, holding your hand controller in front of your face, would often result in a 1-2 mm pop in wrist position. This was due to a problem in the IK elbow constraint. When the swing rotation out of the elbow's reference frame was close to but not exactly identity it would not be properly constrainted. But when the magnitude of that swing became big enough the constraint would engage. This small change in swing rotation was noticable as a 1-2 mm movement in the wrist.	2018-03-15 13:06:27 -07:00
Ryan Huffman	bee8899c46	Add support for uploading .content.zip files	2018-03-15 12:17:21 -07:00
John Conklin II	a7dc2cd12e	Merge pull request #12645 from sethalves/rename-getpos3 ... Rename getpos3	2018-03-15 10:02:00 -07:00
Bradley Austin Davis	b25beeb10b	Merge pull request #12640 from jherico/fix/web_process ... Don't leave trash web processes when changing web entity urls	2018-03-14 19:40:13 -07:00
David Rowe	369970f120	Messages API JSDoc	2018-03-15 15:23:02 +13:00
Ken Cooke	b1dd63cfd3	Merge pull request #12619 from kencooke/audio-src-kernel-128 ... Improved audio quality for streaming music	2018-03-14 18:30:23 -07:00
Sam Gondelman	46bbfc2680	Merge pull request #12643 from gcalero/keyboard_crashing ... Possible fix for keyboard crash	2018-03-14 15:53:17 -07:00
Gabriel Calero	d0f1aa9020	Refactor fix for keyboard crash	2018-03-14 19:18:42 -03:00
Cristian Luis Duarte	379fa9783f	No touch responsibility for KeyboardMouseDevice when TouchscreenVirtualPadDevice is initialized	2018-03-14 19:09:21 -03:00
Seth Alves	ee515a44e7	Merge branch 'master' of github.com:highfidelity/hifi into rename-getpos3	2018-03-14 14:56:50 -07:00
Gabriel Calero	e744edc6a0	Possible fix for keyboard crash	2018-03-14 18:11:23 -03:00
Stephen Birarda	0c0ce1d6b8	Merge pull request #12508 from SimonWalton-HiFi/server-script ... Stop server-script URLs when deleted from entity properties (case 11244)	2018-03-14 14:01:01 -07:00
Cristian Luis Duarte	80abe1865a	Remove unused variable thisPointConsumed	2018-03-14 16:22:24 -03:00
SamGondelman	e59af8892a	make same changes to gles backend from taa pr	2018-03-14 12:09:59 -07:00
Brad Davis	baa4dc3383	Don't leave trash web processes when changing web entity urls	2018-03-14 11:38:46 -07:00
Seth Alves	2fd6bc4130	rename Mesh api getPos3 to getPos, deprecate but still support getPos3	2018-03-14 10:24:44 -07:00
Sam Gateau	2487e34ee8	Merge pull request #12633 from SamGondelman/aa ... Fix HUD sphere rendering after TAA changes	2018-03-14 09:26:25 -07:00
SamGondelman	3b877db992	fix hud sphere	2018-03-13 14:58:29 -07:00
Ryan Huffman	11a3a86af3	Merge branch 'master' of github.com:highfidelity/hifi into feat/obj-baker-update	2018-03-13 14:49:26 -07:00
John Conklin II	a0e2fc3665	Merge pull request #12564 from SimonWalton-HiFi/record-avatar-pr ... Fixes for missing avatar on record replays	2018-03-13 14:10:10 -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
Ryan Huffman	a5e491e29d	Add OBJ support to domain baker	2018-03-13 10:38:21 -07:00
John Conklin II	5be2f0acc7	Merge pull request #12490 from Zvork/taa ... Temporal Anti-Aliasing	2018-03-13 09:03:50 -07:00
Cristian Luis Duarte	b8c0f4d686	Android joystick - Enforce validity of touches to the ones that start in their area of activation (Movement only from joystick area, View only from outside joystick area).	2018-03-13 12:52:26 -03:00
John Conklin II	615c98816f	Merge pull request #12620 from ctrlaltdavid/21778 ... Fix rotation and position of avatar meshes attached to eye joints	2018-03-13 08:17:50 -07:00
Ken Cooke	bcf893db18	Merge pull request #12586 from kencooke/audio-peakmeters-fix ... Fix crash when closing the Audio menu	2018-03-13 07:52:37 -07:00
Gabriel Calero	3117ec9015	Merge remote-tracking branch 'upstream/master' into android_hifi_audio_codec	2018-03-12 19:44:24 -03:00
Bradley Austin Davis	f48db825c3	Merge pull request #12615 from jherico/fix/ktx_loading ... Fix local KTX files never being removed from pending downloads	2018-03-12 15:04:40 -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
Ken Cooke	c9e253ab14	Merge pull request #12621 from ctrlaltdavid/21791 ... Fix CPU and GPU not throttling when Interface minimized from maximized	2018-03-12 14:43:47 -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
Gabriel Calero	25f207a6db	Add hifi audio codec in Android build	2018-03-12 18:29:57 -03:00
David Rowe	75189e292d	Fix OSX / Linux warning	2018-03-13 10:22:50 +13:00
SamGondelman	9953e7051f	Merge remote-tracking branch 'upstream/master' into android	2018-03-12 14:15:31 -07:00
David Rowe	945858876e	Use std::vector<> instead of QVector	2018-03-13 09:53:25 +13:00
SamGondelman	4bef033d6f	cleanup, don't compress rcc file to fix corruption	2018-03-12 13:05:03 -07:00
John Conklin II	1c403b7532	Merge pull request #12616 from NissimHadar/bug12435 ... Mitigation of Manuscript issue 12435	2018-03-12 12:01:42 -07:00