scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2024-12-28 17:02:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
2146 commits 495 branches 1646 tags 1.5 GiB
Commit graph

147 commits

Author SHA1 Message Date
DD
729fc3d303 Make sprite.costumes private so that I can enforce that when you add costumes, they get assigned a unique ID 2018-02-21 19:59:35 -05:00
Karishma Chadha
f5813b1845 Update sprite names, plus some code cleanup. 2018-02-05 16:54:58 -05:00
Karishma Chadha
7faeed7128 Update blocks after sound/costume rename. 2018-02-05 14:35:52 -05:00
Eric Rosenbaum
115184a2a3
Merge pull request #891 from ericrosenbaum/bugfix/audioplayer-clone-state 
Audio effects state for clones
 2018-01-23 11:55:39 -05:00
Paul Kaplan
90e9e1c0b0
Merge pull request #889 from paulkaplan/fix-mouse-positions 
Fix mouse positions for different stage zoom levels
 2018-01-17 13:49:23 -05:00
Paul Kaplan
223575f850 Remove extra call to initDrawable that was erasing existing drawable. 
initDrawable is called in createClone previously, where the new costumes
are installed. Calling this again here erases those loaded skins and
causes an error when trying to calculate the uniforms when a drag
starts.
 2018-01-12 11:20:17 -05:00
Eric Rosenbaum
283804c21c Init and dispose audio player 2018-01-09 15:57:33 -05:00
Paul Kaplan
327d1179d9 Update the mouse io to give scratch coordinates and client coordinates 
Fixes GUI #642 https://github.com/LLK/scratch-gui/issues/642

Fixes GUI #179 https://github.com/LLK/scratch-gui/issues/179
 2018-01-09 10:37:16 -05:00
Paul Kaplan
4fd7ba896a
Merge pull request #881 from sjhuang26/issue-gui1127-pen-trails 
No pen trails when dragging
 2017-12-29 10:22:18 -05:00
sjhuang26
72dee72148 Change let to const 2017-12-29 09:13:18 -05:00
sjhuang26
f7d80459c7 Fixed pen behavior when dragging 2017-12-29 09:01:30 -05:00
sjhuang26
b726c4c18d Changed postSpriteInfo logic 2017-12-29 08:31:59 -05:00
Paul Kaplan
fe51bd6450 Update layering blocks 2017-12-28 14:40:08 -05:00
Paul Kaplan
cd66eb7f96 Allow size to be set through postSpriteInfo, and emit updates when it is 
Required to allow size to be added to sprite info panel in the GUI.
 2017-12-20 15:35:35 -05:00
