Commit graph

214 commits

Author SHA1 Message Date
Nathan Dinsmore
55652f899b Merge branch 'rename-sound-update-refs'
Conflicts:
	src/scratch/ScratchRuntime.as
2014-06-24 18:59:43 -04:00
Nathan Dinsmore
4552c5e0b0 Implemented isSoundNameUsed and fixed a copy-paste error 2014-06-24 18:56:53 -04:00
Nathan Dinsmore
746dfd739d Made renameSprite/renameCostume DRYer 2014-06-24 18:49:23 -04:00
Nathan Dinsmore
24082315f2 Merge branch 'rename-sprite-update-refs'
Conflicts:
	src/scratch/ScratchRuntime.as
2014-06-24 18:45:44 -04:00
Nathan Dinsmore
d58074ff4f Fixed updating references 2014-06-24 18:13:13 -04:00
Nathan Dinsmore
f364eaaab4 Made empty sprite name turn into Sprite<n> instead of <n> 2014-06-24 18:01:03 -04:00
Nathan Dinsmore
3cfe0db587 Merge branch 'stop-deleted-scripts'
Conflicts:
	src/ui/BlockPalette.as
2014-06-24 17:50:02 -04:00
Nathan Dinsmore
74eefd99ec Normalized whitespace: converted line endings to Unix (\n) 2014-06-24 17:39:35 -04:00
Nathan Dinsmore
926df9065d Normalized whitespace: added trailing newlines 2014-06-24 17:35:27 -04:00
Nathan Dinsmore
eece29a092 Normalized whitespace: removed extraneous trailing newlines 2014-06-24 17:34:37 -04:00
Nathan Dinsmore
c5d0b5e637 Normalized whitespace: removed space on blank lines 2014-06-24 17:31:18 -04:00
Nathan Dinsmore
73ce84c772 Merge branch 'orphaned-comment'
Conflicts:
	src/scratch/ScratchRuntime.as
2014-06-24 17:08:02 -04:00
Nathan Dinsmore
6001b87fe2 Merge pull request #268 from nathan/else-overflow
Fixed else label overflowing in some languages
2014-06-24 16:58:09 -04:00
Nathan Dinsmore
6242cbd14e Merge pull request #277 from nathan/procedure-editor-label-overflow
Fixed overlap of labels in procedure editor in certain languages
2014-06-24 16:57:29 -04:00
Nathan Dinsmore
06cbd80a8c Merge pull request #284 from nathan/zoomed-comment-dragging
Fixed comments being scaled incorrectly when picked up
2014-06-24 16:42:11 -04:00
Nathan Dinsmore
b7a180ce8f Merge pull request #286 from nathan/block-state
Made blocks keep track of their full state when grabbed
2014-06-24 15:00:24 -04:00
Nathan Dinsmore
5a66cbffef Fixed whitespace in ui.parts.LibraryPart 2014-06-24 14:43:55 -04:00
Nathan Dinsmore
3fd3298c81 Fixed formatting in ui.SpriteThumbnail 2014-06-24 14:43:04 -04:00
Nathan Dinsmore
89f28a2e22 Merge pull request #214 from nathan/dont-round-costume-center
Fixed rounding costume center coordinates in vector mode
2014-06-24 14:18:38 -04:00
Nathan Dinsmore
dceb5f64ab Merge branch 'color-picker-drag'
Conflicts:
	src/util/GestureHandler.as
2014-06-24 14:13:22 -04:00
Nathan Dinsmore
b94663adfc Switched to a ternary conditional 2014-06-24 14:09:30 -04:00
Nathan Dinsmore
293b1560b0 Merge branch 'fix-stage-sprite-clicked'
Conflicts:
	src/blocks/Block.as
