9 commits

Author	SHA1	Message	Date
Paul Kaplan	bd3a29650b	Fix variable import scoping	2017-07-17 12:28:44 -04:00
marisaleung	875ccf5b88	Updated variables and var_fire event listener.	2017-06-23 09:57:01 -07:00
Ray Schamp	f785117e1d	Lint and fix failing tests	2017-04-27 17:49:57 -04:00
Ray Schamp	2a4af8a9ca	Fix up most linting/merge errors	2017-04-26 16:50:53 -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
Moran	d8e1d42bf2	Merge branch 'develop' of https://github.com/LLK/scratch-vm into develop	2017-03-03 15:23:43 -05:00
morant	e16f2924a3	Merge branch 'develop' of https://github.com/LLK/scratch-vm into develop	2017-02-07 09:53:17 -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
Andrew Sliwinski	6d83931341	WIP clean-up	2016-12-30 10:19:58 -05:00

Renamed from src/import/sb2import.js (Browse further)