3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,756 Commits 1 Branch 1 Tag 249 MiB
895bdf7918
Commit Graph

3154 Commits

Author SHA1 Message Date
bubnikv
bb70ad6090 Removed Strings.hpp, replaced with wxString 
Fixed UTF8 rendering of status messages.
 2018-09-12 13:17:47 +02:00
bubnikv
0235f1a821 Merged with dev 2018-09-12 11:59:02 +02:00
bubnikv
41ce69f327 Improved constness of the Print / PrintObject / Layer ... 
Split the wipe tower and time statistics data into separate objects.
Initial work in synchronizing the Model with the Print.
 2018-09-11 14:04:47 +02:00
Enrico Turri
a97df55592 Temporary remove not yet supported transformations from 3D gizmos 2018-09-11 12:40:42 +02:00
Enrico Turri
4479c5444a 1st installment of gizmo move 3D 2018-09-11 09:00:28 +02:00
Enrico Turri
781df150a1 Added perl callback for gizmo flatten 2018-09-10 14:10:08 +02:00
Enrico Turri
1516c46d0b Merge branch 'master' of https://github.com/prusa3d/Slic3r into dev 2018-09-10 13:49:25 +02:00
Enrico Turri
78bc688a7f Fixed compile on Linux 2018-09-10 13:48:35 +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 #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
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
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
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
3144cba5f9 Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d 2018-08-27 10:20:48 +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