Eric Rosenbaum
a71e06af43 Clones get a reference to parent’s audioPlayer 2017-11-28 12:29:45 -05:00
Paul Kaplan
b68b874067 Add sprite duplication method 2017-09-07 11:51:21 -04:00
TheBrokenRail
936ff04b0f Fix setting Infinity to direction (#612) 
* Create rendered-target.js

* Update math-util.js

* Update rendered-target.js

* Update math-util.js

* Update rendered-target.js
 2017-07-26 17:44:02 -04:00
Paul Kaplan
f96a92b4d1 Move renaming and adding into rendered-target with tests 2017-07-25 10:32:25 -04:00
Christopher Willis-Ford
06d5994a32 Use targetWasCreated event to clone pen state 
Remove explicit cloning of `_customState` in favor of smarter,
state-specific cloning.
 2017-06-16 14:22:51 -07:00
Christopher Willis-Ford
04871e24d6 Move RenderedTarget.runtime into Target 
Some code in `Target` was already assuming a `runtime` property was
available, so this change just makes it official.
 2017-06-16 13:16:13 -07:00
Christopher Willis-Ford
454082b569 Improve cleanup on clone disposal 
The `dispose()` method on `RenderedTarget` now:
- informs the runtime that it should end any threads corresponding the
  target being disposed, and
- removes the clone from its sprite.
 2017-06-07 17:05:24 -07:00
Paul Kaplan
3eaec99e51 Always activate the current costume after deleting 2017-05-22 08:17:28 -04:00
Paul Kaplan
423da12c3c Handle more cases of deleting costumes 2017-05-22 08:17:28 -04:00
Paul Kaplan
30a0c0d251 Allow deleting the last sound 2017-05-22 08:17:28 -04:00
Paul Kaplan
a608ca4fed Make rendered targets in charge of deleting their own sounds and costumes 2017-05-22 08:17:28 -04:00
Ray Schamp
20337b53f2 Stop emitting SPRITE_INFO_REPORT 
Instead, set the `_refreshTargets` flag, and emit a full target list at the end of the step.
 2017-05-12 11:42:22 -04:00
Ray Schamp
6c9701f4b2 Merge branch 'develop' into feature/serialization 2017-05-11 13:04:27 -04:00
Rasmus Haglund
d0f1b77209 Copy _customState for now until blocks have init functions 2017-05-05 21:58:18 +02:00
Ray Schamp
baee9a2793 Don't clean costume and sound lists 
They are already clean, since we don't store the data on them any more.
 2017-05-04 13:03:42 -04:00
Ray Schamp
f785117e1d Lint and fix failing tests 2017-04-27 17:49:57 -04:00
Ray Schamp
c9ce6776aa Get SB3 imports working 
For now, store the md5 + extension on costumes in the VM. This way we can load them the same way as we load SB2 assets.
 2017-04-27 17:08:06 -04:00
Ray Schamp
b2ea201707 Don't include asset data in exported JSON 2017-04-26 17:45:36 -04:00
Ray Schamp
a4cdb027ab Merge branch 'develop' of github.com:morantsur/scratch-vm into feature/serialization 
# Conflicts:
#	src/playground/index.html
#	src/serialization/sb2.js
#	src/sprites/rendered-target.js
#	src/virtual-machine.js
#	test/unit/serialization_sb2.js
 2017-04-26 11:44:53 -04:00
Ray Schamp
a4f095db5e Use ES6 style classes 2017-04-17 19:42:48 -04:00
Ray Schamp
e01c4ae108 Pass with --fix 2017-04-17 15:10:04 -04:00
Chris Willis-Ford
44623db5e3 Merge pull request #522 from presight/develop 
Fix so that size is set in float to ensure backward compatibility with Scratch 2.0
 2017-04-06 14:55:08 -07:00
Paul Kaplan
8e84b2757e Report costume and sound data in sprite json 2017-04-06 09:37:39 -04:00
spenen
0f0292320b Added size to playground render info 2017-04-05 18:51:16 +02:00
spenen
8c7097f724 Fix #521 so that size is set in float to ensure backward compatibility with Scratch 2.0 2017-04-05 13:46:42 +02:00
Eric Rosenbaum
2303a1abc5 Remove call to loadSounds from rendered-target initDrawable 2017-03-27 11:56:28 -04:00
Moran
94d2a39cc1 Merge branch 'develop' of https://github.com/LLK/scratch-vm into develop 2017-03-13 18:07:17 -04:00
Christopher Willis-Ford
c23e9c6bf8 Load projects & costumes through scratch-storage 
This also sets up the framework to load sounds through scratch-storage,
to be finished in a later change.
 2017-03-09 11:25:55 -08:00
Paul Kaplan
5b82096670 Clear gfx on stop all 2017-03-06 15:54:52 -05:00
Moran
d8e1d42bf2 Merge branch 'develop' of https://github.com/LLK/scratch-vm into develop 2017-03-03 15:23:43 -05:00
Ray Schamp
bf2303f6de Merge pull request #490 from rschamp/dnd 
Add methods for dragging and dropping sprites
 2017-03-03 09:50:34 -05:00
Ray Schamp
d0cd9cd897 Add methods for dragging and dropping sprites 
* Add `getTargetIdForDrawableId` to translate between renderer picks and VM targets
* Add `startDrag` to stop sprite motion while dragging
* Add `stopDrag` to return sprite motion after dragging
 2017-03-03 09:43:31 -05:00
Ray Schamp
319f27a060 Merge pull request #487 from rschamp/draggability 
Add draggable property to sprites
 2017-03-02 15:56:12 -05:00
Andrew Sliwinski
a4578ba086 Default bitmapResolution to 1 if not provided in costume metadata (#485) 
* Default bitmapResolution to 1 if not provided in costume metadata. Resolves GH-484
 2017-03-02 11:21:01 -05:00
Ray Schamp
8dadc42857 Add draggable property to sprites 
This property should be managed by the VM so that it can be displayed in the sprite info panel in the GUI.
 2017-03-01 18:49:17 -05:00
Ray Schamp
370f2c6a47 Merge pull request #459 from griffpatch/feature/FencingAgain 
Feature fencing again
 2017-02-24 11:27:10 -05:00
Chris Willis-Ford
a56db95aba Merge pull request #446 from magmaboat/hasownproperty 
Perform hasOwnProperty validation
 2017-02-22 13:55:54 -08:00
griffpatch
7bc141e76e Feature Fencing 
This is a re-comit after the previous pull was reverted.
 2017-02-15 15:59:54 +00:00
Ray Schamp
39158c9d48 Revert "Feature fencing" 2017-02-15 09:40:10 -05:00
griffpatch
75e3f6002b Fencing - Take 3 
Dependant on scratch-render pull request.
 2017-02-14 09:12:35 +00:00
Christopher Willis-Ford
bd76395676 Minor cleanup around cloning methods 2017-02-13 14:44:51 -08:00
griffpatch
4d63dcac3b Rename fencing method 2017-02-11 14:30:18 +00:00
Magmaboat
85eee4f18e Perform hasOwnProperty validation 2017-02-09 21:12:47 -05:00
griffpatch
464722f7bd Feature - Fencing of sprites 
This change requires that the pull request for scratch-render (Feature
fencing #82) be taken first
 2017-02-09 10:02:45 +00:00
morant
ed978e3062 Read sprite costume names from JSON, and write currentCostume to JSON 2017-02-07 20:12:55 -05:00
morant
0dc1883e9f Write costumes and sounds to JSON on save 2017-02-07 18:15:11 -05:00
morant
e16f2924a3 Merge branch 'develop' of https://github.com/LLK/scratch-vm into develop 2017-02-07 09:53:17 -05:00
Eric Rosenbaum
9741dc2e35 Merge branch 'develop' of https://github.com/LLK/scratch-vm into sound 2017-02-02 16:37:07 -05:00
Ray Schamp
727fcc7875 Lint for eslint-config-scratch@3 2017-02-01 16:27:55 -05:00
Eric Rosenbaum
95e29ed66a move sound-related code out of rendered target 2017-01-31 18:32:46 -05:00
Eric Rosenbaum
2d8491123e Merge branch 'develop' of https://github.com/LLK/scratch-vm into sound 2017-01-30 11:28:52 -05:00
Eric Rosenbaum
cb4209b27a target handles playnote via audio engine 2017-01-30 10:56:06 -05:00
Eric Rosenbaum
5966a46bbd target manages instrument setting 2017-01-30 10:54:24 -05:00
Eric Rosenbaum
4e4b0b86e1 target manages audio effect values 2017-01-30 10:53:12 -05:00
Eric Rosenbaum
01e237a2d5 audio engine loads all sounds 2017-01-30 10:50:28 -05:00
Eric Rosenbaum
4e57ab561d move playsound function to target 2017-01-30 10:45:15 -05:00
morant
c6c1a63ff0 Merge branch 'feature/194' of https://github.com/morantsur/scratch-vm into develop 
+ Solve code conflicts, and handle deserialization of 3.0 projects.

# Conflicts:
#	src/index.js
#	test/unit/serialization_sb2.js
 2017-01-27 20:05:54 -05:00
griffpatch
cf43efe3ee Effect not correctly copied to clones #337 
Fixes Effect not correctly copied to clones #337
 2017-01-27 13:11:17 +00:00
Christopher Willis-Ford
a6190da774 Lint fixes and related cleanup 2017-01-19 12:50:46 -08:00
Christopher Willis-Ford
369c02b5d5 Implement pen blocks 
These blocks implement pen features as found in Scratch 2.0

Supporting changes include:
- `Target` is now an event emitter
- `RenderedTarget` now emits an event when it moves
- `Target` can now store arbitrary "extra" data, called "custom state"
  in the code, using a `Target`'s `setCustomState` and `getCustomState`
  methods. This is used to store per-target pen state without requiring
  `Target` or `RenderedTarget` to know anything about the pen.
- `Cast` can now cast to an RGB color object.
- `Color` now has functions to convert between RGB and HSV, constants
  for for black & white, and a `mixRgb` function to lerp between two
  colors.
 2017-01-19 11:51:22 -08:00
Ray Schamp
a56346d0a9 Only update costume rotationCenter if it exists 
This prevents sending `NaN`s to the renderer as the rotation center, which prevents the initial render of the costume/backdrop.

Towards LLK/scratch-gui#18
 2017-01-13 13:05:06 -05:00
Ray Schamp
4ba76bbdbd Fix adding SVG costumes 
Previously it assumed every costume to have a `bitmapResolution` property which doesn't apply to vector costumes. This caused the renderer to not render added SVG costumes when they were added with setCostume.
 2017-01-12 15:34:05 -05:00
Eric Rosenbaum
4022703537 move audio state vars into rendered target 2017-01-11 15:42:07 -05:00
Eric Rosenbaum
bd8fdad1d4 add check for audioengine 2017-01-06 16:24:16 -05:00
Eric Rosenbaum
18c88c8ee0 fix stop for audio 2017-01-06 16:14:41 -05:00
Eric Rosenbaum
b88c6c96e2 initialize audio player once per sprite (not for clones) 2017-01-06 16:14:27 -05:00
Eric Rosenbaum
fec9e5b91a add audio to playground 2017-01-06 11:49:25 -05:00
Eric Rosenbaum
c0d57b4b6b separate out main audioengine from audioplayer for each clone 2017-01-04 18:37:55 -05:00
Andrew Sliwinski
6d83931341 WIP clean-up 2016-12-30 10:19:58 -05:00
Andrew Sliwinski
04d9620631 Merge branch 'patch-24' of https://github.com/TheBrokenRail/scratch-vm into feature/194 2016-12-24 08:46:50 -05:00
Eric Rosenbaum
f90807e8a4 add get sound index by name 2016-12-21 16:42:19 -05:00
Eric Rosenbaum
f2793a1d59 Merge branch 'develop' of https://github.com/LLK/scratch-vm into sound 
# Conflicts:
#	package.json
#	src/engine/runtime.js
#	src/sprites/clone.js
 2016-12-21 15:29:57 -05:00
TheBrokenRail
04fc32b294 Update rendered-target.js 2016-12-11 12:40:06 -05:00
Ray Schamp
e9da046969 Report full sprite info in targetsUpdate 
We need more than just the name for the initial render, so send everything consistent with sprite info reports.
 2016-12-07 17:11:08 -05:00
TheBrokenRail
dd86759915 Update rendered-target.js 2016-12-02 15:34:01 -05:00
Ray Schamp
ce17fdbd30 Include costume data in sprite info reports 
Also emit the report on all costume changes
 2016-11-30 13:19:49 -05:00
TheBrokenRail
72b44b3ec7 Update rendered-target.js 2016-11-29 18:57:35 -05:00
TheBrokenRail
1980fbc98d Update rendered-target.js 2016-11-29 18:53:38 -05:00
TheBrokenRail
cac52020a4 Add Export To Rendered Target 2016-11-29 17:18:20 -05:00
Tim Mickel
a767c5ec79
Keep min and max scale in relative bounds as in Scratch 2.0 2016-11-14 12:20:29 -05:00
Tim Mickel
0ede7e6ca1 Rename and delete sprites (#319) 
* Add function to rename sprites

* Add delete sprite function

* Add `isSprite` helper and duplicate check for rename
 2016-10-26 13:27:24 -04:00
Tim Mickel
56ef01745f Implement sprite info emitting and posting (#320) 2016-10-26 13:27:12 -04:00
Tim Mickel
2f0ce7137c Rename Clone -> RenderedTarget (#317) 2016-10-26 11:19:43 -04:00
Renamed from src/sprites/clone.js (Browse further)