2014-06-24 14:09:05 -04:00
Nathan Dinsmore
6cd8833215 Merge pull request #183 from nathan/run-while-dragging
Fixed shadow disappearing when a script runs while being dragged
2014-06-24 13:58:10 -04:00
Nathan Dinsmore
7a3c45fa2e Merge pull request #169 from nathan/broadcasts-in-palette
Fixed broadcasts created in palette not being accessible via menu
2014-06-24 13:39:37 -04:00
Nathan Dinsmore
580148cbf2 Merge pull request #174 from nathan/backpack-duplicates
Fixed duplication when dragging media into the backpack
2014-06-24 13:18:23 -04:00
Nathan Dinsmore
07fc1f4728 Merge pull request #177 from nathan/set-var-cache
Fixed incorrect caching in primVarSet and primVarChange
2014-06-24 13:11:48 -04:00
Nathan Dinsmore
f4a7bb11da Fixed whitespace in DisplayObjectContainerIn3D 2014-06-24 12:55:53 -04:00
Nathan Dinsmore
9ae4614595 Fixed whitespace and formatting in util.SimpleFlvWriter 2014-06-24 12:52:47 -04:00
Nathan Dinsmore
3ca6d42232 Fixed whitespace in soundedit.WaveformView 2014-06-24 12:43:37 -04:00
Nathan Dinsmore
453f26559c Fixed whitespace in blocks.Block 2014-06-24 12:42:48 -04:00
Nathan Dinsmore
4019358fbe Fixed whitespace in primitives.SensingPrims 2014-06-24 12:40:42 -04:00
Nathan Dinsmore
2d17905853 Fixed whitespace in scratch.ScratchStage 2014-06-24 12:37:50 -04:00
Nathan Dinsmore
ae0f4f2954 Moved attribute arrays into constants in scratch.BlockMenus 2014-06-24 12:19:23 -04:00
Nathan Dinsmore
20d24f2a63 Merge pull request #248 from djdolphin/validate-attributes
Make attribute block update when switching sprites
2014-06-24 12:18:10 -04:00
Nathan Dinsmore
5f8401e846 Removed unused reference to app 2014-06-24 10:06:01 -04:00
Nathan Dinsmore
fc957ccd01 Merge pull request #295 from doyousketch2/ListPrims
Update ListPrims.as
2014-06-22 14:01:27 -04:00
doyousketch2
74697446c2 Update ListPrims.as
Nothing major, just fixed a typo.
2014-06-22 06:05:49 -04:00
Nathan Dinsmore
34aac1b158 Check that filters is truthy 2014-06-18 09:50:42 -04:00
Shane M. Clements
0d7417b5bd Bumped version to 420 2014-06-18 15:06:54 +02:00
Shane M. Clements
111dbeac8e Merge pull request #279 from nathan/rename-costume-update-refs
Fixed renaming costume breaking references to that costume
2014-06-18 12:57:29 +02:00
Shane M. Clements
0e8f29f0b9 Merge pull request #257 from nathan/slider-min-max-autosave
Fixed setting slider min/max not triggering autosave
2014-06-18 12:40:18 +02:00
Shane M. Clements
5ca1bca79c Merge pull request #264 from nathan/change-var-in-palette
Fixed changing variable name in set/change blocks in palette
2014-06-18 12:39:13 +02:00
Shane M. Clements
594c9ac599 Merge pull request #272 from nathan/zoom-focal-point
Preserved position of top left of scripting area when zooming
2014-06-18 12:31:56 +02:00
Shane M. Clements
3e3295ca04 Merge pull request #265 from nathan/local-list-watcher-colon
Added colons to the titles of local list watchers
2014-06-18 12:28:19 +02:00
Shane M. Clements
9b83662450 Merge pull request #251 from LLK/bubble_hide_fix
Fix hiding the 'say' bubble WRT number formatting
2014-06-18 12:27:25 +02:00
Shane M. Clements
a3427cd77d Merge pull request #274 from nathan/bitmap-selection-misalignment
Fixed grid for selection and stamp tools in bitmap editor
2014-06-18 12:25:23 +02:00
Shane M. Clements
2527a113be Merge pull request #259 from nathan/fix-pencil-keyup
Fixed pressing keys while drawing with the pencil
2014-06-18 12:21:07 +02:00
Shane M. Clements
23a285e82c Merge pull request #261 from nathan/resizing-zoomed-comments
Fixed resizing zoomed comments
2014-06-18 12:12:10 +02:00
Shane M. Clements
ca19712706 Merge pull request #267 from nathan/drop-down-menu-alignment
Fixed alignment of drop-down menus when blocks are zoomed
2014-06-18 12:11:32 +02:00
Shane M. Clements
2eb84b276d Merge pull request #275 from nathan/infinite-position
Fixed setting x or y position to +-Infinity
2014-06-18 12:09:08 +02:00