mirror of
https://github.com/overte-org/overte.git
synced 2025-08-10 12:12:32 +02:00
Merge pull request #16172 from MiladNazeri/bugz-1370/clappingNoiseWhileDescendingAfterFlying
[BUGZ-1370] :: Clapping Noise While Descending After Flying
This commit is contained in:
commit
51ef37fd27
1 changed files with 15 additions and 1 deletions
|
@ -16,11 +16,13 @@
|
||||||
// *************************************
|
// *************************************
|
||||||
// #region dependencies
|
// #region dependencies
|
||||||
|
|
||||||
|
|
||||||
// The information needed to properly use the sprite sheets and get the general information
|
// The information needed to properly use the sprite sheets and get the general information
|
||||||
// about the emojis
|
// about the emojis
|
||||||
var emojiList = Script.require("./emojiApp/resources/modules/emojiList.js");
|
var emojiList = Script.require("./emojiApp/resources/modules/emojiList.js");
|
||||||
var customEmojiList = Script.require("./emojiApp/resources/modules/customEmojiList.js");
|
var customEmojiList = Script.require("./emojiApp/resources/modules/customEmojiList.js");
|
||||||
|
|
||||||
|
|
||||||
// #endregion
|
// #endregion
|
||||||
// *************************************
|
// *************************************
|
||||||
// END dependencies
|
// END dependencies
|
||||||
|
@ -181,6 +183,7 @@ function maybeClearClapSoundInterval() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// URLs for this fn are relative to SimplifiedEmoteIndicator.qml
|
// URLs for this fn are relative to SimplifiedEmoteIndicator.qml
|
||||||
function toggleReaction(reaction) {
|
function toggleReaction(reaction) {
|
||||||
var reactionEnding = reactionsBegun.indexOf(reaction) > -1;
|
var reactionEnding = reactionsBegun.indexOf(reaction) > -1;
|
||||||
|
@ -192,6 +195,7 @@ function toggleReaction(reaction) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function maybeDeleteRemoteIndicatorTimeout() {
|
function maybeDeleteRemoteIndicatorTimeout() {
|
||||||
if (restoreEmoteIndicatorTimeout) {
|
if (restoreEmoteIndicatorTimeout) {
|
||||||
Script.clearTimeout(restoreEmoteIndicatorTimeout);
|
Script.clearTimeout(restoreEmoteIndicatorTimeout);
|
||||||
|
@ -199,6 +203,7 @@ function maybeDeleteRemoteIndicatorTimeout() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
var reactionsBegun = [];
|
var reactionsBegun = [];
|
||||||
var pointReticle = null;
|
var pointReticle = null;
|
||||||
var mouseMoveEventsConnected = false;
|
var mouseMoveEventsConnected = false;
|
||||||
|
@ -229,6 +234,7 @@ function beginReactionWrapper(reaction) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Checks to see if there are any reticle entities already to delete
|
// Checks to see if there are any reticle entities already to delete
|
||||||
function deleteOldReticles() {
|
function deleteOldReticles() {
|
||||||
MyAvatar.getAvatarEntitiesVariant()
|
MyAvatar.getAvatarEntitiesVariant()
|
||||||
|
@ -313,6 +319,7 @@ function triggerReactionWrapper(reaction) {
|
||||||
}, WAIT_TO_RESTORE_EMOTE_INDICATOR_ICON_MS);
|
}, WAIT_TO_RESTORE_EMOTE_INDICATOR_ICON_MS);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function maybeClearReticleUpdateLimiterTimeout() {
|
function maybeClearReticleUpdateLimiterTimeout() {
|
||||||
if (reticleUpdateRateLimiterTimer) {
|
if (reticleUpdateRateLimiterTimer) {
|
||||||
Script.clearTimeout(reticleUpdateRateLimiterTimer);
|
Script.clearTimeout(reticleUpdateRateLimiterTimer);
|
||||||
|
@ -393,6 +400,7 @@ function onMessageFromEmoteAppBar(message) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function getEmojiURLFromCode(code) {
|
function getEmojiURLFromCode(code) {
|
||||||
var emojiObject = emojiList[emojiCodeMap[code]];
|
var emojiObject = emojiList[emojiCodeMap[code]];
|
||||||
var emojiFilename;
|
var emojiFilename;
|
||||||
|
@ -405,6 +413,7 @@ function getEmojiURLFromCode(code) {
|
||||||
return "../../emojiApp/resources/images/emojis/52px/" + emojiFilename;
|
return "../../emojiApp/resources/images/emojis/52px/" + emojiFilename;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function updateEmoteIndicatorIcon(iconURL) {
|
function updateEmoteIndicatorIcon(iconURL) {
|
||||||
emoteAppBarWindow.sendToQml({
|
emoteAppBarWindow.sendToQml({
|
||||||
"source": "simplifiedEmote.js",
|
"source": "simplifiedEmote.js",
|
||||||
|
@ -451,7 +460,10 @@ function keyPressHandler(event) {
|
||||||
} else if (event.text === RAISE_HAND_KEY) {
|
} else if (event.text === RAISE_HAND_KEY) {
|
||||||
toggleReaction("raiseHand");
|
toggleReaction("raiseHand");
|
||||||
} else if (event.text === APPLAUD_KEY) {
|
} else if (event.text === APPLAUD_KEY) {
|
||||||
toggleReaction("applaud");
|
// Make sure this doesn't get triggered if you are flying, falling, or jumping
|
||||||
|
if (!MyAvatar.isInAir()) {
|
||||||
|
toggleReaction("applaud");
|
||||||
|
}
|
||||||
} else if (event.text === POINT_KEY) {
|
} else if (event.text === POINT_KEY) {
|
||||||
toggleReaction("point");
|
toggleReaction("point");
|
||||||
} else if (event.text === EMOTE_WINDOW && !(Settings.getValue("io.highfidelity.isEditing", false))) {
|
} else if (event.text === EMOTE_WINDOW && !(Settings.getValue("io.highfidelity.isEditing", false))) {
|
||||||
|
@ -639,6 +651,7 @@ function unload() {
|
||||||
// *************************************
|
// *************************************
|
||||||
// #region EMOJI_UTILITY
|
// #region EMOJI_UTILITY
|
||||||
|
|
||||||
|
|
||||||
var EMOJI_52_BASE_URL = "../../resources/images/emojis/52px/";
|
var EMOJI_52_BASE_URL = "../../resources/images/emojis/52px/";
|
||||||
function selectedEmoji(code) {
|
function selectedEmoji(code) {
|
||||||
emojiAPI.addEmoji(code);
|
emojiAPI.addEmoji(code);
|
||||||
|
@ -744,6 +757,7 @@ function toggleEmojiApp() {
|
||||||
emojiAPI.registerAvimojiQMLWindow(emojiAppWindow);
|
emojiAPI.registerAvimojiQMLWindow(emojiAppWindow);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// #endregion
|
// #endregion
|
||||||
// *************************************
|
// *************************************
|
||||||
// END EMOJI_MAIN
|
// END EMOJI_MAIN
|
||||||
|
|
Loading…
Reference in a new issue