Commit Graph

6819 Commits

Author SHA1 Message Date
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 #1211 2018-09-10 13:15:12 +02:00
Enrico Turri
d8936b1ad8 Another partial refactoring of 3d gizmos 2018-09-10 11:58:24 +02:00
Enrico Turri
5e8bd47988 Partial refactoring of 3d gizmos 2018-09-10 10:01:49 +02:00
bubnikv
49697ed6aa Replaced this->m_xxx with just m_xxx 2018-09-10 09:11:49 +02:00
Enrico Turri
df320523b1 Merge branch 'master' of https://github.com/prusa3d/Slic3r into dev 2018-09-07 16:07:16 +02:00
Enrico Turri
62894d3f7b Export the first M73 line to gcode before custom gcode 2018-09-07 16:05:10 +02:00
Enrico Turri
e1deb03d3c Added perl callback for three doubles 2018-09-07 14:21:04 +02:00
Enrico Turri
775ec1b546 Tweaks to gizmo scale 3D 2018-09-07 13:40:26 +02:00
Enrico Turri
d39ed75148 Merge branch 'master' of https://github.com/prusa3d/Slic3r into dev 2018-09-07 13:37:53 +02:00
Vojtech Kral
00c51e06ed
Merge pull request #1195 from mloidl/duet_whitespace
duet upload: allow whitespaces in filenames
2018-09-07 13:05:37 +02:00
Enrico Turri
ada6dba00b Selection of picking color for gizmo grabber moved into GLGizmoBase 2018-09-07 12:20:56 +02:00
Enrico Turri
ea15475ad8 Fixed double click on gizmo overlay and toolbar 2018-09-07 12:00:04 +02:00
Enrico Turri
e9d5cd726e Merge branch 'master' of https://github.com/prusa3d/Slic3r into dev 2018-09-07 10:32:39 +02:00
Enrico Turri
e04805eaa2 Fixed rendering of endcaps on open toolpaths 2018-09-07 10:30:13 +02:00
YuSanka
125ece0aad Fixed #1204 2018-09-07 09:33:18 +02:00
Enrico Turri
0ea18d57d0 Fixed wipe tower selection 2018-09-07 09:21:12 +02:00
Martin Loidl
6960958276 minor changes for url_encode 2018-09-06 19:07:54 +02:00
Enrico Turri
8460926d36 Added select by part tool to toolbar 2018-09-06 16:10:31 +02:00
Enrico Turri
c8f1369824 Added Vec3d ModelInstance::transform_vector() method 2018-09-06 09:16:32 +02:00
Enrico Turri
b9287d51dd Tweaks to ModelObject::center_around_origin() 2018-09-06 08:56:33 +02:00
Martin Loidl
e1417f1827 allow whitespaces for duet upload
* now url_encoding characters which could not used for URLs
2018-09-05 19:55:50 +02:00
Enrico Turri
677dad0669 Object's properties updated while manipulating gizmos 2018-09-05 16:22:48 +02:00
Enrico Turri
42567e3af2 Object's position updated on gui after displacement 2018-09-05 15:35:09 +02:00
Enrico Turri
622e86d9e4 Merge branch 'master' of https://github.com/prusa3d/Slic3r into dev 2018-09-05 15:32:12 +02:00
Enrico Turri
aef871f1a0 Another fix in flatten gizmo's flattening normal 2018-09-05 15:13:29 +02:00
Enrico Turri
df594fc5b0 Tweaks to update of object properties on gui 2018-09-05 15:09:13 +02:00
YuSanka
82838cc640 Final bug-fix for #1169 considering issue #971 2018-09-05 15:03:20 +02:00
Enrico Turri
b9e6f8f3e3 Merge branch 'master' of https://github.com/prusa3d/Slic3r into dev 2018-09-05 14:12:58 +02:00
Enrico Turri
011281068b Fixed flatten gizmo's flattening normal 2018-09-05 14:02:08 +02:00
YuSanka
8ba48f8dc5 fixed typo-bug 2018-09-05 12:33:04 +02:00
YuSanka
f2563c4a22 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2018-09-05 12:02:52 +02:00
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