codecombat/app/views/editor/level
Ting-Kuan 692693c181 Merge branch 'master' into feature/loading-views
Conflicts:
	app/locale/en.coffee
	app/views/editor/level/edit.coffee
	app/views/kinds/CocoView.coffee
	app/views/play/ladder/ladder_tab.coffee
	app/views/play/ladder_view.coffee
	app/views/play/level/level_loading_view.coffee
2014-04-19 01:15:04 -04:00
..
component Merge branch 'master' into feature/loading-views 2014-04-19 01:15:04 -04:00
modal 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
system Set up the tabs and views in the level editor to reload so that when patches are applied, their changes are visible. 2014-04-17 14:23:33 -07:00
thang Before merge to master. 2014-04-17 19:52:09 -04:00
add_thangs_view.coffee Migrate view to fit new supermodel. 2014-04-16 02:28:59 -04:00
components_tab_view.coffee Merge branch 'master' into feature/loading-views 2014-04-19 01:15:04 -04:00
edit.coffee Merge branch 'master' into feature/loading-views 2014-04-19 01:15:04 -04:00
fork_view.coffee Switching from the slow _.cloneDeep to the fast $.extend 2014-03-18 13:08:26 -07:00
home.coffee Starting work on simple recruitment listings. Moved Treema and the JS parts of Bootstrap to bower. 2014-04-05 17:05:03 -07:00
save_view.coffee Set up patches for components. 2014-04-16 10:42:32 -07:00
scripts_tab_view.coffee Migrate view to fit new supermodel. 2014-04-16 02:28:59 -04:00
settings_tab_view.coffee Migrate view to fit new supermodel. 2014-04-16 02:28:59 -04:00
systems_tab_view.coffee Merge branch 'master' into feature/loading-views 2014-04-19 01:15:04 -04:00
thangs_tab_view.coffee Merge branch 'master' into feature/loading-views 2014-04-19 01:15:04 -04:00
treema_nodes.coffee 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
versions_view.coffee Added a versions modal for every type 2014-03-10 23:29:34 +01:00