e8e35579dd
Merge remote-tracking branch 'remotes/origin/vb_undo_redo'
2019-07-15 11:34:18 +02:00
ff69c030d7
Merge branch 'lm_improving_wipe_tower'. Summary of changes:
...
- wipe tower respects max volumetric flow, slowing down with PVA etc is not hardcoded anymore
- wipe tower is now allowed for multiple-extruder printers. single extruder stuff is not used in that case (ramming, cooling, etc.)
- start/end filament and toolchange custom gcodes are now inserted differently than before - see 41164a9
2019-07-15 10:25:38 +02:00
d8e3b6fc01
Fix of #2621
2019-07-13 10:38:10 +02:00
e234866953
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-07-12 15:36:11 +02:00
ea4ff14fe8
#2616 - Added Recent projects item to File menu
2019-07-12 15:36:01 +02:00
2a123ec854
Finally fix for settings item selection
2019-07-12 13:56:56 +02:00
8b9dae3b1d
Some code refactoring for settings items
2019-07-12 13:56:56 +02:00
35c2622111
Add take_snapshot for layers range editing actions
2019-07-12 13:56:56 +02:00
33065e5a82
Merge branch 'lm_drop_to_bed'
2019-07-12 13:38:18 +02:00
2f43e228f3
Tech ENABLE_SVG_ICONS set as default
2019-07-12 10:13:35 +02:00
cbf50ccdca
Follow-up of 4c6c608342 -> refactoring
2019-07-12 09:26:19 +02:00
4d9357a156
Merge remote-tracking branch 'origin/vb_undo_redo' into ys_undo_redo
2019-07-11 16:00:28 +02:00
897b8be048
Added suppress_snapshots() and allow_snapshots() for avoid of excess "snapshoting"
2019-07-11 16:00:01 +02:00
9c184f5112
GLToolbar and GLToolbarItem refactored to allow two different actions when left/right clicking on items.
...
Stack dialog for undo and redo items is now shown on right click only
2019-07-11 15:29:46 +02:00
b5624ca76f
Deactivate undo/redo toolbar items by pressing Esc key
2019-07-11 07:54:33 +02:00
747900c308
Deactivate undo/redo toolbar items when leaving the 3D scene or clicking into it
2019-07-11 07:46:40 +02:00
560cd454e2
FreqChangedParams : workaround for right border alignment
2019-07-10 17:50:24 +02:00
566ffb34d4
Fixed margins for FreqChangedParams
2019-07-10 15:55:53 +02:00
7ad87de236
GLToolbar::m_imgui_hovered_pos replaced with GLCanvas3D::m_imgui_undo_redo_hovered_pos
2019-07-10 14:08:14 +02:00
107d3c0c82
Imgui dialogs for undo/redo centered on their toolbar item icon
2019-07-10 13:45:25 +02:00
0b5725b5cb
Disable remaining toolbar items when one of them is toggable and pressed
2019-07-10 11:59:25 +02:00
b7ecb35a5a
Merge remote-tracking branch 'origin/vb_undo_redo' into ys_undo_redo
2019-07-10 11:38:52 +02:00
fc3be32d1d
Added take_snapshot() for adding of settings
2019-07-10 11:28:11 +02:00
1c68eb1fa3
Modified toolbar to call RenderCallback only when the item is toggable and pressed
2019-07-10 10:52:12 +02:00
c5a27bf798
Fixed redo_to() function and code cleaning from redundant options
2019-07-10 10:15:07 +02:00
237a46e311
Completed undo/redo from a toolbar
2019-07-09 20:45:00 +02:00
7b0d9169ba
Merge remote-tracking branch 'origin/vb_undo_redo' into ys_undo_redo
2019-07-09 19:41:37 +02:00
0af1af0ae2
Next improvements of an undo/redo from a toolbar
2019-07-09 19:39:36 +02:00
9e3fbc6e63
Reverder order of rendering of color print time estimates
2019-07-09 15:08:34 +02:00
dad7ed919a
Merge branch 'et_color_print_times' of https://github.com/prusa3d/PrusaSlicer
2019-07-09 14:24:24 +02:00
b061a5de6c
Merge branch 'master' into tm_builtin_pad
2019-07-09 13:21:26 +02:00
3bd9bb360e
Modified logic to add snapshots to undo/redo stack using GLCanvas::do_xxxxxx() methods
2019-07-09 10:18:57 +02:00
12eeedcbca
Fixed reset of bed 3d model
2019-07-09 08:24:23 +02:00
8cfe03033f
Added undo/redo icons. Fist step to implementation Undo/Redo list for toolbar
2019-07-08 18:01:14 +02:00
eb4aba5365
Refactoring of functions thick_lines_to_indexed_vertex_array() to reduce the amount of produced vertices while reducing visual artifacts in gcode toolpaths due to averaged normals
2019-07-08 15:30:59 +02:00
5bc6f17e57
Added undo/redo to the "Edit" menu
2019-07-08 10:57:35 +02:00
85e9318081
Fixed conflicts after merge with master
2019-07-08 09:23:37 +02:00
fa2cb5d501
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_color_print_times
2019-07-08 08:45:11 +02:00
96ea3c6de8
Color change time estimates
2019-07-08 08:40:20 +02:00
fc47ab6b53
Undo / Redo: Bound Ctrl-V/Ctrl-Z to the side panel.
2019-07-05 20:27:44 +02:00
bc46cd3036
Fix of the Undo / Redo for Cut.
...
Added some more operations (for example Rotation) to the Undo / Redo.
2019-07-05 19:46:48 +02:00
445cd20919
Undo / Redo fixes
2019-07-05 19:06:19 +02:00
8953e0980c
Fixed merge issues.
2019-07-04 20:49:46 +02:00
d98aa0f91d
Merge remote-tracking branch 'origin/master' into vb_undo_redo
2019-07-04 20:22:15 +02:00
b52a3cbb9e
Merge remote-tracking branch 'origin/ys_undo_redo' into vb_undo_redo
2019-07-04 20:15:50 +02:00
0f682282bf
Update object list after undo/redo
2019-07-04 19:46:46 +02:00
e402cd2aa5
WIP Undo / Redo: Optional debug print outs.
2019-07-04 17:14:15 +02:00
ef9495150e
WIP Undo / Redo : serialization / deserialization of object selection.
2019-07-04 14:35:04 +02:00
2204165f37
Merge remote-tracking branch 'origin/ys_default_presets' into ys_new_features
2019-07-04 14:30:54 +02:00
f0beb6511c
Merge remote-tracking branch 'origin/master' into ys_new_features
2019-07-04 14:26:05 +02:00
