Merge with master after PR zoom-level

This commit is contained in:
juliandescottes
2013-11-23 19:50:53 +01:00
27 changed files with 956 additions and 366 deletions

View File

@ -13,7 +13,9 @@ exports.scripts = [
// Libraries
"js/utils/core.js",
"js/utils/UserAgent.js",
"js/utils/CanvasUtils.js",
"js/utils/Math.js",
"js/utils/FileUtils.js",
"js/utils/FrameUtils.js",
"js/utils/ImageResizer.js",
@ -38,8 +40,12 @@ exports.scripts = [
"js/selection/ShapeSelection.js",
// Rendering
"js/rendering/AbstractRenderer.js",
"js/rendering/CompositeRenderer.js",
"js/rendering/layer/LayersRenderer.js",
"js/rendering/frame/FrameRenderer.js",
"js/rendering/frame/CachedFrameRenderer.js",
"js/rendering/CanvasRenderer.js",
"js/rendering/FrameRenderer.js",
"js/rendering/SpritesheetRenderer.js",
// Controllers
@ -48,6 +54,7 @@ exports.scripts = [
"js/controller/PreviewFilmController.js",
"js/controller/LayersListController.js",
"js/controller/AnimatedPreviewController.js",
"js/controller/MinimapController.js",
"js/controller/ToolController.js",
"js/controller/PaletteController.js",
"js/controller/NotificationController.js",