66093 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
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
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
Sam Gondelman	db2b79f4fb	Merge pull request #12626 from gcalero/android_hifi_audio_codec ... Android hifi audio codec	2018-03-12 16:21:21 -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
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
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
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	19807676fa	whoops	2018-03-12 14:19:34 -07: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
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
John Conklin II	1c403b7532	Merge pull request #12616 from NissimHadar/bug12435 ... Mitigation of Manuscript issue 12435	2018-03-12 12:01:42 -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
Sam Gondelman	3c88ae692c	Merge pull request #12608 from jherico/fix/android_hifi_icon ... Update Hifi icon for android	2018-03-12 11:26:57 -07:00
Olivier Prat	aad571f6bd	Merge branch 'master' of http://github.com/highfidelity/hifi into taa	2018-03-12 14:22:57 -04:00
Olivier Prat	bafd6340a2	Removed unused fonts in scripts	2018-03-12 14:21:48 -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
John Conklin II	5bd49ce9dc	Merge pull request #12617 from samcake/punk ... Fix shadow: other avatars casting shadow, graphics settings checkboxes & menu layout	2018-03-12 10:49:48 -07:00
John Conklin II	8b05973939	Merge pull request #12613 from NissimHadar/fixShadowUI ... Correct can cast shadow flag being visible on entities that can't cast shadows	2018-03-12 10:45:33 -07:00
Seth Alves	75f4959b79	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-03-12 09:08:51 -07:00
Sam Gateau	a6a43b90ee	Merge pull request #12554 from NissimHadar/addRecursionToAutotester ... Pull test images from GitHub	2018-03-12 08:59:07 -07:00
David Rowe	5acc605ba0	Fix OSX / Linux warning	2018-03-12 16:03:31 +13:00
David Rowe	3001225cb7	Fix CPU and GPU not throttling when Interface minimized from maximized	2018-03-12 15:49:20 +13:00
Bradley Austin Davis	e33539f575	Remove unused variable	2018-03-10 18:44:24 -08:00
David Rowe	957d39b0b1	Fix rotation and position of meshes attached to eye joints	2018-03-11 14:49:23 +13:00
Seth Alves	22f1ec5c82	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-03-10 14:49:25 -08:00
Ken Cooke	c06d28ee5f	Improved quality of the audio resampling filter kernel	2018-03-10 10:34:10 -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
Cristian Luis Duarte	67ae6aee33	Joystick behaviour according to spec: Movement starts on joystick, rotation starts from anywhere else	2018-03-10 01:30:44 -03:00
Cristian Luis Duarte	b24e574315	TouchscreenVirtualPadDevice rename of variables related to movement or view controls instead of left-right controls	2018-03-10 00:15:19 -03:00