Commit Graph
100 Commits
Author SHA1 Message Date
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 8175c9d306 Merge with master 2018-07-17 08:54:17 +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 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 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 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 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 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 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 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 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 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 7b0ba7a9d4 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-25 15:24:58 +02:00
Enrico Turri 40b327eb11 Fix of interaction between opengl contexts and main page notebook 2018-06-25 15:17:13 +02:00
Enrico Turri 581ed7764c Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-25 13:21:52 +02:00
Enrico Turri 789a760fbd Fixed conflict after merge with master 2018-06-25 10:49:30 +02:00
Enrico Turri 8a4a5e487e Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-25 08:51:47 +02:00
Enrico Turri 7d15a15e14 Fix of #999 2018-06-25 08:48:36 +02:00
Enrico Turri 3da21a4ce8 Merge branch 'add_kinematics' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-25 08:27:09 +02:00
Enrico Turri f9e6bcf872 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-25 08:26:14 +02:00
Enrico Turri ac0f3a6ef7 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-22 16:13:51 +02:00
Enrico Turri c948ca647c Code cleanup 2018-06-22 16:11:00 +02:00
Enrico Turri 2a03b90d2b Forced render of 3D scene when changing tab in plater's notebook 2018-06-22 16:06:37 +02:00
Enrico Turri de540de9aa 5th Attempt to fix texture rendering on OpenGL 1.1 cards 2018-06-22 15:11:04 +02:00
Enrico Turri f420ced581 Time estimators use initial data from config 2018-06-22 14:01:27 +02:00
Enrico Turri 00ef0610a5 Merge branch 'add_kinematics' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-22 12:57:16 +02:00
Enrico Turri f8982c0ca1 Merge branch 'machine-limits-config' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-22 12:30:15 +02:00
Enrico Turri 15c69a90ec Changed use of GL_LIGHTING logic and code cleanup 2018-06-22 12:21:43 +02:00
Enrico Turri ac7d21b50a Geometry info updated while using gizmos 2018-06-22 11:19:38 +02:00
Enrico Turri 266a4413bd 4th Attempt to fix texture rendering on OpenGL 1.1 cards 2018-06-22 09:42:56 +02:00
Enrico Turri be52647440 Smaller gizmos icons 2018-06-22 09:00:01 +02:00
Enrico Turri 4ba3cef496 3rd Attempt to fix texture rendering on OpenGL 1.1 cards 2018-06-22 08:38:13 +02:00
Enrico Turri e89083090f Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-21 16:08:40 +02:00
Enrico Turri e0db2a925d Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-21 16:08:20 +02:00
Enrico Turri 75cd436ae5 2nd Attempt to fix texture rendering on OpenGL 1.1 cards 2018-06-21 15:43:34 +02:00
Enrico Turri b139f38784 Attempt to fix texture rendering on OpenGL 1.1 cards 2018-06-21 13:03:53 +02:00
Enrico Turri 4fcbb73141 Cleanup of perl code 2018-06-21 12:21:51 +02:00
Enrico Turri 8194d7713b Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-21 12:21:11 +02:00
Enrico Turri 21e7d379b1 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-21 12:20:52 +02:00
Enrico Turri 8c40a962fb Shift key to move selected instances together 2018-06-21 11:14:17 +02:00
Enrico Turri a7e9ec5757 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-21 11:05:07 +02:00
Enrico Turri 4ee365194a Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-21 11:03:38 +02:00
Enrico Turri a3a8333d20 Force update when changing selected printer using the GUI 2018-06-21 10:43:01 +02:00
Enrico Turri 80e4155cbc Bed textures selection using config inheritance 2018-06-21 10:24:57 +02:00
Enrico Turri b386f52acc Removed error dialog when texture file does not exist 2018-06-21 09:54:43 +02:00
Enrico Turri a3d21b6b0e Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-21 08:39:51 +02:00
Enrico Turri 0c24a65039 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-21 08:39:26 +02:00
Enrico Turri 550f6e307f Faster gizmos update 2018-06-21 08:37:04 +02:00
Enrico Turri 59b6de3d01 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-20 14:47:23 +02:00
Enrico Turri cea5b97cad Merge branch 'master' of https://github.com/prusa3d/Slic3r 2018-06-20 14:34:46 +02:00
Enrico Turri 4803e7fc84 Fixed crash at startup on OpenGL 1.1 cards 2018-06-20 14:34:20 +02:00
Enrico Turri fa9014fc8e Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-20 08:32:27 +02:00
Enrico Turri b9ce19b07c Object updated by rotate gizmo 2018-06-19 09:46:26 +02:00
Enrico Turri a3949b9f01 Object updated by scale gizmo 2018-06-18 15:07:17 +02:00
Enrico Turri e92e51effb Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-18 15:06:26 +02:00
Enrico Turri 56ea84fef8 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-18 15:06:04 +02:00
Enrico Turri 53f8706805 Rotate gizmo interaction with mouse 2018-06-15 16:16:55 +02:00
Enrico Turri 6874949556 Scale gizmo interaction with mouse 2018-06-15 14:10:28 +02:00
Enrico Turri 52a7d7ed09 Partial perl code cleanup 2018-06-14 16:09:36 +02:00
Enrico Turri c624d6bb0a Hover on gizmo grabbers rendering 2018-06-14 15:32:26 +02:00
Enrico Turri 4d405977dd Keep selection when panning/rotating 3D view 2018-06-14 12:34:19 +02:00
Enrico Turri 7fb6e2aa03 Use mipmaps for bed textures 2018-06-14 10:37:28 +02:00
Enrico Turri bc5640eef4 Rotate gizmo rendering 2018-06-14 10:00:59 +02:00
Enrico Turri 3a19b81cef Scale gizmo rendering 2018-06-13 15:44:04 +02:00
Enrico Turri 099d59ad27 Selection on gizmo overlay 2018-06-13 13:14:17 +02:00
Enrico Turri c657654c02 Hovering on gizmo overlay 2018-06-13 10:49:59 +02:00