27097 commits

Author	SHA1	Message	Date
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
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
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
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
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
John Conklin II	5be2f0acc7	Merge pull request #12490 from Zvork/taa ... Temporal Anti-Aliasing	2018-03-13 09:03:50 -07: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
Olivier Prat	aad571f6bd	Merge branch 'master' of http://github.com/highfidelity/hifi into taa	2018-03-12 14:22:57 -04: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
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
Ken Cooke	c06d28ee5f	Improved quality of the audio resampling filter kernel	2018-03-10 10:34:10 -08:00
samcake	10016756b7	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-03-09 16:32:37 -08:00
Brad Davis	7d267bb709	Fix local KTX files never being removed from pending downloads	2018-03-09 16:01:45 -08:00
Simon Walton	cc166dbece	LogHandler regexps - use vector of values	2018-03-09 15:44:56 -08:00
Simon Walton	d4cf22fbaf	LogHandler class stores regexps - code tweaks ... Code standard changes from review.	2018-03-09 15:29:10 -08:00
Simon Walton	4b27cd73ff	LogHandler class stores regexps rather than always recreating ... General efficiency tweaks; move to C++11.	2018-03-09 15:29:09 -08:00
NissimHadar	9b9b62d0e4	Transition to hover if falling and height above ground is greater than the threshold.	2018-03-09 15:20:51 -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
Dante Ruiz	3a39fca268	made requested changes	2018-03-09 10:09:51 -08:00
Dante Ruiz	c49d0557fc	fixing check box issues	2018-03-09 09:29:37 -08:00
Brad Hefta-Gaub	6b55fa1fcd	Merge pull request #12539 from ctrlaltdavid/21702 ... Remove deprecated Window.location.protocolVersion() function from API	2018-03-09 08:52:55 -08:00
Andrew Meadows	858b02f29d	more readable code	2018-03-09 08:35:18 -08:00