Skip to content

DTP#9320

Merged
joshlory merged 125 commits into
productionfrom
test
Jul 5, 2016
Merged

DTP#9320
joshlory merged 125 commits into
productionfrom
test

Conversation

@joshlory

@joshlory joshlory commented Jul 5, 2016

Copy link
Copy Markdown
Contributor

All UI tests green. Eyes tests green after updating one ignore region for bee's wings.

islemaster and others added 30 commits June 17, 2016 11:02
Visible animation list now sources data from animationListModule.
Can add animations by picking from gallery or uploading.
Selecting an animation loads it in Piskel, sourced from animationListModule.
Also sourced from animationListModule now
Set Piskel's framerate option when loading a spritesheet, and save Piskel's framerate option to the animation metadata on a save event.

Required adding an onComplete callback to PiskelApi.loadSpritesheet, because the save that happened mid-load was setting the incorrect framerate in the metadata.

Remaining problem: Changing the framerate in Piskel does not trigger a save event, so the external preview does not immediately update.
More manual control of when we select a new animation (which triggers the load to Piskel)
And refactors BeeItemDrawer and DirtDrawer to extend it.

Previously, BeeItemDrawer inherited from DirtDrawer, although DirtDrawer
contained a lot of functionality that BeeItemDrawer intentionally
discarded. This refactor plus ES6 class implementation makes their
shared vs individual functionality a bit cleaner, and will also make it
easier to add a new Drawer for the new WIP Collector Level type.
Instead of giving animation uploads their own interval, hooks the animation save into the regular project save system.  Now getting animation metadata to save with the project is an async operation that is always preceded by making sure the animations are saved to S3.
This forces them to be saved with the project.  We'll undo this change soonish to keep them by reference, which is more optimal, but for now to get things running this works nicely.
islemaster and others added 29 commits July 1, 2016 19:07
Only smooth-scroll the anchor links in the jumbo banner, not all links on page.
Switched order of attachments and mail commands
e6f7d1f Merge pull request #9309 from code-dot-org/gamelab-wait-for-animation-load (Brad Buchanan)
f5ba7b9 Clarify return value of onP5Preload [ci skip] (Brad Buchanan)
61624ef Comment about self-destructing callback [ci skip] (Brad Buchanan)
a8256ab Preload is _always_ async (Brad Buchanan)
0e42aae Improve readability (Brad Buchanan)
9d226da Move completePreload method closer to runPreload method (Brad Buchanan)
7425c7a Wait for animations to load before running game (Brad Buchanan)
teacher announcement for embedding app lab projects
…-class

Creates a generic Maze Drawer class
Display firebase data in data browser. make properties view look like the mocks.
Split Blockly#blockly_options into blockly_app_options and blockly_level_options
Sometimes a new empty object is passed in, and `{} !== {}`. Use JSON.stringify to see if anything really changed.
Don't autosave if currentSources.animations is a new object
@islemaster does this sound right?
@joshlory joshlory merged commit ada7e4d into production Jul 5, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.