Commit Graph
100 Commits
Author SHA1 Message Date
Enrico Turri b5b7894a6f Fixed color of all toolpaths when detected as out of print bed volume 2018-07-26 13:12:09 +02:00
Enrico Turri dd014136b0 Remove hovering on objects when mouse leaves 3D scene 2018-07-26 12:51:31 +02:00
Enrico Turri 828d3ddabc Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-07-26 12:46:59 +02:00
Enrico Turri efbc1cce25 Fixed rotate gizmo update with multimaterial objects 2018-07-25 11:49:38 +02:00
Enrico Turri 4243c7d84a Removed 2D panel 2018-07-25 09:42:03 +02:00
Enrico Turri dd724e9dab M73 lines emitted to gcode only for Marlin firmare. Fixes #1071 2018-07-25 09:19:20 +02:00
Enrico Turri 2107ea7702 Fixed selection of multimaterial objects 2018-07-25 08:40:34 +02:00
Enrico Turri 23e51cd941 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-07-25 08:35:13 +02:00
Enrico Turri d8f5daf345 Fixed selection of object modified by gizmo 2018-07-24 15:32:44 +02:00
Enrico Turri d4adcd4077 Out of print volume detection for toolpaths 2018-07-24 13:39:17 +02:00
Enrico Turri 2df6e08eed Reduced size of MK3 bed textures for compatibility with OpenGL 1.1 2018-07-24 10:33:14 +02:00
Enrico Turri bbe5586c15 Merge branch 'scene_manipulators' of https://github.com/prusa3d/Slic3r 2018-07-24 10:03:45 +02:00
Enrico Turri cac4b29153 Fixed crash when generating gcode of multimaterial objects with some object out of the bed 2018-07-23 15:58:08 +02:00
Enrico Turri 1c6d3c9c69 Added xml escape characters detection when exporting object and volumes names to 3mf files 2018-07-23 14:39:50 +02:00
Enrico Turri de085fdb6c Power of two squared bed textures to try to fix #1067 2018-07-23 14:21:14 +02:00
Enrico Turri 4294510ed7 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-07-23 13:56:26 +02:00
Enrico Turri 0bd8affab9 Attempt to fix #1067 2018-07-23 13:54:43 +02:00
Enrico Turri 33175a02f3 Added xml escape characters detection when exporting object and columes names to amf files 2018-07-23 10:58:39 +02:00
Enrico Turri df36de0d35 Fixed status of Slice now and Export G-Code buttons after object import 2018-07-23 10:16:56 +02:00
Enrico Turri 86caf83721 Update objects' list after scaling using gizmo 2018-07-23 08:57:00 +02:00
Enrico Turri 95bd2bb8f9 Faster time estimate for multimaterial 2018-07-20 15:54:11 +02:00
Enrico Turri 4b8e10a05c Slightly faster time estimation 2018-07-20 12:05:08 +02:00
Enrico Turri c1d1721dae Merge branch 'scene_manipulators' of https://github.com/prusa3d/Slic3r 2018-07-20 10:31:53 +02:00
Enrico Turri aaa592bab9 Another fix in gizmos update 2018-07-19 16:06:46 +02:00
Enrico Turri c40258d9b2 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-07-19 15:09:42 +02:00
Enrico Turri 1a6fdb668f Fixed print info 2018-07-19 13:58:25 +02:00
Enrico Turri feb0f76279 Better fix for gizmo update when deleting objects 2018-07-19 13:43:33 +02:00
Enrico Turri 63fe2a9fb9 Warning and legend textures moved from _3DScene class to GLCanvas3D class 2018-07-19 13:18:19 +02:00
Enrico Turri 5ff26bce50 Fixed update of gizmo when deleting all objects 2018-07-19 11:39:51 +02:00
Enrico Turri 678be2b317 Fixed update of rotate gizmo when selecting objects 2018-07-19 11:24:04 +02:00
Enrico Turri 7b551171e8 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-07-19 08:31:59 +02:00
Enrico Turri 7f267987cb Code cleanup 2018-07-18 15:52:20 +02:00
Enrico Turri be7b786fee Merge branch 'scene_manipulators' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-07-18 15:11:23 +02:00
Enrico Turri 13ced87089 Fixed depth test when rendering the picking texture 2018-07-18 15:09:26 +02:00
Enrico Turri 4579b71a66 Merge branch 'scene_manipulators' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-07-18 15:07:56 +02:00
Enrico Turri 3fac0d92cd Unified opengl textures 2018-07-18 15:07:52 +02:00
Enrico Turri c1dc46bb8e Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-07-18 14:49:19 +02:00
Enrico Turri b69e23ce73 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-07-18 14:49:09 +02:00
Enrico Turri 6f18e58d13 Fixed compile on Linux and Mac 2018-07-18 14:38:02 +02:00
Enrico Turri d805c8ac3b Disable slicing when one object crosses the print volume boundary 2018-07-18 14:26:42 +02:00
Enrico Turri d672a69554 Slice only objects contained into the print volume 2018-07-18 09:37:25 +02:00
Enrico Turri eb95e29be6 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-07-18 08:29:11 +02:00
Enrico Turri 08529189c9 Changed time estimator default values 2018-07-17 10:50:15 +02:00
Enrico Turri c9827bb4cf Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-07-17 10:46:34 +02:00
Enrico Turri 5c90746914 Merge with master + resolved conflicts 2018-07-17 10:44:23 +02:00
Enrico Turri ba8c8e5a1f Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-07-17 10:39:42 +02:00
Enrico Turri 8175c9d306 Merge with master 2018-07-17 08:54:17 +02:00
Enrico Turri f17d67871a Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-07-17 08:28:26 +02:00
Enrico Turri a80ef7201b Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-07-13 14:45:51 +02:00
Enrico Turri 7c545bc2b5 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-07-13 14:45:42 +02:00
Enrico Turri 4805df6037 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-07-13 14:45:15 +02:00
Enrico Turri d99b484ac6 Fixed update of sliders' texts into object settings dialog 2018-07-13 14:41:49 +02:00
Enrico Turri 75cf4e0947 Generate M73 lines for silent mode only for MK3 printers 2018-07-13 11:32:50 +02:00
Enrico Turri ee67b2c7c3 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-07-13 11:27:56 +02:00
Enrico Turri 344b71915f Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-07-13 11:27:48 +02:00
Enrico Turri 2bf7b02e3a Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-07-13 11:27:37 +02:00
Enrico Turri 06613e4792 Fixed 3D preview not updated after g-code export 2018-07-13 11:16:28 +02:00
Enrico Turri cf1ccacd41 Perimeters test modified to skip lines M73 2018-07-13 10:46:30 +02:00
Enrico Turri 7caada244a Attempt to fix SPE-356 2018-07-13 08:58:28 +02:00
Enrico Turri 0f5ce827a1 Rotate gizmo radius changed only when moving one of multiple instances 2018-07-12 15:19:43 +02:00
Enrico Turri 3839d26e9b Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-07-12 15:17:08 +02:00
Enrico Turri 4488ceaf7d Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-07-12 15:16:56 +02:00
Enrico Turri b2d9877cd5 Fixed crash on MAC when selecting system info 2018-07-12 13:34:39 +02:00
Enrico Turri 76d4b9dbb8 Attempt to fix SPE-352 2018-07-12 13:10:18 +02:00
Enrico Turri 63ab713585 Added debug output to investigate SPE-352 2018-07-12 12:15:30 +02:00
Enrico Turri 0e9ac1679f Keep fixed radius of rotate gizmo 2018-07-12 11:26:13 +02:00
Enrico Turri b6e55a521e Merge branch 'add_kinematics' of https://github.com/prusa3d/Slic3r into time_estimate 2018-07-12 08:42:08 +02:00
Enrico Turri a8691bc083 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-07-12 08:32:42 +02:00
Enrico Turri cb59cfe128 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-07-12 08:32:31 +02:00
Enrico Turri 1356a9977e Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-07-12 08:32:18 +02:00
Enrico Turri dc25df7b32 Faster remaining times export 2018-06-28 13:57:28 +02:00
Enrico Turri 7d61b2076f Faster remaining time calculation 2018-06-28 09:24:07 +02:00
Enrico Turri 9725966f38 Time estimate uses G1 lines containing E parameter for remaining time calculations 2018-06-28 08:52:07 +02:00
Enrico Turri 7ff22b9413 Time estimate emitted to gcode at requested interval 2018-06-27 15:35:47 +02:00
Enrico Turri de28d4edeb Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-27 15:32:47 +02:00
Enrico Turri 6c6f6ed4e2 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-06-27 15:32:39 +02:00
Enrico Turri 3dba0be81e Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-27 15:32:31 +02:00
Enrico Turri d02c90d5d0 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-27 13:54:39 +02:00
Enrico Turri cf6552484d Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-06-27 13:53:13 +02:00
Enrico Turri 48915a65fd Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-27 13:52:57 +02:00
Enrico Turri 06f44a9e4b Code cleanup 2018-06-27 12:49:38 +02:00
Enrico Turri 8db4fdc24c 3rd attempt to fix opengl on ubuntu 2018-06-27 12:36:49 +02:00
Enrico Turri 23d10fdadc 2nd attempt to fix opengl on ubuntu 2018-06-27 12:05:23 +02:00
Enrico Turri 5c32347449 1st attempt to fix opengl on ubuntu 2018-06-27 11:31:11 +02:00
Enrico Turri dc223066d3 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-27 08:26:55 +02:00
Enrico Turri f7a0d817ae Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-06-27 08:26:45 +02:00
Enrico Turri db95460154 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-27 08:26:33 +02:00
Enrico Turri bd1d70d8d3 Fixed crash when slicing from Layers tab 2018-06-26 12:50:04 +02:00
Enrico Turri ab587babb9 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-26 12:20:41 +02:00
Enrico Turri 3a7c9123fa Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-06-26 12:20:34 +02:00
Enrico Turri 9b2f760679 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-26 12:20:23 +02:00
Enrico Turri 87c1654e31 Fixed bed update when changing selected printer 2018-06-26 12:19:19 +02:00
Enrico Turri a754de4c32 Fixed panning in Layers view 2018-06-26 11:17:30 +02:00
Enrico Turri 90b0cd5cae Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-26 11:16:00 +02:00
Enrico Turri a9d3e21579 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-06-26 11:15:46 +02:00
Enrico Turri 69ff60b557 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-26 11:15:33 +02:00
Enrico Turri ecda2a6140 Merge branch 'add_kinematics' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-25 16:09:27 +02:00
Enrico Turri 714204b227 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-25 15:27:06 +02:00
Enrico Turri b6b14ef819 Fixed conflicts after merge with master branch 2018-06-25 15:26:37 +02:00
Enrico Turri ba0637461f Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-06-25 15:25:12 +02:00