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 |
|
tamasmeszaros
|
4c1bb6888c
|
generalization for more than one concave hulls.
|
2018-08-27 15:18:28 +02:00 |
|
Enrico Turri
|
b9bb821392
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into dev
|
2018-08-27 14:56:23 +02:00 |
|
Enrico Turri
|
eb9f4ee777
|
Fixed moving center of rotate gizmo
|
2018-08-27 14:54:20 +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
|
e667203825
|
FIxed build errors caused by merge and flipped normals of the SLA pool walls.
|
2018-08-27 11:59:37 +02:00 |
|
tamasmeszaros
|
d749080261
|
Merge remote-tracking branch 'origin/dev' into sla_base_pool
|
2018-08-27 09:53:52 +02:00 |
|
bubnikv
|
4522811f5b
|
Bumped up the version number to 1.41.0-beta2
|
2018-08-25 22:11:04 +02:00 |
|
bubnikv
|
78a7104994
|
Changed the wording of "Purge into this object's ..." to "Wipe ..."
|
2018-08-25 22:09:55 +02:00 |
|
YuSanka
|
d4c8bc0720
|
Fixed post-merge compilation problem
|
2018-08-24 16:56:42 +02:00 |
|
bubnikv
|
3c0d81e7d9
|
Merge remote-tracking branch 'remotes/origin/lm_lay_flat_round_merged_facets'
|
2018-08-24 16:39:24 +02:00 |
|
bubnikv
|
de0f8ec267
|
Merge remote-tracking branch 'remotes/origin/lm_retraction_fix'
|
2018-08-24 16:33:57 +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
|
220d430956
|
Mouse capture when dragging gizmos
|
2018-08-24 15:49:57 +02:00 |
|
Enrico Turri
|
cda135ada7
|
Removed scale and rotate actions from toolbar
|
2018-08-24 15:08:19 +02:00 |
|
YuSanka
|
8b148a4fe4
|
Merge remote-tracking branch 'origin/new_main_page_ui' into dev
|
2018-08-24 15:01:26 +02:00 |
|
Enrico Turri
|
bbc465fdf3
|
Added tooltip to gizmos
|
2018-08-24 14:11:41 +02:00 |
|
YuSanka
|
bb24ae9f03
|
Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev
|
2018-08-24 13:58:21 +02:00 |
|
YuSanka
|
d90f5fa591
|
Added "one_layer" mode for PrusaDoubleSlider
|
2018-08-24 13:36:19 +02:00 |
|
YuSanka
|
774315fe07
|
Fixed after-merging compilation problems
|
2018-08-24 12:54:21 +02:00 |
|
Lukas Matena
|
be3b8e98da
|
Edited captions and default values of the new parameters (initial loading and unloading speed)
|
2018-08-24 12:46:32 +02:00 |
|
Enrico Turri
|
bfac36174f
|
Renamed private member functions in GLToolbar
|
2018-08-24 12:32:14 +02:00 |
|
YuSanka
|
ada6970053
|
Merge remote-tracking branch 'origin/SLA_ui' into dev
|
2018-08-24 12:20:24 +02:00 |
|