viewit/OrcaSlicer-KX
5
1
Fork 1
Code Issues Pull Requests Actions 9 Packages Projects Releases 6 Wiki Activity
6,565 Commits 8 Branches 6 Tags
fadee48454e944df419856e76d99c17422b4e532
Commit Graph

6565 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Enrico Turri
fadee48454 Added ModelInstance::world_matrix() method and stl_transform using eigen transform 2018-09-04 14:42:14 +02:00
Enrico Turri
c87b76e9b4 Fixed render of picking pass for flatten gizmo 2018-09-04 12:41:14 +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
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
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
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
tamasmeszaros
24bcec4901 generalization for more than one concave hulls. 2018-08-27 15:18:28 +02:00
Enrico Turri
2c2657c4d1 Merge branch 'master' of https://github.com/prusa3d/Slic3r into dev 2018-08-27 14:56:23 +02:00
Enrico Turri
384b0a94fa Fixed moving center of rotate gizmo 2018-08-27 14:54:20 +02:00
Enrico Turri
e7be2e0d57 Fixed undefined axis in rotate method of plater.pm 2018-08-27 14:13:06 +02:00
Enrico Turri
99262e2d59 Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev 2018-08-27 14:01:03 +02:00
Enrico Turri
a3bd7c110f Fixed conflicts after merging with master 2018-08-27 14:00:53 +02:00
tamasmeszaros
991b427479 FIxed build errors caused by merge and flipped normals of the SLA pool walls. 2018-08-27 11:59:37 +02:00
tamasmeszaros
564063d94a Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d 2018-08-27 10:20:48 +02:00
tamasmeszaros
33c5ecd6f6 Merge remote-tracking branch 'origin/dev' into sla_base_pool 2018-08-27 09:53:52 +02:00
bubnikv
c27a2fcc7c Bumped up the version number to 1.41.0-beta2 2018-08-25 22:11:04 +02:00
bubnikv
d1580769a9 Changed the wording of "Purge into this object's ..." to "Wipe ..." 2018-08-25 22:09:55 +02:00
bubnikv
49c500d708 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2018-08-24 16:58:53 +02:00
YuSanka
52fa83739f Fixed post-merge compilation problem 2018-08-24 16:56:42 +02:00
Lukas Matena
87945498bf Bugfix - dialog that changes number of copies deleted the object when cancelled 2018-08-24 16:52:06 +02:00
bubnikv
cf3e99f94d Merge remote-tracking branch 'remotes/origin/lm_lay_flat_round_merged_facets' 2018-08-24 16:39:24 +02:00
bubnikv
466b385716 Merge remote-tracking branch 'remotes/origin/lm_retraction_fix' 2018-08-24 16:33:57 +02:00