302 commits

Author	SHA1	Message	Date
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
Chris Willis-Ford	9b04392211	Move build outputs into a dist/ subdirectory (#375) ... * Move Node output: /dist.js => /dist/node/scratch-vm.js * Move web output: /vm{.js,.min.js} => /dist/web/scratch-vm{.js,.min.js} * Update build output references in package.json and the playground's index.html * Move the VirtualMachine class out of index.js into its own file, referenced by index.js. The VirtualMachine class is otherwise unchanged. * Add .gitattributes rules for new file types which were added to this repository without specifying their text/binary attributes * Turn on source maps in webpack and add corresponding .gitignore rule	2017-01-13 13:34:26 -08:00