70106 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Sam Gondelman	74a49dc14f	Merge pull request #13638 from jherico/fix/fb16762 ... Fix for audio continuing on destroyed Web 3D overlays	2018-07-19 13:33:18 -07:00
Ryan Huffman	25b558e6b4	Fix xz guides not showing when translating with Shift	2018-07-19 12:56:18 -07: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
Qliemillar	2163bf1ef0	Merge pull request #13628 from r3tk0n/16726-Vive-Blackboxes ... 16726 - Remove Black Boxes ( HMD.requestShowHandControllers() )	2018-07-19 12:34:38 -06: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
Howard Stearns	2378cdfdc6	Merge pull request #13624 from howard-stearns/app-refactor4-merge ... appUi module, and use in People app	2018-07-19 11:07:54 -07:00
Gabriel Calero	d230a634b2	Fix connects. Set down MIN_READS_TO_CONSIDER_INPUT_ALIVE to 10	2018-07-19 14:50:40 -03:00
Qliemillar	3466d944fb	Merge pull request #13630 from huffman/fix/create-undo-while-disabled-visual ... Disable showing the entity edit tools when undoing while disabled	2018-07-19 09:03:40 -06:00
NissimHadar	4c0b7ca24c	Updated per Samuel's/Austin's comments.	2018-07-18 17:30:46 -07:00
Stephen Birarda	6257d5618a	Merge pull request #13640 from birarda/bug/404-bad-agent-requests-master ... 404 malformed agent script requests	2018-07-18 16:41:14 -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
Howard Stearns	084a4338ff	Merge pull request #13633 from howard-stearns/pre-fectch-infinite-scroll-items ... pre-fetch infinite scroll pages before reaching the end	2018-07-18 16:18:19 -07:00
Stephen Birarda	499aa4ad13	404 malformed agent script requests, check doc root	2018-07-18 15:22:45 -07:00
NissimHadar	a882931c6b	Only show overlay if textures have loaded	2018-07-18 15:02:02 -07:00
Gabriel Calero	c8a168c273	Fix audio choppy.	2018-07-18 18:36:03 -03:00
Gabriel Calero	d8af12152b	Add comment to explain the workaround	2018-07-18 18:35:47 -03:00
Gabriel Calero	e039ef1729	Use 24000Hz sample rate for Samsung only	2018-07-18 18:35:36 -03:00
Gabriel Calero	c11f4be5c1	Make louder android mic	2018-07-18 18:35:21 -03:00
howard-stearns	a904182cc2	cr feedback	2018-07-18 14:03:26 -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
Thijs Wenker	b29044fd7e	Merge pull request #13618 from dback2/clickHandleSwitchEntityFix ... Fix quickly clicking an edit handle causing selected entity change	2018-07-18 22:49:11 +02:00
howard-stearns	74914ffb3e	Merge branch 'master' of github.com:highfidelity/hifi into app-refactor4-merge	2018-07-18 13:16:50 -07:00
Simon Walton	64b18ee5b9	Change sys-tray Sandbox menu item from Go Home to Visit Sandbox	2018-07-18 13:11:20 -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
Ryan Huffman	b015845371	Disable showing the entity edit tools when undoing while disabled	2018-07-18 11:54:40 -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
r3tk0n	a9eb8103f6	Clean up comments a bit.	2018-07-18 09:52:25 -07:00
r3tk0n	f7b49598b5	Disabled tip boxes for Vive controllers, as per experience team request.	2018-07-18 09:50:59 -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
NissimHadar	6cecfd4d24	Merge branch 'master' of github.com:highfidelity/hifi into bug16645	2018-07-18 08:49:40 -07:00
Cristian Luis Duarte	6577a93cc9	Android Qt - Update QtActivity after change avoiding recursive loop android/app/src/main/java/org/qtproject/qt5/android/bindings/QtActivity.java	2018-07-18 12:43:13 -03: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