Commit Graph

3275 Commits

Author SHA1 Message Date
Enrico Turri
474c420bc2 Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev 2018-09-04 12:41:37 +02:00
Enrico Turri
c87b76e9b4 Fixed render of picking pass for flatten gizmo 2018-09-04 12:41:14 +02:00
YuSanka
c35efb06a5 Fix to last commit 2018-09-04 09:25:54 +02:00
YuSanka
0b36d94aaa Implemented "Settings to modified" as a subobject for objects and parts 2018-09-03 16:21:08 +02:00
Lukas Matena
2a72c16bf8 Bugfix - extruder temperature was sometimes not correctly set on the wipe tower 2018-09-03 10:15:40 +02:00
YuSanka
e11e16ce01 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
Enrico Turri
0cfb0761ea Merge branch 'master' of https://github.com/prusa3d/Slic3r into dev 2018-09-03 08:35:13 +02:00
bubnikv
db476e9a39 Merge remote-tracking branch 'origin/master' into support_improvements 2018-09-01 11:49:38 +02:00
Martin Loidl
657ac8898c fixes date for uploaded files 2018-09-01 11:23:33 +02:00
YuSanka
5ee350207c Fixed bug with crashing after part split for single material object 2018-08-31 14:15:26 +02:00
YuSanka
6b890d63a0 Reorganized right panel 2018-08-31 13:42:53 +02:00
Enrico Turri
e5d4f0d5ba Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev 2018-08-31 13:32:52 +02:00
tamasmeszaros
1aab634eb0 Merge remote-tracking branch 'origin/feature_arrange_with_libnest2d' into dev
# Conflicts:
#	xs/src/slic3r/AppController.cpp
2018-08-31 10:55:55 +02:00
Enrico Turri
7ce6e88458 Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev 2018-08-31 08:46:47 +02:00
Enrico Turri
e83b2e5041 Merge branch 'master' of https://github.com/prusa3d/Slic3r into dev 2018-08-31 08:33:42 +02:00
tamasmeszaros
4600f6c867 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
bubnikv
491b3cb19e Bumped up the version number to 1.41.0 release,
bundled updated PrusaResearch configs.
2018-08-30 16:08:25 +02:00
YuSanka
49049ced7b Removed old sliders from 3DPreview 2018-08-30 15:30:31 +02:00
bubnikv
44303cd212 Merge remote-tracking branch 'remotes/origin/master' into support_improvements 2018-08-30 15:24:49 +02:00
tamasmeszaros
5a5109c0cf fixing build issues 2018-08-30 12:11:52 +02:00
tamasmeszaros
46fb4a9d8f working C++ status bar.
Signed-off-by: tamasmeszaros <meszaros.q@gmail.com>
2018-08-30 11:55:10 +02:00
tamasmeszaros
54ad58bff8 Almost working c++ status bar
Signed-off-by: tamasmeszaros <meszaros.q@gmail.com>
2018-08-30 11:54:08 +02:00
YuSanka
5705409b7c Added PrusaDoubleSlider on 3DPreview 2018-08-30 10:42:55 +02:00
Enrico Turri
0fe10489a3 Enhanced gizmo scale 3D 2018-08-29 13:36:03 +02:00
Enrico Turri
1b51211703 Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev 2018-08-29 13:35:22 +02:00
YuSanka
f5b1003250 Deleted "scale" column from object list 2018-08-29 13:11:30 +02:00
Enrico Turri
b92e5fde5c Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev 2018-08-29 11:22:30 +02:00
YuSanka
91e2f2b0e4 Updated PrusaDoubleSlider icons 2018-08-29 11:21:22 +02:00
YuSanka
e29bebe48b Merge remote-tracking branch 'origin/dev' into new_main_page_ui 2018-08-29 10:06:29 +02:00
YuSanka
e71e73b43c Try to fix object_ctrl_context_menu on OS X 2018-08-29 09:33:56 +02:00
Enrico Turri
5ad95698f1 Merge branch 'master' of https://github.com/prusa3d/Slic3r into dev 2018-08-29 08:44:57 +02:00
Enrico Turri
107e105622 Fixed transformation center for objects imported from 3mf files 2018-08-29 08:42:42 +02:00
YuSanka
ce543c0cd6 Try to understand OSX crashing on context menu 2018-08-28 17:03:40 +02:00
Enrico Turri
affd4e0cbc Cached world matrix of GLVolume to speed up rendering 2018-08-28 16:08:43 +02:00
YuSanka
e798ba7827 Reorganized object settings pane
+ Added new control - PrusaLockButton
2018-08-28 15:51:53 +02:00
Enrico Turri
3869c45414 Removed unused methods 2018-08-28 15:19:53 +02:00
tamasmeszaros
fef141f40a Merge remote-tracking branch 'origin/dev' into sla_base_pool 2018-08-28 15:17:35 +02:00
tamasmeszaros
dc9d347540 png export parameters routed to SLA print config. PngExportDialog disabled. 2018-08-28 14:55:40 +02:00
Enrico Turri
bdbc776ae3 Eigenized 3mf I/O 2018-08-28 14:30:36 +02:00
Enrico Turri
af52a99530 More eigenized gizmos 2018-08-28 13:23:28 +02:00
Enrico Turri
d043df8ff1 Removed 2D gizmos 2018-08-28 12:50:26 +02:00
Enrico Turri
2457c43ad9 Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev 2018-08-28 12:05:30 +02:00
Enrico Turri
556896dd1c Fixed rotate gizmo position after arrange 2018-08-28 12:05:16 +02:00
tamasmeszaros
8f04503180 fix build for Linux 2018-08-28 11:55:10 +02:00
tamasmeszaros
14d81bcde1 added max merge distance parameter 2018-08-28 10:52:18 +02:00
Enrico Turri
48f1ab1caf Fixed 3D scene mouse capture 2018-08-28 09:31:23 +02:00
Enrico Turri
7a3957a193 Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev 2018-08-28 09:04:12 +02:00
Enrico Turri
02d4fa0583 Tweaks to GLGizmoFlatten 2018-08-28 09:03:03 +02:00
tamasmeszaros
5e63749852 png export recovered 2018-08-27 16:58:20 +02:00
tamasmeszaros
4c4989583d fix centroid error for two points and merge with dev. 2018-08-27 16:20:13 +02:00