This is an automated email from the git hooks/post-receive script. thansen pushed a commit to branch master in repository aseprite.
commit fc70114ac1b1bbd633ff60ae79c096b7a64e6f66 Merge: 0045a3d dbb3cee Author: Tobias Hansen <[email protected]> Date: Mon May 9 21:48:43 2016 +0100 Merge branch 'upstream' .gitmodules | 5 + .travis.yml | 4 +- CMakeLists.txt | 28 +- INSTALL.md | 252 +++++++++---- README.md | 3 +- data/gui.xml | 5 +- data/pref.xml | 12 +- data/skins/default/sheet.png | Bin 13776 -> 14189 bytes data/skins/default/skin.xml | 12 + desktop/CMakeLists.txt | 16 + desktop/aseprite-thumbnailer | 19 + desktop/gnome/aseprite.thumbnailer | 4 + desktop/kde/CMakeLists.txt | 23 ++ desktop/kde/aseprite_thumb_creator.cpp | 39 ++ desktop/kde/aseprite_thumb_creator.h | 21 ++ desktop/kde/asepritethumbnail.desktop | 8 + desktop/mime/aseprite.xml | 12 + src/CMakeLists.txt | 17 +- src/README.md | 3 +- src/app/CMakeLists.txt | 5 +- src/app/app.cpp | 50 ++- src/app/app.h | 17 +- src/app/app_menus.cpp | 8 +- src/app/cmd/clear_mask.cpp | 6 +- src/app/cmd/clear_mask.h | 3 +- src/app/cmd/trim_cel.cpp | 89 +++++ src/app/cmd/trim_cel.h | 47 +++ src/app/color.cpp | 5 + src/app/commands/cmd_add_color.cpp | 2 +- src/app/commands/cmd_advanced_mode.cpp | 4 +- src/app/commands/cmd_cel_properties.cpp | 7 +- src/app/commands/cmd_change_brush.cpp | 5 +- src/app/commands/cmd_clear_cel.cpp | 5 +- src/app/commands/cmd_close_file.cpp | 9 +- src/app/commands/cmd_copy_cel.cpp | 7 +- src/app/commands/cmd_developer_console.cpp | 4 +- src/app/commands/cmd_discard_brush.cpp | 7 +- src/app/commands/cmd_duplicate_view.cpp | 7 +- src/app/commands/cmd_exit.cpp | 6 +- src/app/commands/cmd_export_sprite_sheet.cpp | 10 +- src/app/commands/cmd_flip.cpp | 91 ++--- src/app/commands/cmd_frame_properties.cpp | 5 +- src/app/commands/cmd_goto_tab.cpp | 11 +- src/app/commands/cmd_home.cpp | 6 +- src/app/commands/cmd_keyboard_shortcuts.cpp | 17 +- src/app/commands/cmd_layer_properties.cpp | 5 +- src/app/commands/cmd_layer_visibility.cpp | 8 +- src/app/commands/cmd_link_cels.cpp | 7 +- src/app/commands/cmd_mask_content.cpp | 4 +- src/app/commands/cmd_move_cel.cpp | 7 +- src/app/commands/cmd_move_mask.cpp | 6 +- src/app/commands/cmd_new_brush.cpp | 16 +- src/app/commands/cmd_new_frame.cpp | 4 +- src/app/commands/cmd_new_frame_tag.cpp | 7 +- src/app/commands/cmd_new_layer.cpp | 4 +- src/app/commands/cmd_open_file.cpp | 6 +- src/app/commands/cmd_remove_frame.cpp | 5 +- src/app/commands/cmd_remove_frame_tag.cpp | 5 +- src/app/commands/cmd_remove_layer.cpp | 5 +- src/app/commands/cmd_reverse_frames.cpp | 8 +- src/app/commands/cmd_rotate.cpp | 7 +- src/app/commands/cmd_save_file.cpp | 4 +- src/app/commands/cmd_set_ink_type.cpp | 6 +- src/app/commands/cmd_set_loop_section.cpp | 7 +- src/app/commands/cmd_set_same_ink.cpp | 4 +- src/app/commands/cmd_show.cpp | 31 ++ src/app/commands/cmd_switch_colors.cpp | 6 +- src/app/commands/cmd_timeline.cpp | 16 +- src/app/commands/cmd_toggle_preview.cpp | 6 +- src/app/commands/cmd_unlink_cel.cpp | 5 +- src/app/commands/commands_list.h | 1 + src/app/commands/filters/filter_preview.cpp | 6 +- src/app/modules/gui.cpp | 12 +- src/app/tools/active_tool.cpp | 220 ++++++++++++ src/app/tools/active_tool.h | 72 ++++ src/app/tools/active_tool_observer.h | 31 ++ src/app/tools/controllers.h | 17 +- src/app/tools/ink.h | 5 + src/app/tools/ink_processing.h | 32 +- src/app/tools/inks.h | 12 +- src/app/tools/intertwine.cpp | 8 +- src/app/tools/point_shape.cpp | 11 +- src/app/tools/point_shapes.h | 21 +- src/app/tools/pointer.h | 39 ++ src/app/tools/tool_loop.h | 3 + src/app/tools/tool_loop_manager.cpp | 22 +- src/app/tools/tool_loop_manager.h | 145 ++++---- src/app/ui/brush_popup.cpp | 25 +- src/app/ui/button_set.cpp | 13 +- src/app/ui/button_set.h | 6 +- src/app/ui/color_tint_shade_tone.cpp | 19 +- src/app/ui/context_bar.cpp | 99 ++++-- src/app/ui/context_bar.h | 17 +- src/app/ui/document_view.cpp | 6 + src/app/ui/editor/brush_preview.cpp | 23 +- src/app/ui/editor/brush_preview.h | 4 +- src/app/ui/editor/drawing_state.cpp | 33 +- src/app/ui/editor/editor.cpp | 233 +++++------- src/app/ui/editor/editor.h | 24 +- src/app/ui/editor/editor_state.h | 3 +- src/app/ui/editor/glue.h | 35 ++ src/app/ui/editor/moving_cel_state.cpp | 13 +- src/app/ui/editor/moving_cel_state.h | 2 + src/app/ui/editor/moving_pixels_state.cpp | 20 +- src/app/ui/editor/moving_pixels_state.h | 4 +- src/app/ui/editor/pixels_movement.cpp | 24 +- src/app/ui/editor/select_box_state.cpp | 8 +- src/app/ui/editor/standby_state.cpp | 72 ++-- src/app/ui/editor/standby_state.h | 4 +- src/app/ui/editor/tool_loop_impl.cpp | 173 ++++++--- src/app/ui/file_selector.cpp | 5 +- src/app/ui/home_view.cpp | 8 +- src/app/ui/keyboard_shortcuts.cpp | 6 +- src/app/ui/main_window.cpp | 2 +- src/app/ui/palette_view.cpp | 3 +- src/app/ui/recent_listbox.cpp | 8 +- src/app/ui/status_bar.cpp | 513 +++++++++++++++++++-------- src/app/ui/status_bar.h | 26 +- src/app/ui/timeline.cpp | 4 +- src/app/ui/toolbar.cpp | 57 +-- src/app/ui/toolbar.h | 9 +- src/app/ui_context.cpp | 22 +- src/app/util/clipboard.cpp | 102 +++--- src/app/util/clipboard_native.cpp | 296 ++++++++++++++++ src/app/util/clipboard_native.h | 36 ++ src/app/util/clipboard_win32.h | 442 ----------------------- src/app/util/expand_cel_canvas.cpp | 116 ++++-- src/app/util/expand_cel_canvas.h | 10 +- src/base/CMakeLists.txt | 41 +-- src/base/debug.cpp | 6 +- src/base/string.cpp | 26 +- src/base/string_tests.cpp | 32 +- src/clip | 1 + src/config.h | 2 +- src/doc/algorithm/shrink_bounds.cpp | 83 ++++- src/doc/algorithm/shrink_bounds.h | 11 +- src/doc/brush.cpp | 111 ++++-- src/doc/brush.h | 6 + src/doc/document.cpp | 7 +- src/doc/file/gpl_file.cpp | 7 +- src/doc/primitives.cpp | 6 +- src/gen/gen.cpp | 11 +- src/gfx/size.h | 6 +- src/main/resources_win32.rc | 8 +- src/main/settings.manifest | 8 + src/pen/CMakeLists.txt | 8 - src/pen/pen.cpp | 31 -- src/pen/pen.h | 25 -- src/pen/pen_none.h | 15 - src/pen/pen_win.h | 68 ---- src/render/render.cpp | 106 ++++-- src/render/render.h | 16 +- src/she/CMakeLists.txt | 6 +- src/she/clipboard.h | 27 -- src/she/clipboard_simple.h | 38 -- src/she/common/system.h | 15 +- src/she/event.h | 17 +- src/she/osx/clipboard.h | 28 -- src/she/osx/clipboard.mm | 36 -- src/she/osx/view.h | 5 +- src/she/osx/view.mm | 38 +- src/she/pointer_type.h | 25 ++ src/she/she.h | 1 - src/she/skia/she.cpp | 2 - src/she/skia/skia_system.h | 9 +- src/she/system.h | 2 - src/she/win/clipboard.cpp | 94 ----- src/she/win/clipboard.h | 28 -- src/she/win/pen.cpp | 111 ++++++ src/she/win/pen.h | 41 +++ src/she/win/system.h | 31 ++ src/she/win/window.h | 101 +++++- src/ui/CMakeLists.txt | 2 +- src/ui/clipboard.cpp | 42 --- src/ui/clipboard.h | 22 -- src/ui/clipboard_win.h | 55 --- src/ui/combobox.cpp | 3 +- src/ui/entry.cpp | 13 +- src/ui/int_entry.cpp | 3 +- src/ui/manager.cpp | 103 ++++-- src/ui/manager.h | 41 ++- src/ui/message.h | 5 + src/ui/pointer_type.h | 19 + src/ui/ui.h | 6 +- src/ui/widget.cpp | 2 + third_party/CMakeLists.txt | 1 + third_party/libpng | 2 +- third_party/modp_b64/CMakeLists.txt | 9 +- 188 files changed, 3565 insertions(+), 2346 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
