bubnikv
a76cb3bd67
Merge remote-tracking branch 'remotes/origin/wipe_tower_no_priming'
2018-08-01 13:16:49 +02:00
Vojtech Kral
675e4cfd24
FirmwareDialog: Fix dialog resizing
2018-08-01 12:18:19 +02:00
Vojtech Kral
b6d70f5fe8
FirmwareDialog: UI improvements, bugfixes
2018-08-01 12:18:19 +02:00
Enrico Turri
c9d23d0ac0
Font for warning texture set to bold
2018-07-31 15:32:16 +02:00
Enrico Turri
e7cc3c5f4a
Code cleanup
2018-07-31 15:31:24 +02:00
Enrico Turri
a03d5178eb
Legend texture use square power of two image
2018-07-31 14:32:59 +02:00
Enrico Turri
e234973ab4
Warning texture use square power of two image and bigger font size
2018-07-31 14:20:16 +02:00
Enrico Turri
1c0fa19824
3D scene toolbar uses a single texture
2018-07-31 12:25:00 +02:00
YuSanka
14c9ff174d
Add variable name to tooltips
2018-07-31 10:42:37 +02:00
bubnikv
f49f871992
Added filament_load_time and filament_unload_time parameters
...
to define the filament load / unload times spent in the MMU2.0 unit
when performing the tool change code (the T code).
2018-07-31 09:44:29 +02:00
Enrico Turri
55e7a1af46
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-07-31 08:34:34 +02:00
Enrico Turri
2f7876b852
Fixed camera jump after object rotate
2018-07-30 13:57:05 +02:00
Enrico Turri
3f6d3b903d
Fixed rotation of 3D view camera after change of bed data
2018-07-30 10:35:08 +02:00
Enrico Turri
11b0325c66
Fixed calculation of bed origin in bed shape dialog
2018-07-30 10:03:17 +02:00
Enrico Turri
1882cd41a4
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-07-30 09:10:15 +02:00
Enrico Turri
bf4871d7f8
Improved remove hovering on objects when mouse leaves 3D scene
2018-07-30 09:09:14 +02:00
bubnikv
db8ba5fb76
New parameter "single_extruder_multi_material_priming" to be able
...
to suppress the MM priming towers.
The PrusaResearch.ini was modified for the MMU2 printers to
correctly prime the initial extruder when
single_extruder_multi_material_priming is disabled.
2018-07-27 22:19:46 +02:00
Enrico Turri
39c326ebae
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-07-27 14:41:05 +02:00
Enrico Turri
c64cba8ec2
A few fixes on 3D scene toolbar
2018-07-27 14:38:19 +02:00
Vojtech Kral
a9aca4426c
Fix: port friendly name encoding
2018-07-27 13:27:52 +02:00
Vojtech Kral
f729ab4b12
Fix: Race conditions
2018-07-27 13:27:52 +02:00
Vojtech Kral
a32bd17b75
FirmwareUpdater: MMU 2.0 / Caterina flashing
2018-07-27 13:27:52 +02:00
Vojtech Kral
6b801f250a
avrdude: use sections instead of offsets
2018-07-27 13:27:52 +02:00
Enrico Turri
590773d77b
Fixed conflict after merge with master
2018-07-27 12:15:35 +02:00
Enrico Turri
ddda5062c2
3D scene toolbar actions
2018-07-27 12:08:33 +02:00
bubnikv
987fc4c6df
Merge remote-tracking branch 'origin/backspace_to_delete_on_osx'
2018-07-27 09:55:13 +02:00
bubnikv
5c1de9fdd5
Merge remote-tracking branch 'origin/scene_manipulators'
2018-07-27 09:54:39 +02:00
bubnikv
c2291e54f4
Fixes crash when loading a config with zero number of default_filament_profile
...
values. Fixes SPE-427
2018-07-27 09:53:12 +02:00
Enrico Turri
3a1ec8285e
Reddish background when detected out of print volume toolpaths
2018-07-27 09:38:39 +02:00
Enrico Turri
c2ab8c2ae3
Out of print volume detection for extrusion toolpaths only
2018-07-27 08:49:58 +02:00
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
efbc1cce25
Fixed rotate gizmo update with multimaterial objects
2018-07-25 11:49:38 +02:00
Enrico Turri
93a05c4946
Use wxWidgets tooltip for 3D scene toolbar
2018-07-25 10:01:17 +02:00
Enrico Turri
2107ea7702
Fixed selection of multimaterial objects
2018-07-25 08:40:34 +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
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
YuSanka
dd088ba0cc
Localized the (modified) profile indicator
2018-07-23 15:44:01 +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
YuSanka
ee4f2cf549
Try to fix #977
2018-07-23 09:59:04 +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
Vojtech Kral
617b5158bd
Fix: Leak in Tab.cpp in serial port test
2018-07-02 19:00:36 +02:00
YuSanka
07b28b2a8c
Bug-fixes of the OSX crashing
2018-07-02 13:51:50 +02:00
YuSanka
16e42b0226
Added tooltips for selected Preset
2018-06-29 11:29:23 +02:00
bubnikv
6b3c24359b
Merge branch 'master' into amf_activate_existing_presets
2018-06-28 22:00:10 +02:00
bubnikv
26b003073b
Renamed the "compatible_printers_condition" and "inherits" vectors
...
to "compatible_printers_condition_cummulative" and "inherits_cummulative"
when storing to AMF/3MF/Config files.
Improved escaping of strings stored / loaded from config files.
2018-06-28 20:13:01 +02:00
YuSanka
2cbf5b75db
Final Fix of tooltips on OSX showing on the first page of a parameter tab.
2018-06-28 18:30:22 +02:00
YuSanka
9e4bea8cce
Code cleaning
2018-06-28 18:14:34 +02:00
YuSanka
896d898124
Resizing panel to 1 px
2018-06-28 17:52:20 +02:00
bubnikv
c4a3e4eca7
Merge branch 'for_merging'
2018-06-28 17:43:15 +02:00
YuSanka
5f1f7dcbed
Fix of tooltips on OSX showing on the first page of a parameter tab.
2018-06-28 17:34:55 +02:00
YuSanka
0171f49ad0
And last try..
2018-06-28 17:14:45 +02:00
YuSanka
75bda8cfd8
Addition to last commit
2018-06-28 16:50:06 +02:00