Commit Graph

758 Commits

Author SHA1 Message Date
Enrico Turri
93a05c4946 Use wxWidgets tooltip for 3D scene toolbar 2018-07-25 10:01:17 +02:00
Enrico Turri
8bf3e63f75 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-07-24 11:20:02 +02:00
Enrico Turri
bbe5586c15 Merge branch 'scene_manipulators' of https://github.com/prusa3d/Slic3r 2018-07-24 10:03:45 +02:00
Vojtech Kral
1842520ea6 ConfigWizard: Fix: Don't check the default printer if the wizard is requested by user or re-configure 2018-07-23 15:04:21 +02:00
Vojtech Kral
3e65b4410b PresetUpdater: Fix reloading of profiles after reconfigure and update
Fix #1060
Fix #985
2018-07-23 15:02:13 +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
c68bcb9e60 1st installment of 3D scene toolbar 2018-07-23 13:49:48 +02:00
Vojtech Kral
abe7a71f85 ConfigWizard: Wrap printer model titles 2018-07-23 11:43:06 +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
aaa592bab9 Another fix in gizmos update 2018-07-19 16:06:46 +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
bubnikv
b57418f81d Reordered the fields on the new "Machine limits" page. 2018-07-18 15:08:55 +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
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
bubnikv
0660862058 For the Marlin firmware, the machine envelope G-code is emitted
based on the Slic3r printer profile.

Also the bundled config has been updated, so that the machine envelope
G-code values were removed and the new Slic3r printer profile values
were updated with the former G-code values.

Slic3r version has been bumped up to 1.41.0-alpha for the configuration
files to work.
2018-07-17 19:37:24 +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
bubnikv
c34a713c8c Simplification of
1.40.1-rc2 fails to save the modified AMF settings #1035
2018-07-17 10:41:17 +02:00
bubnikv
161a2bc6f8 Merge remote-tracking branch 'remotes/origin/ys_preset_externals_bf' 2018-07-17 09:47:49 +02:00
bubnikv
3339623db6 Merge remote-tracking branch 'remotes/origin/ys_tooltips_osx' 2018-07-17 09:40:19 +02:00
bubnikv
83f9813f56 Merge remote-tracking branch 'remotes/origin/opengl_to_cpp' 2018-07-17 09:37:38 +02:00
bubnikv
c7f59aca7d Merge remote-tracking branch 'remotes/origin/wipe_tower_improvements' 2018-07-17 09:20:19 +02:00
Enrico Turri
8175c9d306 Merge with master 2018-07-17 08:54:17 +02:00
bubnikv
210eeff160 Merge remote-tracking branch 'remotes/origin/amf_activate_existing_presets' 2018-07-16 19:52:17 +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
Lukas Matena
4c823b840f Fix of previous commit 2018-07-09 14:43:32 +02:00
Lukas Matena
bb80774e74 Infill purging - added fifth extruder into default setttings, cosmetic changes 2018-07-09 13:44:41 +02:00
YuSanka
fcc781195b Added updating of the is_external value for edited_preset after loading preset from (.ini, .gcode, .amf, .3mf etc) 2018-07-09 12:10:57 +02:00
Lukas Matena
92d36df903 Merge branch 'master' into wipe_tower_improvements 2018-07-09 09:28:26 +02:00
bubnikv
e61b25de7c Merge branch 'master' into amf_activate_existing_presets 2018-07-03 13:04:11 +02:00
YuSanka
b682fb1829 Enabled "delete preset" button after current profile saving 2018-07-03 12:19:34 +02:00
bubnikv
c7f3014d26 Fix of
"Slic3r 1.40.1-rc fails to retain the filament list on"
https://github.com/prusa3d/Slic3r/issues/1020
2018-07-02 20:25:37 +02:00