Merge from master

This commit is contained in:
jdescottes
2013-11-26 21:40:43 +01:00
35 changed files with 842 additions and 378 deletions

View File

@ -19,11 +19,15 @@ exports.scripts = [
"js/utils/Math.js",
"js/utils/FileUtils.js",
"js/utils/FrameUtils.js",
"js/utils/LayerUtils.js",
"js/utils/ImageResizer.js",
"js/utils/PixelUtils.js",
"js/utils/Serializer.js",
"js/utils/Template.js",
"js/utils/UserSettings.js",
"js/utils/serialization/Serializer.js",
"js/utils/serialization/Deserializer.js",
"js/utils/serialization/backward/Deserializer_v0.js",
"js/utils/serialization/backward/Deserializer_v1.js",
// Application libraries-->
"js/rendering/DrawingLoop.js",
@ -46,7 +50,8 @@ exports.scripts = [
"js/rendering/frame/FrameRenderer.js",
"js/rendering/frame/CachedFrameRenderer.js",
"js/rendering/CanvasRenderer.js",
"js/rendering/SpritesheetRenderer.js",
"js/rendering/FramesheetRenderer.js",
"js/rendering/PiskelRenderer.js",
// Controllers
"js/controller/PiskelController.js",
@ -69,7 +74,9 @@ exports.scripts = [
// Services
"js/service/LocalStorageService.js",
"js/service/HistoryService.js",
"js/service/KeyboardEventService.js",
"js/service/keyboard/ShortcutService.js",
"js/service/keyboard/KeycodeTranslator.js",
"js/service/keyboard/CheatsheetService.js",
"js/service/ImageUploadService.js",
// Tools