Merge branch 'develop' into nj/ui-changes
Showing
- .travis.yml 11 additions, 1 deletion.travis.yml
- package.json 2 additions, 1 deletionpackage.json
- src/components/sprite-selector/sprite-selector.jsx 1 addition, 1 deletionsrc/components/sprite-selector/sprite-selector.jsx
- src/components/stage-selector/stage-selector.jsx 1 addition, 1 deletionsrc/components/stage-selector/stage-selector.jsx
- src/containers/costume-tab.jsx 20 additions, 9 deletionssrc/containers/costume-tab.jsx
- src/containers/sound-tab.jsx 4 additions, 4 deletionssrc/containers/sound-tab.jsx
- src/containers/stage-selector.jsx 13 additions, 4 deletionssrc/containers/stage-selector.jsx
- src/containers/target-pane.jsx 1 addition, 2 deletionssrc/containers/target-pane.jsx
- src/lib/file-uploader.js 28 additions, 16 deletionssrc/lib/file-uploader.js
- src/lib/gif-decoder.js 64 additions, 0 deletionssrc/lib/gif-decoder.js
- test/fixtures/paddleball.gif 0 additions, 0 deletionstest/fixtures/paddleball.gif
- test/integration/backdrops.test.js 1 addition, 1 deletiontest/integration/backdrops.test.js
- test/integration/costumes.test.js 23 additions, 1 deletiontest/integration/costumes.test.js
- test/integration/sprites.test.js 25 additions, 2 deletionstest/integration/sprites.test.js
Loading
Please register or sign in to comment