Merge branch 'develop' into fix-tests-on-windows
Showing
- .travis.yml 8 additions, 0 deletions.travis.yml
- package.json 8 additions, 8 deletionspackage.json
- scripts/generate-locale-messages.js 1 addition, 1 deletionscripts/generate-locale-messages.js
- src/components/gui/gui.jsx 1 addition, 1 deletionsrc/components/gui/gui.jsx
- src/components/loupe/loupe.css 5 additions, 0 deletionssrc/components/loupe/loupe.css
- src/components/loupe/loupe.jsx 104 additions, 0 deletionssrc/components/loupe/loupe.jsx
- src/components/sound-editor/sound-editor.jsx 15 additions, 15 deletionssrc/components/sound-editor/sound-editor.jsx
- src/components/sprite-selector-item/sprite-selector-item.jsx 1 addition, 1 deletionsrc/components/sprite-selector-item/sprite-selector-item.jsx
- src/components/sprite-selector/sprite-selector.jsx 1 addition, 1 deletionsrc/components/sprite-selector/sprite-selector.jsx
- src/components/stage-selector/stage-selector.jsx 2 additions, 2 deletionssrc/components/stage-selector/stage-selector.jsx
- src/components/stage/stage.css 18 additions, 1 deletionsrc/components/stage/stage.css
- src/components/stage/stage.jsx 36 additions, 11 deletionssrc/components/stage/stage.jsx
- src/components/turbo-mode/turbo-mode.jsx 1 addition, 1 deletionsrc/components/turbo-mode/turbo-mode.jsx
- src/containers/blocks.jsx 16 additions, 5 deletionssrc/containers/blocks.jsx
- src/containers/costume-tab.jsx 2 additions, 2 deletionssrc/containers/costume-tab.jsx
- src/containers/sound-tab.jsx 2 additions, 2 deletionssrc/containers/sound-tab.jsx
- src/containers/stage.jsx 82 additions, 12 deletionssrc/containers/stage.jsx
- src/lib/make-toolbox-xml.js 141 additions, 3 deletionssrc/lib/make-toolbox-xml.js
- src/locale.js 17 additions, 5 deletionssrc/locale.js
- src/reducers/color-picker.js 40 additions, 0 deletionssrc/reducers/color-picker.js
Loading
Please register or sign in to comment