Commit graph

3834 commits

Author SHA1 Message Date
Lukas Matena
3957c5bd8e Merge branch 'dev' into lm_sla_supports_ui 2018-09-17 10:42:16 +02:00
bubnikv
38028187b4 Merged with master 2018-09-17 10:38:14 +02:00
Lukas Matena
37c222a54f Merge branch 'dev' into lm_sla_supports_ui 2018-09-17 10:26:38 +02:00
bubnikv
4ec4c9364e Merge remote-tracking branch 'origin/support_improvements' 2018-09-14 15:12:20 +02:00
Vojtech Kral
7258c597b9 Fix window size persistence
Fixes 
Fixes 
2018-09-14 15:10:50 +02:00
bubnikv
bd659663f8 Merge remote-tracking branch 'origin/lm_wipe_tower_consumption' 2018-09-14 14:55:43 +02:00
YuSanka
2ea5c77e39 Merge remote-tracking branch 'origin/dev' into new_main_page_ui 2018-09-14 14:01:11 +02:00
YuSanka
eb2b56a87f Fixed settings list for objects
+ fixed showing of an info_manifold_warning_icon
2018-09-14 13:59:56 +02:00
Enrico Turri
d3a36f98a0 Merge branch 'master' of https://github.com/prusa3d/Slic3r into dev 2018-09-14 12:47:16 +02:00
Lukas Matena
5df70752c0 Merge branch 'dev' into lm_sla_supports_ui 2018-09-14 11:38:51 +02:00
Enrico Turri
578792be31 Fixed 2018-09-14 11:37:26 +02:00
YuSanka
3903ca64d7 Added strings for correct volume selection 2018-09-13 16:20:16 +02:00
YuSanka
06f395641b Object selection (from object list to 3DScene) 2018-09-13 16:09:57 +02:00
Lukas Matena
ccf27ae1f3 Merge branch 'dev' into lm_sla_supports_ui 2018-09-12 10:04:57 +02:00
Lukas Matena
712fef0669 Added number of toolchanges into 'Sliced info' statistics 2018-09-12 09:28:26 +02:00
YuSanka
73ee3f77c3 Merge remote-tracking branch 'origin/dev' into new_main_page_ui 2018-09-11 11:49:36 +02:00
Enrico Turri
781df150a1 Added perl callback for gizmo flatten 2018-09-10 14:10:08 +02:00
Enrico Turri
333bc1523a Merge branch 'master' of https://github.com/prusa3d/Slic3r into dev 2018-09-10 13:19:53 +02:00
Enrico Turri
be508b003a Fixed 2018-09-10 13:15:12 +02:00
Lukas Matena
891b6a8a34 First experiments with sla supports ui 2018-09-10 12:08:57 +02:00
Enrico Turri
e9d5cd726e Merge branch 'master' of https://github.com/prusa3d/Slic3r into dev 2018-09-07 10:32:39 +02:00
YuSanka
125ece0aad Fixed 2018-09-07 09:33:18 +02:00
Enrico Turri
0ea18d57d0 Fixed wipe tower selection 2018-09-07 09:21:12 +02:00
YuSanka
2efc8c705e Try to fix 1204 2018-09-07 09:09:24 +02:00
Lukas Matena
961d894218 Added a Layout call for 'Sliced Info' box to show sliders when needed 2018-09-07 08:43:21 +02:00
Enrico Turri
8460926d36 Added select by part tool to toolbar 2018-09-06 16:10:31 +02:00
bubnikv
2a81408e8b Implemented support enforcers / blockers.
Reduced amount of full support interfaces similar to S3D.
2018-09-06 14:19:20 +02:00
Enrico Turri
677dad0669 Object's properties updated while manipulating gizmos 2018-09-05 16:22:48 +02:00
Lukas Matena
c83a5474f6 Wipe tower extrusions are now accounted for in the filament consumption statistics 2018-09-05 15:35:35 +02:00
Enrico Turri
15b1340514 Added ModelInstance::world_matrix() method and stl_transform using eigen transform 2018-09-04 14:42:14 +02:00
YuSanka
fb3a4015f6 Implemented "Settings to modified" as a subobject for objects and parts 2018-09-03 16:21:08 +02:00
YuSanka
78cedb34d4 Fixed bug with no-slicing of some parts of the object
+ Removed text drawing for equal values in DoubleSlider
+ Added functions for adding of the settings item for objects
2018-09-03 09:58:35 +02:00
YuSanka
a3c2c511f0 Reorganized right panel 2018-08-31 13:42:53 +02:00
tamasmeszaros
4f53fc2a5f Merge remote-tracking branch 'origin/cpp_progress_status_bar' into dev
# Conflicts:
#	lib/Slic3r/GUI/MainFrame.pm
#	xs/src/slic3r/AppController.cpp
#	xs/src/slic3r/AppControllerWx.cpp
#	xs/src/slic3r/GUI/GUI.hpp
2018-08-30 17:35:49 +02:00
YuSanka
1358c8efd2 Removed old sliders from 3DPreview 2018-08-30 15:30:31 +02:00
tamasmeszaros
15ad0ef2f2 working C++ status bar.
Signed-off-by: tamasmeszaros <meszaros.q@gmail.com>
2018-08-30 11:55:10 +02:00
tamasmeszaros
9e2d48ff3b Almost working c++ status bar
Signed-off-by: tamasmeszaros <meszaros.q@gmail.com>
2018-08-30 11:54:08 +02:00
YuSanka
99aaedffc1 Added PrusaDoubleSlider on 3DPreview 2018-08-30 10:42:55 +02:00
YuSanka
6c1b52afa2 Deleted "scale" column from object list 2018-08-29 13:11:30 +02:00
YuSanka
5557e59d43 Reorganized object settings pane
+ Added new control - PrusaLockButton
2018-08-28 15:51:53 +02:00
tamasmeszaros
1c4574d42e fix centroid error for two points and merge with dev. 2018-08-27 16:20:13 +02:00
Enrico Turri
8eb36b1bf9 Fixed undefined axis in rotate method of plater.pm 2018-08-27 14:13:06 +02:00
Enrico Turri
4b25d3924b Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev 2018-08-27 14:01:03 +02:00
Enrico Turri
fef5a5252e Fixed conflicts after merging with master 2018-08-27 14:00:53 +02:00
tamasmeszaros
d749080261 Merge remote-tracking branch 'origin/dev' into sla_base_pool 2018-08-27 09:53:52 +02:00
bubnikv
fec2545033 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2018-08-24 16:58:53 +02:00
Lukas Matena
a4176ef933 Bugfix - dialog that changes number of copies deleted the object when cancelled 2018-08-24 16:52:06 +02:00
YuSanka
02a325556d Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev 2018-08-24 16:28:34 +02:00
YuSanka
90fcdd4e5f Fixed post-commit compilation problems 2018-08-24 16:20:19 +02:00
Enrico Turri
cda135ada7 Removed scale and rotate actions from toolbar 2018-08-24 15:08:19 +02:00