Commit Graph

346 Commits

Author SHA1 Message Date
David Capello
7ae63156c5 Add option to disable Home tab (fix #1368) 2016-12-18 14:44:39 -03:00
David Capello
42b48cfed2 Initial version of a new app::Strings to translate strings
Added a simple en.ini file to translate "New Sprite" dialog.
2016-12-17 01:01:57 -03:00
David Capello
f989dcd9e9 Merge branch 'master' into beta 2016-12-06 12:05:44 -03:00
David Capello
c1fc3d7453 Minor fix in Grid preferences design/layout 2016-12-05 12:49:36 -03:00
David Capello
54ef2eeb66 Merge branch 'master' into beta 2016-12-05 12:36:12 -03:00
David Capello
4ff2286651 Minor change in Background preferences dialog 2016-12-05 12:01:16 -03:00
David Capello
c54f95a440 Show grid bounds/visibility in Preferences dialog
We've received several support requests to change the default grid
settings. This change should make this more user-friendly.
2016-12-05 11:58:26 -03:00
David Capello
b0df5ac3f4 Divide Grid & Background sections in preferences 2016-12-05 11:06:32 -03:00
David Capello
105cbe4d58 Add option to disable auto-scroll (fix #1277) 2016-12-02 20:38:51 -03:00
David Capello
26b1a2ebb4 Add option to reduce opacity of non-active layers 2016-12-01 15:20:35 -03:00
David Capello
f57c298ad6 Merge branch 'master' into beta 2016-11-29 12:15:25 -03:00
David Capello
eacf28b65a Add option to change the first frame number on the Timeline (fix #1300) 2016-11-22 18:05:56 -03:00
David Capello
1b736aef85 Improve UX when opening file sequences
* Now we can select the specific files that are part of the sequence
* New checkbox do the same for all dropped files (fix #1284)
2016-11-15 18:11:47 -03:00
David Capello
a19a834c4d Enter key selects the preset palette
Also the listbox doesn't lost the focus, so we can continue navigating
preset palettes.
2016-11-14 16:04:29 -03:00
David Capello
a5e860c556 Add Alt+L and Alt+F shortcuts in palette popup 2016-11-14 15:52:51 -03:00
David Capello
441b835192 Add shorter invervals for the backup thread 2016-11-12 18:02:47 -03:00
David Capello
15a7784c16 Minor change in the timeline popup layout 2016-09-26 12:31:40 -03:00
David Capello
8da12cde1d Merge branch 'timeline-thumbnails3' of https://github.com/pseudogames/aseprite into pseudogames-timeline-thumbnails3 2016-09-26 12:21:45 -03:00
David Capello
b41ad4dd21 Merge branch 'timeline-thumbnails2' of https://github.com/pseudogames/aseprite into pseudogames-timeline-thumbnails2 2016-09-26 11:48:32 -03:00
David Capello
8b9c5f4f27 Merge branch 'timeline-thumbnails' into beta 2016-09-26 11:39:40 -03:00
David Capello
1cab8c3de4 Merge branch 'master' into beta 2016-09-20 11:06:38 -03:00
David Capello
1ffbd4c343 Add new "Image Color" parameter in brush slots (fix #1259) 2016-09-20 10:26:02 -03:00
David Capello
3e9e49caf9 Allow to save specific layers/frames in Save Copy As (fix #1080) 2016-09-17 01:01:28 -03:00
David Capello
1404b0ce7d Merge branch 'master' into beta 2016-09-16 16:02:26 -03:00
David Capello
edf1cfd7b0 Add possibility to move the Timeline at the left/right side (fix #1169) 2016-09-15 11:07:36 -03:00
David Capello
20b726f73b Merge branch 'master' into beta 2016-08-31 19:53:52 -03:00
David Capello
bebbd71d31 Add simple crosshair using native mouse cursors (fix #1236) 2016-08-31 13:24:03 -03:00
David Capello
f1c9e77e43 Add mouse cursor scale option 2016-08-30 17:27:19 -03:00
David Capello
b80beb13ad Move native cursor preference from "Experimental" to "Cursors" section 2016-08-30 16:52:03 -03:00
Carlo "zED" Caputo
2075109a5a only integer timeline zoom sizes to fit the style 2016-08-07 08:27:18 -03:00
Carlo "zED" Caputo
9ec5587d72 removed thumb opacity setting 2016-08-07 08:26:37 -03:00
Carlo 'zED' Caputo
30feffab8d setting to change timeline zoom 2016-08-07 05:58:43 -03:00
Carlo "zED" Caputo
f9f7477b04 removed background preference, using checkered 2016-08-07 04:26:44 -03:00
Carlo 'zED' Caputo
0297063c56 removed the quality option 2016-08-07 04:26:37 -03:00
David Capello
36bfa1d641 Merge branch 'beta' into layer-folder 2016-07-28 23:02:24 -03:00
David Capello
8823f6bf21 Merge branch 'master' into beta 2016-07-28 11:03:56 -03:00
David Capello
ed7a1ef1cc Fix X/Y/Width/Height fields order in "Import Sprite Sheet" (#1207) 2016-07-25 11:25:11 -03:00
David Capello
5910e94396 Add option to hide full filename paths (fix #1199) 2016-07-25 11:04:16 -03:00
Carlo 'zED' Caputo
57567af06b Add thumbnails in timeline (#340)
Reviewed-by: David Capello <davidcapello@gmail.com>
2016-07-25 10:00:00 -03:00
David Capello
f838b8787e Merge branch 'beta' into layer-folder 2016-07-07 12:47:42 -03:00
David Capello
36ffc8d2bd Merge branch 'master' into beta 2016-07-06 15:46:22 -03:00
David Capello
67ce9473f8 Add option to include partial tiles in Import Sprite Sheet (fix #1161) 2016-07-01 10:24:44 -03:00
David Capello
ca3b72ee08 Merge branch 'beta' into layer-folder 2016-06-30 12:30:21 -03:00
David Capello
d84ba2db32 Merge branch 'master' into beta 2016-06-30 12:26:41 -03:00
David Capello
e353cdae4c Merge branch 'applyButton' of https://github.com/TheKK/aseprite into apply-button 2016-06-14 09:23:26 -03:00
David Capello
f6fa39ba52 Merge NewGroup command into NewLayer command 2016-06-08 15:43:13 -03:00
David Capello
21afd4ecb5 Add new menu option to create a layer group 2016-06-07 19:06:36 -03:00
David Capello
4760a11348 Merge branch 'master' into beta 2016-06-06 18:02:30 -03:00
David Capello
af2c2838e0 Add new option to zoom sliding two fingers on OS X trackpad
It was requested here:
http://steamcommunity.com/app/431730/discussions/2/357286663677659387/
2016-05-27 13:15:13 -03:00
David Capello
a9c18db7a4 Add pixel ratio field in Sprite properties 2016-05-24 12:25:11 -03:00
David Capello
73bda9bd19 Add new advanced options in New Sprite dialog to change the pixel ratio 2016-05-23 18:36:47 -03:00
David Capello
9face9458e Add an option to change the "brush preview" style (related to #792) 2016-03-24 14:29:15 -03:00
Gabriel Rauter
cb92b781eb Change Windows Modifier Name to Win for Windows and Super for Linux/BSD 2016-03-01 23:52:36 +01:00
Gabriel Rauter
e22332144a Add Windows Key as possible Modifier in Keyboard Shortcuts on Windows and Linux as a step to fix #796 2016-03-01 20:14:32 +01:00
David Capello
81d39664a7 Add an alternative message to debug crashes in compiled versions
As .dmp files are useful only for official releases (i.e. when we have the
compiled .exe+.pdb), this is an alternative message to stop receiving
.dmp files at support@aseprite.org that cannot be used to debug a crash.
2016-01-31 19:49:24 -03:00
David Capello
b0650f6afe Generalize View::setViewScroll() to blit valid/scrollable region automatically
With this change we are removing specific code to scroll the Editor widget.
Now if we use Editor::setEditorScroll() to scroll it should work as
View::setViewScroll(). In this way we remove the ugly "blitValidRegion"
parameter from setEditorScroll().

Changes:
* Removed Widget::scrollRegion() because each widget must control
  valid/invalid regions after a ui::move_region() in a very specific way
  (see View::setViewScroll() or Window::moveWindow)
* Invalidate the whole widget on Widget::setBoundsQuietly()
* Fixed problems blitting invalid regions/not yet updated/painted: using
  the new ui::Manager::m_invalidRegion.
* Added View::onSetViewScroll() and View::onScrollRegion()
* Added FileListView to avoid moving the thumbnail region when we scroll
2016-01-05 16:37:52 -03:00
David Capello
3543b086d1 Add option to keep the selection after Edit > Clear (fix #907) 2015-12-22 17:49:21 -03:00
David Capello
e79236b3a3 Add JSON data format into Export Sprite Sheet UI 2015-12-22 17:34:51 -03:00
Ying-Ruei Liang (KK)
1cf82697ef Add "apply" button to options window 2015-12-20 23:58:25 +08:00
David Capello
403e3ee726 Add popup on each BrushSlot to enable/disable params
Converted BrushSlotParams into a xml widget.
2015-12-16 18:14:04 -03:00
David Capello
c49abf9969 Add missing user_data.xml 2015-12-11 20:17:34 -03:00
David Capello
594892f5ef Modify cel/layer property dialogs layout 2015-12-11 16:28:08 -03:00
David Capello
08bef859e3 Add user data field on layers and cels 2015-12-10 18:34:25 -03:00
David Capello
5dc149d308 Add "Select > Modify" commands to expand/contract/border the selection 2015-12-04 17:46:32 -03:00
David Capello
fb387cb6c2 Add options to export layers and frameTags meta JSON data from the UI 2015-12-03 12:42:33 -03:00
David Capello
4dbee12789 Add possibility to import/export sprite sheet matrices by columns
Fix #872
2015-12-03 11:38:59 -03:00
David Capello
3b0bf6daaa Add anti-aliasing checkbox in "Edit > Insert Text" option 2015-12-01 15:46:21 -03:00
David Capello
771a7ba467 Add search field in keyboard shortcuts dialog (fix #849)
Changes:
* Added "icon_search" part in the skin
* Added app::SearchEntry widget
* Fixed Separator widget to handle a custom background color, because
  now we use Separators inside a ListBox too
* Added Entry::(on)getEntryTextBounds() to specify a customized area
  to show text (as SearchEntry needs space for search and close icons)
2015-11-30 15:08:18 -03:00
David Capello
12ccaf883d Add "px" suffix to New Sprite and Canvas Size fields (fix #875) 2015-11-24 19:54:10 -03:00
David Capello
9c1a8762ab Add option to export sprite sheets in memory only (without a file, fix #865)
We have converted the label "Save As" into a checkbox in the Export
Sprite Sheet dialog.
2015-11-20 14:49:40 -03:00
David Capello
2eada35a38 Add "Undo History" command (fix #739)
Added member functions to undo::UndoHistory and
app::DocumentUndo to iterate all states of the undo history.
Also we’ve added app::DocumentUndoObserver to see when new states
are added in the undo history.
2015-10-20 11:27:05 -03:00
David Capello
62a16d0525 Improve font selection with keyboard in PasteTextCommand 2015-10-19 15:32:44 -03:00
David Capello
049111bfad Put font size before font family
In this way we can press T, Tab, change the font size, and Enter to try
again quickly with other font size.
2015-10-16 18:40:14 -03:00
David Capello
9f8200ea3e Add list of system fonts in PasteTextCommand dialog (on Windows) 2015-10-15 18:16:16 -03:00
David Capello
03c0367827 Add option to disable GPU acceleration 2015-10-05 21:18:42 -03:00
David Capello
0e07a01a9b Add a color picker in the Insert Text dialog 2015-09-23 17:45:07 -03:00
David Capello
1ac39ff85b Add simple "Edit > Insert Text" menu option (related to #28) 2015-09-23 17:38:45 -03:00
David Capello
d55017cd17 Use advanced_mode.xml.h in cmd_advanced_mode.cpp 2015-09-22 17:27:47 -03:00
David Capello
c37c790b47 Add "Open Folder" button in Preferences > Theme section 2015-09-18 12:39:46 -03:00
David Capello
df629db6c6 Add "Theme" section in Preferences 2015-09-18 12:23:02 -03:00
Gabriel Rauter
c2a58dd46f fix type conversion warn. & remove problem preset
fix type conversions by putting WebPOptions Class in a seperate file like
GifOptions and use Getter and Setter for better handling. In cases
needed explicit casting was used to supress those warings.

Additionaly the LAST WebPHint Option was removed as it does not work for
this situation.
2015-09-02 14:52:07 +02:00
Gabriel Rauter
5ae9b9a6ef correct copyright line 2015-09-01 23:11:50 +02:00
Gabriel Rauter
497fc3ed3a implement simple non animation webp for #273
This includes lossless and lossy webp file format. For this reason a
save option dialog was added giving rudimentary options for saving to
the user.
2015-09-01 13:05:24 +02:00
David Capello
ab893eec6e Improve "Color Curve" dialog to be used only with the mouse (fix #278) 2015-08-27 12:27:23 -03:00
David Capello
65baa8d943 Move OK/Cancel buttons at the bottom in Keyboard Shortcuts dialog
Issue #777
2015-08-25 17:15:14 -03:00
David Capello
19951c6dd5 New Keyboard Shortcuts dialog layout (fix #777) 2015-08-25 13:59:15 -03:00
David Capello
dc9ee103f0 Make CelProperties dialog non-modal 2015-08-21 08:35:29 -03:00
David Capello
728432f9e5 Convert "Layer Properties" dialog in a non-modal window 2015-08-21 00:44:28 -03:00
David Capello
ff9693b29d Add support to export all/selected/one layer/frame/frame tag
This commit includes support to export tagged frames using the command
line --frame-tag option.

Fix #415, fix #570, fix #607, fix #745
2015-08-20 22:30:33 -03:00
David Capello
6b9c4c53ae Add icons in "New Sprite" dialog
Some changes needed to do this:
* Added support to show icon+text in ButtonSet items
* Added an extra parameter in Graphics::drawUIString() to avoid drawing
  the underscore
* Fixed expansion of ButtonSet items when the grid is resized
* Added support for Alt+mnemonic shortcuts in ButtonSet items
2015-08-12 12:38:07 -03:00
David Capello
6d532e56c5 Set RGBA has the default color mode for new sprites 2015-08-11 13:38:51 -03:00
David Capello
9d84089b0c Move "UI Elements Scaling" option from Experimental tab to General 2015-08-10 18:56:36 -03:00
David Capello
a34931db3d Remove ConfigureTools command
These options were replaced with commands in "View" menu.
2015-08-10 18:52:29 -03:00
David Capello
bf54fd26d3 Add option to put the onion skin behind the sprite
Fix #526 and fix #412
2015-07-31 15:55:06 -03:00
David Capello
80b47419fd Add an option to onionskin the current layer only (related to #526) 2015-07-31 14:30:11 -03:00
David Capello
41bb23f1f1 Change opaque/transparent selection by default depending on the layer 2015-07-27 11:43:48 -03:00
David Capello
7f4d4936e1 Re-implement GIF encoder
- Correct usage of disposal methods (and possibility to generate records
  with "restore previous frame" disposal method)
- Create color maps for each frame when necessary
- Remove options to dither RGB images (to simplify encoder)
2015-07-22 16:40:44 -03:00
David Capello
cee355ee61 Fix minor layout issues in the Preferences dialog 2015-07-18 13:29:23 -03:00
David Capello
e9308c2d35 Add alpha channel in quantization (related to #286) 2015-07-02 11:18:43 -03:00
David Capello
78918c0df8 Improve ColorQuantization UI to select the # of colors for the new palette 2015-06-30 15:25:23 -03:00
David Capello
a12816c04e Add command to change the palette size manually with a number 2015-06-30 12:21:41 -03:00
David Capello
e98e2fe3e1 Use the generated widget from sprite_properties.xml in SpritePropertiesCommand 2015-06-22 11:20:10 -03:00
David Capello
401dd5362b Add option to change the "Stop" button behavior (fix #705) 2015-06-19 12:09:34 -03:00
David Capello
89e0392daa Add support for palettes with more less (and more) than 256 colors (fix #668)
With this commit we've removed doc::Palette::MaxColors constant.
2015-06-18 12:50:33 -03:00
David Capello
fb4b2e76c8 Add layer opacity property (fix #225) 2015-06-14 20:23:49 -03:00
David Capello
21ca87862c Add layer blending modes (fix #318)
- Added doc::BlendMode enum and doc::BlendFunc type
- Renamed LayerImage::getBlendMode() -> blendMode()
- BLEND_MODE_COPY is BlendMode::SRC now
- BLEND_MODE_NORMAL is BlendMode::NORMAL now
- Added app::cmd::SetLayerBlendMode
2015-06-13 21:29:16 -03:00
David Capello
0a1dfe0633 Merge branch 'onionskin'
Conflicts:
	src/app/ui/editor/play_state.cpp
	src/render/render.cpp
	third_party/gtest
2015-06-05 15:53:15 -03:00
David Capello
e0fea708f8 Add option to resize the final output of "Save Copy As" command (fix #685) 2015-06-03 16:34:27 -03:00
David Capello
c6f2c48d66 Move the "new folder dialog" to its own xml to automatically generate its widget 2015-06-03 12:21:14 -03:00
David Capello
726013e0bd Use generated widget in app::FileSelector from file_selector.xml 2015-06-03 12:21:12 -03:00
David Capello
89f96926a4 Ask to overwrite files in Export Sprite Sheet command (fix #689) 2015-06-02 18:41:22 -03:00
David Capello
9723d1b6ec Now the file type combobox in FileSelector acts like a filter (fix #643) 2015-05-28 18:59:12 -03:00
David Capello
ac9717b121 Minor style change to file_selector.xml 2015-05-28 17:06:01 -03:00
David Capello
e8ff3b8cda Minor style change to select_accelerator.xml <grid> element 2015-05-28 17:00:37 -03:00
David Capello
3388eaffde Show onion skinning depending on the configured loop section (fix #555)
There is a new option (per document) to disable this behavior.
2015-05-27 17:42:41 -03:00
David Capello
06d1929729 Remove background color as an option in "New File" 2015-05-09 12:46:07 -03:00
David Capello
d31f83e098 Add option to load/save default palette preset (fix #626)
Now the default palette is saved in the user configuration
directory, so we can set any palette as the default (it doesn't
matter if it's related or not to a file, it will be copied into
the user directory anyway).
2015-05-08 16:08:55 -03:00
David Capello
97609b6504 Add option to change the zoom behavior with keys 2015-05-07 15:56:38 -03:00
David Capello
b2955d58ad Add option to change the zoom behavior with scroll wheel 2015-05-07 15:52:26 -03:00
David Capello
2ea7ac6fbc Minor changes in options.xml 2015-04-23 18:33:22 -03:00
David Capello
da342f29f3 Several changes related to UI scale
* UI scale is an experimental option (it needs app restart)
* We can change the Screen Scale without restarting the app now
* Hide reloading of skin data in SkinTheme::onRegenerate()
* Now setFontOfAllWidgets() is called from Theme::regenerate()
* Remove reload_default_font()
* Simplify gui_setup_screen()
2015-04-17 12:24:33 -03:00
David Capello
240149ef6f Add UI Scale option (as separated concept from Screen Scale)
With this change we don't adapt the UI Scale automatically depending of
the display size, as it cannot be adjusted dynamically anyway (as the app
must be restarted to take this change correctly).
2015-04-17 11:11:36 -03:00
David Capello
21a57ff793 Add "data recovery period" option 2015-04-09 07:46:55 -03:00
David Capello
956ae0c565 Minor fix in Options dialog 2015-04-08 21:58:46 -03:00
David Capello
9b692cb14a Add option to disable data recovery 2015-04-08 20:28:30 -03:00
David Capello
a4478e9306 Add UI and logic to recover a backup session
Changes:
* Add DataRecoveryView
* Split SubObjectsIO into an interface and SubObjectsFromSprite
* Add a "setId" parameter to some doc::read_* functions (we need this
  functionality from session recovery)
2015-04-08 20:05:05 -03:00
David Capello
e4667149f4 Make HomeView widget more responsive depending on its current size 2015-04-04 18:19:16 -03:00
David Capello
9302c5d1bb Move logic to import sprite sheet inside ImportSpriteSheetCommand::onExecute 2015-03-19 16:20:33 -03:00
David Capello
c2c83a8d54 Import Sprite Sheet: select current document by default 2015-03-19 15:52:20 -03:00
David Capello
be1ed24847 Add import_sprite_sheet.xml widget 2015-03-19 15:21:28 -03:00
David Capello
9d3d3d1f17 Add padding parameters to export sprite sheet (related to #78) 2015-03-19 14:39:37 -03:00
David Capello
63485449f6 Add an option in "Export Sprite Sheet" to open the generated sprite sheet 2015-03-19 10:17:40 -03:00
David Capello
50e9ed6326 Unify "Export Sprite Sheet" command with DocumentExporter 2015-03-17 16:43:51 -03:00
David Capello
f26183a82a Remove loop configuration from ConfigureTimelinePopup 2015-03-10 17:13:06 -03:00
David Capello
58d302749c Use a FrameTag for the loop section (fix #557)
Changes:
* Paint FrameTags in Timeline with labels
* Add app::ui::FrameTagWindow
* Fix FrameTag::m_aniDir initialization
* Add warning for files that doesn't support frame tags
* Remove document preferences related to the active loop
2015-03-09 13:57:54 -03:00
David Capello
361a3084fd Merge branch 'new-workspace'
Conflicts:
	src/app/commands/cmd_open_file.cpp

Fixes:
	src/app/ui/timeline.cpp
2015-03-04 22:41:34 -03:00
David Capello
b8ed98bd8b Add native file open/save dialog (only win32 at the moment, issue #321) 2015-03-02 16:07:35 -03:00
David Capello
8f8291a39b Hide colorbar and toolbar when we're in Home tab 2015-03-02 14:43:44 -03:00
David Capello
6862e02805 Add list of recent files and folders in Home tab
* Add LinkLabel::onClick()
* Use Widget instead of ListItem in ListBox API
* Add TextRule::padding() and use it to calculate the preferred size
  for a skin::Style's rules
2015-03-02 11:18:33 -03:00
David Capello
35623cae88 Move "new update" notification from menu bar to HomeView 2015-02-26 12:28:26 -03:00
David Capello
8eb8122bc0 Add widgets to HomeView (icon, new file, open file, and list boxes)
* Add widgets/home_view.xml
* Add possibility to specify style="..." and border="..." in XML widgets
* Add SkinStyleProperty
* Remove Label::get/setTextColor() (replaced with styles)
* Add <image> widget in WidgetLoader
* Paint labels, link labels, and views with styles
2015-02-26 09:53:19 -03:00
David Capello
2dac7f3869 Add Frame Tags Properties dialog/command 2015-02-20 11:42:59 -03:00
David Capello
4376647fcd Use generated FrameProperties widget in FramePropertiesCommand 2015-02-19 20:29:48 -03:00
David Capello
b12a2b5193 Add scope combo for Grid options in Preferences dialog
With this we make it clear what settings we're modifying: the global ones
or the active document ones.
2015-02-14 23:31:11 -03:00
David Capello
14cd8576f4 Move "center on zoom" option from General to Editor tab 2015-02-14 22:45:45 -03:00
David Capello
06636fd16e Merge branch '1.0'
Conflicts:
	src/app/file/gif_format.cpp
	src/app/file/gif_options.h
	src/app/ui/editor/moving_cel_state.cpp
	src/app/ui/editor/standby_state.cpp
	src/app/util/range_utils.cpp
2015-01-29 12:18:13 -03:00
David Capello
c4d0266b52 Add option to disable animation loop when saving GIF files (fix #585) 2015-01-29 11:24:43 -03:00
David Capello
309d1299ae Minor label fix in options.xml 2015-01-20 09:31:20 -03:00
David Capello
e55865843e Replace undo impl: replace undoers with cmds
Undoers were little objects to swap/revert an action. They didn't
execute the action itself, they just revert its previous state. Now
undoers were replaced with cmds: A cmd is an object that
executes/undoes/redoes just one action.

Changes:
* Remove old undo library and app/objects_container_impl.cpp
  (now we use the doc::ObjectId directly to store undo info)
* Remove all Undoers from app/undoers/
* Replace DocumentApi impl with little Cmds in app/cmd/, these
  cmds handle execute/undo/redo of each action at the logic layer
* Remove doc::Dirty object
* Remove doc::Settings: all undo configuration is in the app side
* Move undo options from app:ISettings to app::Preferences
* Rename UndoTransaction to Transaction
* Create a CmdSequence to store a sequence of Cmds (as now the new
  undo library doesn't support open/close groups)
* Add doc::get<T>(ObjectId) function to get any kind of object
  from the doc library by its ID
* Add Cel::document() and Sprite::document() members
* Add Sprite::cels(frame_t) to get all cels in the given frame
* Add Layer::displaceFrames() member function
* Move the "allow non-linear history" flag from undo2::UndoHistory
  to app::DocumentUndo
2015-01-18 22:05:33 -03:00
David Capello
f1cd3bbbe2 Merge branch '1.0'
Conflicts:
	src/app/ui/editor/standby_state.cpp
	src/app/ui/editor/tool_loop_impl.cpp
2014-11-24 21:53:10 -03:00