This is an automated email from the git hooks/post-receive script. thansen pushed a commit to branch master in repository aseprite.
commit 4fb66833e272fd3550d50f7e2d5a18ca4f243dd4 Merge: 8d0f104 8749cb7 Author: Tobias Hansen <[email protected]> Date: Wed Apr 20 19:03:00 2016 +0100 Merge tag 'v1.1.4.1' .gitmodules | 6 + .travis.yml | 2 +- CMakeLists.txt | 91 +- INSTALL.md | 136 +- README.md | 6 +- cmake/FindTests.cmake | 35 + data/gui.xml | 65 +- data/palettes/a64.gpl | 22 + data/palettes/arne-paldac.gpl | 247 + data/palettes/arne16.gpl | 2 +- data/palettes/arne32.gpl | 2 +- data/palettes/cg-arne.gpl | 21 + data/palettes/copper-tech.gpl | 22 + data/palettes/cpc-boy.gpl | 38 + data/palettes/eroge-copper.gpl | 22 + data/palettes/gameboy-color-type1.gpl | 41 + data/palettes/jmp.gpl | 22 + data/palettes/monokai.gpl | 15 + data/palettes/psygnork.gpl | 22 + data/palettes/vga-13h.gpl | 261 + data/palettes/web-safe-colors.gpl | 222 + data/palettes/x11.gpl | 141 + data/pref.xml | 21 +- data/scripts/white_to_alpha.js | 25 +- data/skins/default/sheet.png | Bin 13981 -> 13776 bytes data/skins/default/skin.xml | 12 - data/widgets/options.xml | 27 +- data/widgets/select_accelerator.xml | 1 + src/CMakeLists.txt | 60 +- src/allegro/src/x/xkeyboard.c | 2 + src/allegro/src/x/xwin.c | 7 + src/app/CMakeLists.txt | 16 +- src/app/app.cpp | 75 +- src/app/app_menus.cpp | 4 +- src/app/app_options.cpp | 4 +- src/app/app_options.h | 4 + src/app/cmd/copy_region.cpp | 10 +- src/app/cmd/copy_region.h | 12 +- src/app/commands/cmd_add_color.cpp | 156 + src/app/commands/cmd_color_quantization.cpp | 4 +- src/app/commands/cmd_flip.cpp | 33 +- src/app/commands/cmd_grid.cpp | 66 +- src/app/commands/cmd_keyboard_shortcuts.cpp | 5 +- src/app/commands/cmd_options.cpp | 151 +- src/app/commands/cmd_palette_editor.cpp | 4 +- src/app/commands/cmd_run_script.cpp | 8 +- src/app/commands/cmd_select_tile.cpp | 124 + src/app/commands/cmd_show.cpp | 174 + src/app/commands/cmd_sprite_size.cpp | 14 +- src/app/commands/commands_list.h | 7 +- src/app/context_flags.h | 4 +- .../selection_mode.h => crash/raw_images_as.h} | 17 +- src/app/crash/read_document.cpp | 58 + src/app/crash/read_document.h | 5 +- src/app/crash/session.cpp | 44 +- src/app/crash/session.h | 5 +- src/app/file/file.cpp | 11 +- src/app/modules/gui.cpp | 10 +- src/app/pref/preferences.h | 1 - src/app/recent_files.cpp | 6 +- src/app/script/app_object.cpp | 89 + src/app/{snap_to_grid.h => script/app_object.h} | 12 +- src/app/script/app_scripting.cpp | 79 + src/app/script/app_scripting.h | 47 + src/app/script/console_object.cpp | 65 + .../{snap_to_grid.h => script/console_object.h} | 12 +- src/app/script/image_class.cpp | 101 + src/app/{snap_to_grid.h => script/image_class.h} | 10 +- src/app/script/image_wrap.cpp | 52 + src/app/script/image_wrap.h | 39 + src/app/script/pixel_color.h | 86 + src/app/script/sprite_class.cpp | 171 + src/app/{snap_to_grid.h => script/sprite_class.h} | 10 +- src/app/script/sprite_wrap.cpp | 96 + src/app/script/sprite_wrap.h | 53 + src/app/scripting/app_scripting.cpp | 40 - src/app/scripting/app_scripting.h | 24 - src/app/scripting/raw_color.h | 49 - src/app/scripting/sprite.h | 143 - src/app/shell.cpp | 6 +- src/app/shell.h | 6 +- src/app/snap_to_grid.cpp | 27 +- src/app/snap_to_grid.h | 11 +- src/app/tools/controller.h | 10 +- src/app/tools/controllers.h | 79 +- src/app/tools/inks.h | 17 +- src/app/tools/tool_loop.h | 9 +- src/app/tools/tool_loop_manager.cpp | 33 +- src/app/tools/tool_loop_manager.h | 11 +- src/app/tools/tool_loop_modifiers.h | 28 + src/app/ui/brush_popup.cpp | 6 +- src/app/ui/color_bar.cpp | 61 +- src/app/ui/color_bar.h | 1 + src/app/ui/color_button.cpp | 40 +- src/app/ui/color_button.h | 13 +- src/app/ui/{color_selector.cpp => color_popup.cpp} | 41 +- src/app/ui/{color_selector.h => color_popup.h} | 14 +- src/app/ui/color_selector.cpp | 252 +- src/app/ui/color_selector.h | 64 +- src/app/ui/color_source.h | 25 + src/app/ui/color_spectrum.cpp | 27 +- src/app/ui/color_spectrum.h | 23 +- src/app/ui/color_tint_shade_tone.cpp | 58 +- src/app/ui/color_tint_shade_tone.h | 19 +- src/app/ui/color_wheel.cpp | 43 +- src/app/ui/color_wheel.h | 23 +- src/app/ui/context_bar.cpp | 14 +- src/app/ui/context_bar.h | 4 +- src/app/ui/data_recovery_view.cpp | 50 +- src/app/ui/devconsole_view.h | 8 +- src/app/ui/editor/brush_preview.cpp | 27 +- src/app/ui/editor/drawing_state.cpp | 43 +- src/app/ui/editor/drawing_state.h | 4 +- src/app/ui/editor/editor.cpp | 230 +- src/app/ui/editor/editor.h | 24 +- src/app/ui/editor/editor_state.h | 3 + src/app/ui/editor/moving_pixels_state.cpp | 5 +- src/app/ui/editor/pixels_movement.cpp | 189 +- src/app/ui/editor/pixels_movement.h | 5 +- src/app/ui/editor/play_state.cpp | 8 +- src/app/ui/editor/play_state.h | 5 +- src/app/ui/editor/standby_state.cpp | 25 + src/app/ui/editor/standby_state.h | 3 +- src/app/ui/editor/state_with_wheel_behavior.cpp | 7 +- src/app/ui/editor/tool_loop_impl.cpp | 13 +- src/app/ui/file_list.cpp | 7 +- src/app/ui/file_list.h | 3 +- src/app/ui/keyboard_shortcuts.cpp | 25 +- src/app/ui/keyboard_shortcuts.h | 9 +- src/app/ui/palette_view.cpp | 10 +- src/app/ui/palette_view.h | 11 +- src/app/ui/recent_listbox.cpp | 21 +- src/app/ui/select_accelerator.cpp | 11 +- src/app/ui/select_accelerator.h | 4 +- src/app/ui/skin/skin_theme.cpp | 17 +- src/app/ui/status_bar.cpp | 6 +- src/app/ui/status_bar.h | 5 +- src/app/ui/tabs.cpp | 31 +- src/app/util/freetype_utils.cpp | 115 +- src/base/24bits.h | 3 +- src/base/CMakeLists.txt | 15 +- src/base/base.h | 6 +- src/base/buffer.h | 4 +- src/base/config.h.cmakein | 3 +- src/base/connection.h | 6 +- src/base/debug.cpp | 4 +- src/base/dll_unix.h | 7 +- src/base/fs_unix.h | 6 +- src/base/fstream_path.h | 6 +- src/base/ints.h | 19 + src/base/launcher.cpp | 8 +- src/base/log.cpp | 1 + src/base/log.h | 4 + src/base/observers.h | 4 +- src/base/path.cpp | 10 +- src/base/path.h | 6 +- src/base/process.h | 4 +- src/base/program_options.cpp | 4 +- src/base/serialization.h | 3 +- src/base/sha1_rfc3174.c | 3 +- src/base/time.cpp | 25 +- src/base/time.h | 8 +- src/cfg/cfg.cpp | 3 +- src/config.h | 4 +- src/doc/CMakeLists.txt | 6 +- src/doc/algo.cpp | 3 +- src/doc/algorithm/floodfill.cpp | 1 + src/doc/algorithm/resize_image.cpp | 16 +- src/doc/algorithm/resize_image.h | 3 +- src/doc/algorithm/rotate.cpp | 39 +- src/doc/algorithm/rotsprite.cpp | 10 +- src/doc/blend_funcs.cpp | 63 +- src/doc/blend_funcs.h | 4 +- src/doc/brush.cpp | 1 - src/doc/color.h | 4 +- src/doc/color_scales.h | 3 +- src/doc/context.cpp | 3 +- src/doc/conversion_she.cpp | 19 +- src/doc/document.cpp | 4 +- src/doc/documents.cpp | 6 +- src/doc/file/col_file.cpp | 3 +- src/doc/frame_tag.cpp | 3 +- src/doc/frame_tags.cpp | 3 +- src/doc/handle_anidir.cpp | 3 +- src/doc/image_buffer.h | 3 +- src/doc/image_io.cpp | 3 +- src/doc/mask.cpp | 3 +- src/doc/object.cpp | 3 +- src/doc/object_id.h | 4 +- src/doc/palette.cpp | 3 +- src/doc/palette.h | 3 +- src/doc/remap.cpp | 11 +- src/doc/remap.h | 3 +- src/doc/rgbmap.h | 3 +- src/doc/site.cpp | 3 +- src/doc/site.h | 10 +- src/doc/sprite.cpp | 3 +- src/filters/color_curve_filter.cpp | 7 +- src/filters/convolution_matrix_filter.cpp | 3 +- src/filters/convolution_matrix_filter.h | 3 +- src/filters/median_filter.h | 3 +- src/filters/replace_color_filter.cpp | 3 +- src/fixmath/fixmath.h | 1 + src/{scripting => ft}/LICENSE.txt | 2 +- src/ft/README.md | 4 + src/ft/face.h | 257 + src/ft/freetype_headers.h | 15 + src/ft/lib.h | 54 + src/gfx/color.h | 4 +- src/main/main.cpp | 11 +- src/main/resources_win32.rc | 8 +- src/net/CMakeLists.txt | 2 +- src/net/http_request.cpp | 3 +- src/pen/pen_win.h | 2 + src/render/quantization.cpp | 3 +- src/render/render.cpp | 3 +- src/render/zoom.cpp | 2 + src/script/CMakeLists.txt | 9 + src/{scripting => script}/LICENSE.txt | 2 +- src/{scripting => script}/README.md | 2 +- src/script/engine.cpp | 542 +++ src/{scripting => script}/engine.h | 105 +- src/{scripting => script}/engine_delegate.h | 8 +- src/scripting/CMakeLists.txt | 7 - src/scripting/engine.cpp | 356 -- src/she/CMakeLists.txt | 85 +- src/she/alleg4/alleg_display.cpp | 5 +- src/she/alleg4/alleg_display.h | 4 +- src/she/alleg4/alleg_surface.cpp | 43 +- src/she/alleg4/alleg_surface.h | 22 +- src/she/alleg4/clock.cpp | 43 - src/she/alleg4/clock.h | 18 - src/she/alleg4/key_poller.cpp | 4 +- src/she/alleg4/mouse_poller.cpp | 13 +- src/she/alleg4/she.cpp | 21 +- src/she/clock.h | 17 - src/she/common/freetype_font.cpp | 89 + src/she/common/freetype_font.h | 44 + src/she/common/generic_surface.h | 236 + src/she/common/locked_surface.h | 115 - src/she/common/{font.h => sprite_sheet_font.h} | 31 +- src/she/common/system.h | 19 +- src/she/display.h | 5 +- src/she/event.h | 10 + src/she/font.h | 10 +- src/she/gtk/native_dialogs.cpp | 194 + src/she/gtk/native_dialogs.h | 32 + src/she/keys.h | 3 +- src/she/locked_surface.h | 58 - src/she/osx/app.h | 10 +- src/she/osx/app.mm | 50 +- src/she/osx/app_delegate.h | 4 +- src/she/osx/app_delegate.mm | 15 +- src/she/osx/event_queue.h | 2 +- src/she/osx/event_queue.mm | 18 +- src/she/osx/view.mm | 32 +- src/she/osx/window.mm | 12 +- src/she/scoped_surface_lock.h | 29 - src/she/she.h | 4 +- src/she/skia/she.cpp | 34 +- src/she/skia/skia_display.cpp | 13 +- src/she/skia/skia_display.h | 9 +- src/she/skia/skia_surface.h | 102 +- src/she/skia/skia_system.h | 20 +- src/she/skia/skia_window.h | 4 +- src/she/skia/skia_window_osx.mm | 7 +- src/she/skia/skia_window_x11.cpp | 96 + src/she/skia/skia_window_x11.h | 58 + src/she/surface.h | 48 +- src/she/system.h | 7 +- src/she/win/vk.cpp | 3 + src/she/win/window.h | 1 + src/she/win/window_dde.cpp | 5 + src/she/x11/event_queue.h | 51 + src/she/x11/keys.cpp | 20 + src/she/x11/window.h | 74 + src/she/x11/x11.cpp | 24 + src/she/x11/x11.h | 40 + src/steam/steam.cpp | 1 + src/ui/CMakeLists.txt | 6 +- src/ui/accelerator.cpp | 18 +- src/ui/accelerator.h | 4 +- src/ui/cursor.cpp | 5 +- src/ui/entry.cpp | 57 +- src/ui/graphics.cpp | 71 +- src/ui/keys.h | 1 + src/ui/manager.cpp | 42 +- src/ui/message.cpp | 3 +- src/ui/message.h | 2 + src/ui/move_region.cpp | 26 +- src/ui/overlay.cpp | 25 +- src/ui/overlay.h | 9 +- src/ui/overlay_manager.cpp | 16 +- src/ui/system.cpp | 8 +- src/ui/system.h | 6 +- src/ui/timer.cpp | 41 +- src/ui/timer.h | 15 +- src/ui/view.cpp | 7 +- src/ui/widget.cpp | 17 +- src/ui/widget.h | 2 +- src/undo/undo_tests.cpp | 6 +- src/updater/check_update.cpp | 8 +- src/updater/user_agent.cpp | 14 +- third_party/CMakeLists.txt | 32 +- third_party/duktape | 2 +- third_party/freetype2 | 2 +- third_party/libpng | 1 + third_party/libpng/CMakeLists.txt | 26 - third_party/libpng/LICENSE | 111 - third_party/libpng/README | 202 - third_party/libpng/TODO | 27 - third_party/libpng/Y2KINFO | 55 - third_party/libpng/example.c | 862 ---- third_party/libpng/libpng-manual.txt | 4628 ------------------ third_party/libpng/png.c | 2870 ----------- third_party/libpng/png.h | 2658 ----------- third_party/libpng/pngconf.h | 596 --- third_party/libpng/pngdebug.h | 157 - third_party/libpng/pngerror.c | 685 --- third_party/libpng/pngget.c | 1124 ----- third_party/libpng/pnginfo.h | 269 -- third_party/libpng/pnglibconf.h | 189 - third_party/libpng/pngmem.c | 667 --- third_party/libpng/pngpread.c | 1843 ------- third_party/libpng/pngpriv.h | 1629 ------- third_party/libpng/pngread.c | 1308 ----- third_party/libpng/pngrio.c | 176 - third_party/libpng/pngrtran.c | 5023 -------------------- third_party/libpng/pngrutil.c | 4158 ---------------- third_party/libpng/pngset.c | 1284 ----- third_party/libpng/pngstruct.h | 358 -- third_party/libpng/pngtest.c | 1820 ------- third_party/libpng/pngtrans.c | 678 --- third_party/libpng/pngwio.c | 254 - third_party/libpng/pngwrite.c | 1655 ------- third_party/libpng/pngwtran.c | 633 --- third_party/libpng/pngwutil.c | 3180 ------------- third_party/pixman-cmake/pixman-version.h.cmake | 50 - third_party/zlib | 1 + third_party/zlib/CMakeLists.txt | 87 - third_party/zlib/README | 115 - third_party/zlib/adler32.c | 169 - third_party/zlib/algorithm.txt | 209 - third_party/zlib/compress.c | 80 - third_party/zlib/crc32.c | 442 -- third_party/zlib/crc32.h | 441 -- third_party/zlib/deflate.c | 1834 ------- third_party/zlib/deflate.h | 342 -- third_party/zlib/example.c | 565 --- third_party/zlib/gzclose.c | 25 - third_party/zlib/gzguts.h | 132 - third_party/zlib/gzlib.c | 537 --- third_party/zlib/gzread.c | 653 --- third_party/zlib/gzwrite.c | 531 --- third_party/zlib/infback.c | 632 --- third_party/zlib/inffast.c | 340 -- third_party/zlib/inffast.h | 11 - third_party/zlib/inffixed.h | 94 - third_party/zlib/inflate.c | 1480 ------ third_party/zlib/inflate.h | 122 - third_party/zlib/inftrees.c | 330 -- third_party/zlib/inftrees.h | 62 - third_party/zlib/minigzip.c | 440 -- third_party/zlib/trees.c | 1244 ----- third_party/zlib/trees.h | 127 - third_party/zlib/uncompr.c | 59 - third_party/zlib/zconf.h.cmakein | 430 -- third_party/zlib/zlib.h | 1613 ------- third_party/zlib/zutil.c | 318 -- third_party/zlib/zutil.h | 274 -- 370 files changed, 6933 insertions(+), 55875 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
