8 commits

Author	SHA1	Message	Date
Scott Erickson	e9222f34bd	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-10-01 13:26:45 -07:00
Scott Erickson	3205821ee9	Got the level editor mostly working again.	2014-10-01 13:26:38 -07:00
Nick Winter	2611e441d7	Trying to standardize sass imports in an effort to test #1615, to no avail.	2014-09-30 16:17:54 -07:00
Scott Erickson	621c684c74	Tweaked the randomize buttons and modal (also changing it to "generate terrain" and refactoring related files accordingly).	2014-09-02 17:53:39 -07:00
Jayant Jain	c33491b04d	Presets in terrain_generate_modal shown from a list instead of hardcoded ... Conflicts: app/templates/editor/level/modal/terrain_randomize.jade	2014-07-25 17:51:48 +05:30
Jayant Jain	86cf344f28	Adds preset images to preview the generated terrain	2014-07-25 17:50:02 +05:30
Jayant Jain	493ebd07e6	Changes randomise to randomize	2014-07-14 06:01:09 +05:30
Nick Winter	6009df26de	Ready for action, sir!	2014-01-03 10:32:13 -08:00