Scott Erickson 2cdfbf1c48 Merged conflicts.		2014-03-21 19:56:25 -07:00
..
ladder	Merged conflicts.	2014-03-21 19:56:25 -07:00
level	Merged.	2014-03-17 04:37:54 -07:00
ladder.jade	Fixed #638, I hope.	2014-03-21 08:09:08 -07:00
level.jade	Moved to 1848 x 1178 pixel canvases, since it's 2x the old size. Added a conversion factor to script camera zooms to account for scripts using the old numbers. Fixed bug where IndieSprites wouldn't update actions.	2014-03-16 13:23:01 -07:00
spectate.jade	Moved to 1848 x 1178 pixel canvases, since it's 2x the old size. Added a conversion factor to script camera zooms to account for scripts using the old numbers. Fixed bug where IndieSprites wouldn't update actions.	2014-03-16 13:23:01 -07:00