26105 commits

Author	SHA1	Message	Date
John Conklin II	89e7e3b938	Merge pull request #13682 from zfox23/MS16704_removeWearableAvatar ... Fix MS16704: Remove worn Avatar/Wearable before updating	2018-07-25 12:12:50 -07:00
Dante Ruiz	a21a475784	Merge branch 'master' of github.com:highfidelity/hifi into fix-audio-hmd-issue	2018-07-25 08:44:28 -07:00
Dante Ruiz	8da1db31df	fix audio page being in desktop when your in HMD	2018-07-25 08:44:11 -07:00
Zach Fox	eea4630d2b	Fix MS16704: Remove worn Avatar/Wearable before updating	2018-07-24 14:29:05 -07:00
John Conklin II	99c26e6363	Merge pull request #13674 from r3tk0n/16984-CompositorHelper ... Added _aboutToQuit guard on eventFilter()	2018-07-24 11:37:19 -07:00
John Conklin II	2ac9463830	Merge pull request #13653 from ElderOrb/fake-wearables-fix ... FB16870: Avatar Wearables showing incorrect number	2018-07-23 15:55:11 -07:00
John Conklin II	27b35d84cc	Merge pull request #13652 from r3tk0n/16206-flying-settings ... MS16206 - Enable flight by default in desktop, controls menu changes re: flying	2018-07-23 15:19:46 -07:00
MuteTab	52e5bdb360	Added _aboutToQuit guard on eventFilter()	2018-07-23 14:27:38 -07:00
Alexander Ivash	33c858774b	fix coding standard compliance	2018-07-23 21:01:43 +03:00
Seth Alves	ae83c33621	Merge pull request #13646 from sethalves/put-back-old-style-attachment-dialog-master ... put back old-style avatar-attachments menu-item	2018-07-23 10:25:23 -07:00
r3tk0n	bc91affa70	Bring this PR inline with RC70.1 PR.	2018-07-20 15:13:44 -07:00
Alexander Ivash	f5717b7648	add check for SELF_ID	2018-07-20 19:33:16 +03:00
Alexander Ivash	849c91d8f6	remove not necessary EntityTreeRenderer from removeAvatarEntities's condition	2018-07-20 19:32:58 +03:00
r3tk0n	3108d650de	Restore original menu string for flying ... Restore the original menu string for flying as it apparently *does* effect jumping.	2018-07-20 08:29:11 -07:00
Cristian Luis Duarte	9bb4bada8a	Merge remote-tracking branch 'hifi/master' into android_loading_stuck	2018-07-19 21:45:03 -03:00
Cristian Luis Duarte	eb5cc00fff	newlines	2018-07-19 21:24:29 -03:00
Alexander Ivash	fb8640de47	FB16870: Avatar Wearables showing incorrect number	2018-07-20 02:51:17 +03:00
Cristian Luis Duarte	6d239f40fb	Android - Freeze at startup problem - remove logs	2018-07-19 20:47:05 -03:00
MuteTab	dfcf47e8ee	Removed useless comment.	2018-07-19 14:44:32 -07:00
MuteTab	8d65e14193	Remove one change, turned out to be unnecessary.	2018-07-19 14:43:46 -07:00
MuteTab	3080539b63	Make getFlyingEnabled() always true when in desktop.	2018-07-19 14:40:20 -07:00
MuteTab	97e5d65592	Added conditional check for VR vs non-VR menu.	2018-07-19 14:30:06 -07:00
MuteTab	b70b424447	Added new menu classification for VR vs non-VR movement.	2018-07-19 14:27:49 -07:00
Qliemillar	e779e42d90	Merge pull request #13635 from NissimHadar/bug16645 ... Fix for bug16645 "disturbing flash when adding an overlay (even when everything is cached)"	2018-07-19 14:43:04 -06:00
MuteTab	63089df2dd	Re-added missing semi-colon.	2018-07-19 12:42:45 -07:00
MuteTab	a99f9310da	Add first-run checks for flying settings.	2018-07-19 12:41:24 -07:00
Brad Davis	63fa54ceda	Fix for audio continuing on destroyed Web 3D overlays	2018-07-19 11:50:18 -07:00
Seth Alves	965c35292c	put back old-style avatar-attachments menu-item	2018-07-19 11:32:19 -07:00
Qliemillar	566c837bba	Merge pull request #13631 from ElderOrb/avatarapp-combobox-fix ... fix 'the drop down does not shows the wearable'	2018-07-19 12:23:48 -06:00
NissimHadar	4c0b7ca24c	Updated per Samuel's/Austin's comments.	2018-07-18 17:30:46 -07:00
Wayne Chen	37131d75e9	Merge pull request #13629 from wayne-chen/loginDialogBrowser-case-16537 ... MS16537: Updating "Forgot Username/Forgot Password" behavior	2018-07-18 16:32:55 -07:00
NissimHadar	a882931c6b	Only show overlay if textures have loaded	2018-07-18 15:02:02 -07:00
NissimHadar	99b95acada	Merge branch 'master' of github.com:highfidelity/hifi into bug16645	2018-07-18 13:56:12 -07:00
NissimHadar	446ef97fc5	Only show overlay if textures have loaded	2018-07-18 13:54:03 -07:00
howard-stearns	0a47672d64	machinery for fetching next page of inifinite scroll before it really ... needed, and use in our infinite scrolls	2018-07-18 13:00:03 -07:00
Alexander Ivash	fe96ad2389	fix 'the drop down does not shows the wearable'	2018-07-18 21:16:47 +03:00
Wayne Chen	0cbcae9181	reverting onLinkActivated brackets	2018-07-18 10:44:37 -07:00
Howard Stearns	db212a0c99	Merge pull request #13625 from zfox23/MS16802_openGlyph ... Fix MS16802: In Purchases, there shouldn't be a glyph associated with the Open button	2018-07-18 10:12:47 -07:00
Wayne Chen	c104e95ef4	Merge branch 'master' of https://github.com/highfidelity/hifi into loginDialogBrowser-case-16537	2018-07-18 09:06:22 -07:00
Zach Fox	919bfce7ab	Simplify	2018-07-18 09:00:01 -07:00
Qliemillar	080d664341	Merge pull request #13619 from luiscuenca/handTouchDisabler ... Allow creators to disable hand touch from javascript	2018-07-18 08:16:37 -06:00
luiscuenca	e3594fe1b7	mutex added	2018-07-17 17:23:03 -07:00
Wayne Chen	3b7f88a4a8	Merge branch 'master' of https://github.com/highfidelity/hifi into loginDialogBrowser-case-16537	2018-07-17 17:08:43 -07:00
luiscuenca	ba884f8a94	Forgotten coment	2018-07-17 16:42:59 -07:00
luiscuenca	6225435385	some ortographic fixes	2018-07-17 16:38:34 -07:00
luiscuenca	fcb7614f7e	Format and fixes	2018-07-17 16:34:30 -07:00
Zach Fox	ef4265de4b	Fix MS16802: In Purchases, there shouldn't be a glyph associated with the Open button	2018-07-17 16:16:43 -07:00
Cristian Luis Duarte	c664ce7671	Android - bypass settings reset dialog with cli option	2018-07-17 15:05:56 -03:00
Qliemillar	d498d6bb3d	Merge pull request #13617 from amantley/rotateRecenter ... Reduce Frequent Flipping of Avatar Facing Direction By Resetting _headControllerFacingMovingAverage	2018-07-17 08:57:24 -06:00
luiscuenca	82a3b73de8	Added disable hand touch for entityID	2018-07-17 07:06:48 -07:00