-
Notifications
You must be signed in to change notification settings - Fork 754
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
14 changed files
with
334 additions
and
136 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,7 +9,7 @@ | |
| written by Jens Mönig | ||
| [email protected] | ||
|
|
||
| Copyright (C) 2024 by Jens Mönig | ||
| Copyright (C) 2025 by Jens Mönig | ||
|
|
||
| This file is part of Snap!. | ||
|
|
||
|
|
@@ -162,7 +162,7 @@ CustomHatBlockMorph*/ | |
|
|
||
| // Global stuff //////////////////////////////////////////////////////// | ||
|
|
||
| modules.blocks = '2024-December-07'; | ||
| modules.blocks = '2025-January-13'; | ||
|
|
||
| var SyntaxElementMorph; | ||
| var BlockMorph; | ||
|
|
@@ -3781,11 +3781,12 @@ BlockMorph.prototype.userMenu = function () { | |
| ) { | ||
| return menu; | ||
| } | ||
|
|
||
| if (!hasLine) {menu.addLine(); } | ||
| rcvr = rcvr || this.scriptTarget(true); | ||
| if (rcvr && !rcvr.parentThatIsA(IDE_Morph).config.noRingify) { | ||
| menu.addItem("ringify", 'ringify'); | ||
| if (!(top instanceof PrototypeHatBlockMorph)) { | ||
| if (!hasLine) {menu.addLine(); } | ||
| rcvr = rcvr || this.scriptTarget(true); | ||
| if (rcvr && !rcvr.parentThatIsA(IDE_Morph).config.noRingify) { | ||
| menu.addItem("ringify", 'ringify'); | ||
| } | ||
| } | ||
| if (StageMorph.prototype.enableCodeMapping) { | ||
| menu.addLine(); | ||
|
|
@@ -12321,14 +12322,8 @@ InputSlotMorph.prototype.mappedCode = function () { | |
| // InputSlotMorph evaluating: | ||
|
|
||
| InputSlotMorph.prototype.evaluate = function () { | ||
| /* | ||
| answer my contents, which can be a "wish", i.e. a block that refers to | ||
| another sprite's local method, or a text string. If I am numerical convert | ||
| that string to a number. If the conversion fails answer the string | ||
| (e.g. for special choices like 'random', 'all' or 'last') otherwise | ||
| the numerical value. | ||
| */ | ||
| var num, contents; | ||
| // answer my contents, which can be a "wish", i.e. a block that refers to | ||
| // another sprite's local method, or a text string. | ||
|
|
||
| if (this.selectedBlock) { | ||
| return this.selectedBlock; | ||
|
|
@@ -12342,14 +12337,7 @@ InputSlotMorph.prototype.evaluate = function () { | |
| if (this.constant) { | ||
| return this.constant; | ||
| } | ||
| contents = this.contents(); | ||
| if (this.isNumeric) { | ||
| num = parseFloat(contents.text || '0'); | ||
| if (!isNaN(num)) { | ||
| return num; | ||
| } | ||
| } | ||
| return contents.text; | ||
| return this.contents().text; | ||
| }; | ||
|
|
||
| InputSlotMorph.prototype.evaluateOption = function () { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,7 +9,7 @@ | |
| written by Jens Mönig | ||
| [email protected] | ||
|
|
||
| Copyright (C) 2024 by Jens Mönig | ||
| Copyright (C) 2025 by Jens Mönig | ||
|
|
||
| This file is part of Snap!. | ||
|
|
||
|
|
@@ -87,11 +87,11 @@ HatBlockMorph*/ | |
|
|
||
| // Global stuff //////////////////////////////////////////////////////// | ||
|
|
||
| modules.gui = '2024-December-30'; | ||
| modules.gui = '2025-January-21'; | ||
|
|
||
| // Declarations | ||
|
|
||
| var SnapVersion = '10.3.6'; | ||
| var SnapVersion = '10.4-rc9'; | ||
|
|
||
| var IDE_Morph; | ||
| var ProjectDialogMorph; | ||
|
|
@@ -4642,6 +4642,15 @@ IDE_Morph.prototype.settingsMenu = function () { | |
| 'check to cache\nsprite renderings', | ||
| true | ||
| ); | ||
| addPreference( | ||
| 'Dynamic scheduling', | ||
| () => StageMorph.prototype.enableQuicksteps = | ||
| !StageMorph.prototype.enableQuicksteps, | ||
| StageMorph.prototype.enableQuicksteps, | ||
| 'uncheck to schedule\nthreads framewise', | ||
| 'check to quickstep\nthreads atomically', | ||
| true | ||
| ); | ||
| addPreference( | ||
| 'Performer mode', | ||
| () => this.togglePerformerMode(), | ||
|
|
@@ -5576,7 +5585,7 @@ IDE_Morph.prototype.aboutSnap = function () { | |
| world = this.world(); | ||
|
|
||
| aboutTxt = 'Snap! ' + SnapVersion + '\nBuild Your Own Blocks\n\n' | ||
| + 'Copyright \u24B8 2008-2024 Jens M\u00F6nig and ' | ||
| + 'Copyright \u24B8 2008-2025 Jens M\u00F6nig and ' | ||
| + 'Brian Harvey\n' | ||
| + '[email protected], [email protected]\n\n' | ||
| + ' Snap! is developed by the University of California, ' | ||
|
|
@@ -6012,6 +6021,7 @@ IDE_Morph.prototype.exportProject = function (name) { | |
| throw err; | ||
| } | ||
| } | ||
| this.scene.applyGlobalSettings(); | ||
| } | ||
| }; | ||
|
|
||
|
|
@@ -6600,6 +6610,9 @@ IDE_Morph.prototype.openProjectString = function (str, callback, noPrims) { | |
| if (callback) {callback(); } | ||
| return; | ||
| } | ||
| // reset prims | ||
| SpriteMorph.prototype.initBlocks(); | ||
|
|
||
| this.nextSteps([ | ||
| () => msg = this.showMessage('Opening project...'), | ||
| () => { | ||
|
|
@@ -8008,6 +8021,7 @@ IDE_Morph.prototype.setBlocksScale = function (num) { | |
| new Project(this.scenes, this.scene) | ||
| ); | ||
| } | ||
| SpriteMorph.prototype.initBlocks(); | ||
| SyntaxElementMorph.prototype.setScale(num); | ||
| CommentMorph.prototype.refreshScale(); | ||
| this.spriteBar.tabBar.tabTo('scripts'); | ||
|
|
@@ -8409,6 +8423,7 @@ IDE_Morph.prototype.buildProjectRequest = function () { | |
| }; | ||
| this.serializer.isCollectingMedia = false; | ||
| this.serializer.flushMedia(); | ||
| this.scene.applyGlobalSettings(); | ||
|
|
||
| return body; | ||
| }; | ||
|
|
@@ -9656,6 +9671,7 @@ ProjectDialogMorph.prototype.addCloudScene = function (project, delta) { | |
| ProjectDialogMorph.prototype.openCloudProject = function (project, delta) { | ||
| this.ide.backup( | ||
| () => { | ||
| SpriteMorph.prototype.initBlocks(); // reset prims | ||
| this.ide.nextSteps([ | ||
| () => this.ide.showMessage('Fetching project\nfrom the cloud...'), | ||
| () => this.rawOpenCloudProject(project, delta) | ||
|
|
@@ -10677,8 +10693,6 @@ LibraryImportDialogMorph.prototype.importLibrary = function () { | |
| this.isLoadingLibrary = true; | ||
| } | ||
| ); | ||
|
|
||
| ide.refreshIDE(); | ||
| }; | ||
|
|
||
| LibraryImportDialogMorph.prototype.displayBlocks = function (libraryKey) { | ||
|
|
||
Oops, something went wrong.