YuSanka
|
e2830dc337
|
Fix to last commit
|
2018-09-05 12:02:34 +02:00 |
|
Enrico Turri
|
407aee9942
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into dev
|
2018-09-05 09:51:31 +02:00 |
|
Enrico Turri
|
77b9982ea7
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r
|
2018-09-05 09:49:28 +02:00 |
|
Enrico Turri
|
f95b84e913
|
Fixed stl import when endsolid lines contains extra data
|
2018-09-05 09:49:10 +02:00 |
|
YuSanka
|
f67060f012
|
Fixed bug from issue #1169
|
2018-09-05 09:47:36 +02:00 |
|
Enrico Turri
|
d41b7a3749
|
Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev
|
2018-09-05 09:19:36 +02:00 |
|
Enrico Turri
|
87c5c8e7f6
|
Renamed GLVolume member variables to match the corresponding ModelInstance ones
|
2018-09-05 09:11:58 +02:00 |
|
Enrico Turri
|
6b1b2bad76
|
Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev
|
2018-09-04 14:43:14 +02:00 |
|
Enrico Turri
|
15b1340514
|
Added ModelInstance::world_matrix() method and stl_transform using eigen transform
|
2018-09-04 14:42:14 +02:00 |
|
Enrico Turri
|
ab1517caf5
|
Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev
|
2018-09-04 12:41:37 +02:00 |
|
Enrico Turri
|
5f2afad95e
|
Fixed render of picking pass for flatten gizmo
|
2018-09-04 12:41:14 +02:00 |
|
Enrico Turri
|
6a48d79b0b
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into dev
|
2018-09-03 08:35:13 +02:00 |
|
Martin Loidl
|
22569de00f
|
fixes date for uploaded files
|
2018-09-01 11:23:33 +02:00 |
|
bubnikv
|
453e7e37d3
|
Bundled newer versions of PrusaResearch profiles.
|
2018-09-01 09:54:02 +02:00 |
|
Enrico Turri
|
e79919ac2d
|
Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev
|
2018-08-31 13:32:52 +02:00 |
|
tamasmeszaros
|
6e2ed48e5a
|
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
|
ae9355e634
|
Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev
|
2018-08-31 08:46:47 +02:00 |
|
Enrico Turri
|
bb4329c8d0
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into dev
|
2018-08-31 08:33:42 +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 |
|
bubnikv
|
d57725ee18
|
Bumped up the version number to 1.41.0 release,
bundled updated PrusaResearch configs.
|
2018-08-30 16:08:25 +02:00 |
|
tamasmeszaros
|
f5b1729af3
|
fixing build issues
|
2018-08-30 12:11:52 +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 |
|
Enrico Turri
|
3750bd781e
|
Enhanced gizmo scale 3D
|
2018-08-29 13:36:03 +02:00 |
|
Enrico Turri
|
4c80a104f5
|
Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev
|
2018-08-29 13:35:22 +02:00 |
|
YuSanka
|
6c1b52afa2
|
Deleted "scale" column from object list
|
2018-08-29 13:11:30 +02:00 |
|
Enrico Turri
|
67ca355912
|
Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev
|
2018-08-29 11:22:30 +02:00 |
|
YuSanka
|
7fd7d83470
|
Updated PrusaDoubleSlider icons
|
2018-08-29 11:21:22 +02:00 |
|
YuSanka
|
b1d418a799
|
Merge remote-tracking branch 'origin/dev' into new_main_page_ui
|
2018-08-29 10:06:29 +02:00 |
|
YuSanka
|
2dcfd74579
|
Try to fix object_ctrl_context_menu on OS X
|
2018-08-29 09:33:56 +02:00 |
|
Enrico Turri
|
f5a0ca5303
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into dev
|
2018-08-29 08:44:57 +02:00 |
|
Enrico Turri
|
5ee106fbf9
|
Fixed transformation center for objects imported from 3mf files
|
2018-08-29 08:42:42 +02:00 |
|
YuSanka
|
a56ea9a616
|
Try to understand OSX crashing on context menu
|
2018-08-28 17:03:40 +02:00 |
|
Enrico Turri
|
4ffdb46110
|
Cached world matrix of GLVolume to speed up rendering
|
2018-08-28 16:08:43 +02:00 |
|
YuSanka
|
5557e59d43
|
Reorganized object settings pane
+ Added new control - PrusaLockButton
|
2018-08-28 15:51:53 +02:00 |
|
Enrico Turri
|
cfe49a20ad
|
Removed unused methods
|
2018-08-28 15:19:53 +02:00 |
|
tamasmeszaros
|
055e90602e
|
Merge remote-tracking branch 'origin/dev' into sla_base_pool
|
2018-08-28 15:17:35 +02:00 |
|
tamasmeszaros
|
4796ef3fb2
|
png export parameters routed to SLA print config. PngExportDialog disabled.
|
2018-08-28 14:55:40 +02:00 |
|
Enrico Turri
|
98a6468c81
|
Eigenized 3mf I/O
|
2018-08-28 14:30:36 +02:00 |
|
Enrico Turri
|
84fb7940b7
|
More eigenized gizmos
|
2018-08-28 13:23:28 +02:00 |
|
Enrico Turri
|
255e837d33
|
Removed 2D gizmos
|
2018-08-28 12:50:26 +02:00 |
|
Enrico Turri
|
4e37f9d232
|
Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev
|
2018-08-28 12:05:30 +02:00 |
|
Enrico Turri
|
dd86546d0f
|
Fixed rotate gizmo position after arrange
|
2018-08-28 12:05:16 +02:00 |
|
tamasmeszaros
|
057dfa56e3
|
fix build for Linux
|
2018-08-28 11:55:10 +02:00 |
|
tamasmeszaros
|
7cee4d53f9
|
added max merge distance parameter
|
2018-08-28 10:52:18 +02:00 |
|
Enrico Turri
|
6ce686aff8
|
Fixed 3D scene mouse capture
|
2018-08-28 09:31:23 +02:00 |
|
Enrico Turri
|
41c093a258
|
Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev
|
2018-08-28 09:04:12 +02:00 |
|
Enrico Turri
|
87565a0686
|
Tweaks to GLGizmoFlatten
|
2018-08-28 09:03:03 +02:00 |
|
tamasmeszaros
|
b990b36da7
|
png export recovered
|
2018-08-27 16:58:20 +02:00 |
|
tamasmeszaros
|
1c4574d42e
|
fix centroid error for two points and merge with dev.
|
2018-08-27 16:20:13 +02:00 |
|