Skip to content

Commit

Permalink
Merge branch 'TurboWarp:master' into weather
Browse files Browse the repository at this point in the history
  • Loading branch information
@samuellouf
samuellouf authored Sep 1, 2023
2 parents c9bf424 + 5fe470e commit 312f741
Show file tree
Hide file tree
Showing 7 changed files with 39 additions and 27 deletions.
11 changes: 10 additions & 1 deletion extensions/Lily/Video.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,14 @@
color1: "#557882",
name: "Video",
blocks: [
{
blockType: Scratch.BlockType.LABEL,
text: "Only direct downloads will work",
},
{
blockType: Scratch.BlockType.LABEL,
text: "Use Iframe extension for YouTube",
},
{
opcode: "loadVideoURL",
blockType: Scratch.BlockType.COMMAND,
Expand Down Expand Up @@ -329,7 +337,8 @@

if (
url.startsWith("https://www.youtube.com/") ||
url.startsWith("https://youtube.com/")
url.startsWith("https://youtube.com/") ||
url.startsWith("https://youtu.be/")
) {
alert(
[
Expand Down
28 changes: 14 additions & 14 deletions extensions/TheShovel/ShovelUtils.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
{
opcode: "importImage",
blockType: Scratch.BlockType.COMMAND,
text: "Import image from [TEXT] name [NAME]",
text: "import image from [TEXT] name [NAME]",
arguments: {
TEXT: {
type: Scratch.ArgumentType.STRING,
Expand All @@ -53,7 +53,7 @@
{
opcode: "getlist",
blockType: Scratch.BlockType.REPORTER,
text: "Get list [TEXT]",
text: "get list [TEXT] as array",
arguments: {
TEXT: {
type: Scratch.ArgumentType.STRING,
Expand All @@ -64,7 +64,7 @@
{
opcode: "setlist",
blockType: Scratch.BlockType.COMMAND,
text: "Set list [NAME] to [TEXT]",
text: "set list [NAME] to [TEXT]",
arguments: {
TEXT: {
type: Scratch.ArgumentType.STRING,
Expand All @@ -79,7 +79,7 @@
{
opcode: "importSprite",
blockType: Scratch.BlockType.COMMAND,
text: "Import sprite from [TEXT]",
text: "import sprite from [TEXT]",
arguments: {
TEXT: {
type: Scratch.ArgumentType.STRING,
Expand All @@ -90,7 +90,7 @@
{
opcode: "importSound",
blockType: Scratch.BlockType.COMMAND,
text: "Import sound from [TEXT] name [NAME]",
text: "import sound from [TEXT] name [NAME]",
arguments: {
TEXT: {
type: Scratch.ArgumentType.STRING,
Expand All @@ -105,7 +105,7 @@
{
opcode: "importProject",
blockType: Scratch.BlockType.COMMAND,
text: "Import project from [TEXT]",
text: "import project from [TEXT]",
arguments: {
TEXT: {
type: Scratch.ArgumentType.STRING,
Expand All @@ -117,7 +117,7 @@
{
opcode: "loadExtension",
blockType: Scratch.BlockType.COMMAND,
text: "Load extension from [TEXT]",
text: "load extension from [TEXT]",
arguments: {
TEXT: {
type: Scratch.ArgumentType.STRING,
Expand All @@ -129,7 +129,7 @@
{
opcode: "restartProject",
blockType: Scratch.BlockType.COMMAND,
text: "Restart project",
text: "restart project",
arguments: {
TEXT: {
type: Scratch.ArgumentType.STRING,
Expand All @@ -140,7 +140,7 @@
{
opcode: "deleteSprite",
blockType: Scratch.BlockType.COMMAND,
text: "Delete sprite [SPRITE]",
text: "delete sprite [SPRITE]",
arguments: {
SPRITE: {
type: Scratch.ArgumentType.STRING,
Expand All @@ -151,7 +151,7 @@
{
opcode: "deleteImage",
blockType: Scratch.BlockType.COMMAND,
text: "Delete costume [COSNAME] in [SPRITE]",
text: "delete costume [COSNAME] in [SPRITE]",
arguments: {
COSNAME: {
type: Scratch.ArgumentType.STRING,
Expand All @@ -166,7 +166,7 @@
{
opcode: "setedtarget",
blockType: Scratch.BlockType.COMMAND,
text: "Set editing target to [NAME]",
text: "set editing target to [NAME]",
arguments: {
NAME: {
type: Scratch.ArgumentType.STRING,
Expand All @@ -178,7 +178,7 @@
{
opcode: "brightnessByColor",
blockType: Scratch.BlockType.REPORTER,
text: "Get brightness of [color]",
text: "brightness of [color]",
arguments: {
color: {
type: Scratch.ArgumentType.STRING,
Expand All @@ -190,12 +190,12 @@
{
opcode: "getAllSprites",
blockType: Scratch.BlockType.REPORTER,
text: "get all sprites",
text: "all sprites",
},
{
opcode: "getfps",
blockType: Scratch.BlockType.REPORTER,
text: "Fps",
text: "fps",
},
],
};
Expand Down
14 changes: 7 additions & 7 deletions extensions/box2d.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12522,7 +12522,7 @@
blockType: BlockType.COMMAND,
text: formatMessage({
id: "griffpatch.setStage",
default: "setup stage [stageType]",
default: "set stage boundaries to [stageType]",
description: "Set the stage type",
}),
arguments: {
Expand Down Expand Up @@ -12802,7 +12802,7 @@
blockType: BlockType.COMMAND,
text: formatMessage({
id: "griffpatch.setStatic",
default: "set fixed [static]",
default: "set fixed to [static]",
description: "Sets whether this block is static or dynamic",
}),
arguments: {
Expand Down Expand Up @@ -12833,7 +12833,7 @@
blockType: BlockType.COMMAND,
text: formatMessage({
id: "griffpatch.setDensity",
default: "set density [density]",
default: "set density to [density]",
description: "Set the density of the object",
}),
arguments: {
Expand Down Expand Up @@ -12880,7 +12880,7 @@
blockType: BlockType.COMMAND,
text: formatMessage({
id: "griffpatch.setFriction",
default: "set friction [friction]",
default: "set friction to [friction]",
description: "Set the friction of the object",
}),
arguments: {
Expand Down Expand Up @@ -12927,7 +12927,7 @@
blockType: BlockType.COMMAND,
text: formatMessage({
id: "griffpatch.setRestitution",
default: "set bounce [restitution]",
default: "set bounce to [restitution]",
description: "Set the bounce of the object",
}),
arguments: {
Expand Down Expand Up @@ -13024,7 +13024,7 @@
opcode: "getTouching",
text: formatMessage({
id: "griffpatch.getTouching",
default: "touching [where]",
default: "list sprites touching [where]",
description: "get the name of any sprites we are touching",
}),
blockType: BlockType.REPORTER,
Expand All @@ -13047,7 +13047,7 @@
blockType: BlockType.COMMAND,
text: formatMessage({
id: "griffpatch.setScroll",
default: "set scroll x: [ox] y: [oy]",
default: "set scroll to x: [ox] y: [oy]",
description: "Sets whether this block is static or dynamic",
}),
arguments: {
Expand Down
2 changes: 1 addition & 1 deletion extensions/gamepad.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
{
opcode: "gamepadConnected",
blockType: Scratch.BlockType.BOOLEAN,
text: "is gamepad [pad] connected?",
text: "gamepad [pad] connected?",
arguments: {
pad: {
type: Scratch.ArgumentType.NUMBER,
Expand Down
5 changes: 4 additions & 1 deletion extensions/local-storage.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,15 @@
let namespace = "";
const getFullStorageKey = () => `${PREFIX}${namespace}`;

let lastNamespaceWarning = 0;

const validNamespace = () => {
const valid = !!namespace;
if (!valid) {
if (!valid && Date.now() - lastNamespaceWarning > 3000) {
alert(
'Local Storage extension: project must run the "set storage namespace ID" block before it can use other blocks'
);
lastNamespaceWarning = Date.now();
}
return valid;
};
Expand Down
2 changes: 1 addition & 1 deletion extensions/pointerlock.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
{
opcode: "isLocked",
blockType: Scratch.BlockType.BOOLEAN,
text: "is pointer locked?",
text: "pointer locked?",
},
],
menus: {
Expand Down
4 changes: 2 additions & 2 deletions extensions/text.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@
{
opcode: "unicodeof",
blockType: Scratch.BlockType.REPORTER,
text: "Unicode of [STRING]",
text: "unicode of [STRING]",
arguments: {
STRING: {
type: Scratch.ArgumentType.STRING,
Expand All @@ -174,7 +174,7 @@
{
opcode: "unicodefrom",
blockType: Scratch.BlockType.REPORTER,
text: "Unicode [NUM] as letter",
text: "unicode [NUM] as letter",
arguments: {
NUM: {
type: Scratch.ArgumentType.NUMBER,
Expand Down

0 comments on commit 312f741

Please sign in to comment.