enricoturri1966
a8f6f295e4
Merge remote-tracking branch 'origin/et_canvas_manager'
2020-03-25 15:40:44 +01:00
enricoturri1966
dd34aef643
Follow-up of bfbcd45209
-> completed fix
2020-03-25 15:30:25 +01:00
enricoturri1966
bfbcd45209
Fixed build on Mac
2020-03-25 15:15:20 +01:00
enricoturri1966
a54d77699b
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_canvas_manager
2020-03-25 14:54:10 +01:00
enricoturri1966
f12b39be25
Fixed conflicts after merge with master
2020-03-25 14:41:47 +01:00
bubnikv
faf8df7864
Show just a short build info at the application toolbar even on OSX.
2020-03-25 14:35:41 +01:00
bubnikv
4656102dba
Compile with 32bit coord_t by default.
2020-03-25 14:35:41 +01:00
bubnikv
c27297f6cc
64bit coord_t
...
Vec3i as a vertex index to TriangleMesh constructor
2020-03-25 14:35:41 +01:00
enricoturri1966
ed0f3b3406
Small refactoring
2020-03-25 13:55:17 +01:00
tamasmeszaros
bf5d52f221
Only do OpenSSL override on Linux
2020-03-25 12:27:10 +01:00
YuSanka
de06c5d659
Merge remote-tracking branch 'origin/ys_fix_cb_selection'
2020-03-25 11:12:37 +01:00
tamasmeszaros
d207ea7dc5
Merge branch 'tm_cert_store'
2020-03-25 11:07:06 +01:00
enricoturri1966
24992e3e50
Merge remote-tracking branch 'origin/et_bug_fixes'
2020-03-25 10:39:45 +01:00
enricoturri1966
10eb954c7e
ENABLE_AUTO_CONSTRAINED_CAMERA set as default
2020-03-25 10:24:52 +01:00
enricoturri1966
3d6c9e54e9
ENABLE_THUMBNAIL_GENERATOR set as default
2020-03-25 10:15:02 +01:00
tamasmeszaros
1123689a22
Search for openssl cert store on app init, if the store is not present.
...
fixes #3851
2020-03-25 09:41:29 +01:00
enricoturri1966
fac28ea27a
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_bug_fixes
2020-03-25 09:34:17 +01:00
enricoturri1966
3990598f01
Fixed build when ENABLE_GIZMO_TOOLBAR_DRAGGING_FIX is disabled
2020-03-25 09:33:59 +01:00
enricoturri1966
df8def7545
Fixed build when ENABLE_CANVAS_TOOLTIP_USING_IMGUI is disabled
2020-03-25 09:22:37 +01:00
enricoturri1966
c300b66b7e
ENABLE_MODIFIED_GIZMOBAR_MOUSE_EVENT_HANDLING merged into ENABLE_CANVAS_TOOLTIP_USING_IMGUI
2020-03-25 09:05:35 +01:00
enricoturri1966
69ca14a695
ENABLE_MODIFIED_TOOLBAR_MOUSE_EVENT_HANDLING merged into ENABLE_CANVAS_TOOLTIP_USING_IMGUI
2020-03-25 08:52:57 +01:00
enricoturri1966
6f1c99db34
ENABLE_CANVAS_DELAYED_TOOLTIP_USING_IMGUI merged into ENABLE_CANVAS_TOOLTIP_USING_IMGUI
2020-03-25 08:43:18 +01:00
enricoturri1966
36041ced26
ENABLE_CANVAS_CONSTRAINED_TOOLTIP_USING_IMGUI merged into ENABLE_CANVAS_TOOLTIP_USING_IMGUI
2020-03-25 08:31:15 +01:00
Lukas Matena
ece0d4ca18
Merge branch 'dev'
2020-03-24 21:51:33 +01:00
Lukas Matena
97b9de47b4
Merge branch 'master' into dev
2020-03-24 21:51:05 +01:00
enricoturri1966
7c72231fcd
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_bug_fixes
2020-03-24 12:26:48 +01:00
enricoturri1966
c6d5ad1517
Refactoring of toolbars' tooltip generation
2020-03-24 12:26:30 +01:00
bubnikv
c3a9915fa1
Added the order of the print parameter priorities when slicing
...
from command line to command line help.
Follow up on
PrusaSlicer Console --load my_config.ini doesnt overwrites the 3mf profiles or not used. #3893
2020-03-24 11:59:55 +01:00
bubnikv
015a4a37dc
Fix of a wrong order of processing the config sources when slicing
...
from command line. Fixes
PrusaSlicer Console --load my_config.ini doesnt overwrites the 3mf profiles or not used. #3893
The priority of config values is now:
1) Config keys from command line, for example --fill-pattern=stars
(highest priority, overwrites everything below)
2) Config files loaded with --load
3) Config from 3mf
(lowest priority)
2020-03-24 11:52:43 +01:00
bubnikv
ad5ae50933
Fix of Crash when trying to set up non-existent flashair ( #3899 )
...
fixed a typo in formatting text, throwing an exception.
2020-03-24 10:04:41 +01:00
enricoturri1966
a1ec38a7fb
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_bug_fixes
2020-03-24 08:08:12 +01:00
YuSanka
5215b2ecb2
Fix of #3889
2020-03-23 22:47:35 +01:00
enricoturri1966
4c1d867ba0
#3897 - Small optimisation in GCodePreviewData::RangeBase::get_color_at (thanks to rongith)
2020-03-23 16:12:52 +01:00
enricoturri1966
c480041487
Close undo/redo windows when an item in the list is selected
2020-03-23 16:00:56 +01:00
enricoturri1966
b8c4369c4f
ImGui upgraded to version 1.75 + fixes required by upgrade
2020-03-23 12:41:16 +01:00
bubnikv
d5bcddeed3
Revert "Deps libdir for libcurl on linux to land to the same directory"
...
This reverts commit 38d06d57a0
.
2020-03-21 11:55:51 +01:00
bubnikv
bf64f0099b
Bumped up the version number to final.
2020-03-21 11:28:15 +01:00
bubnikv
046f0dbfa2
Fixed a regression issue to PrusaSlicer 2.1.1
...
Custom printer with center of bed at 0,0 results in "toolpath outside print area" #3510
The G92 A0 B0 was incorrectly considered to be equal to just G92
to reset all axes.
2020-03-21 10:09:33 +01:00
bubnikv
1cbb822dd7
Enabled "clip multipart objects" by default, see discussion in
...
https://github.com/prusa3d/PrusaSlicer/issues/2803#issuecomment-524602137
2020-03-20 18:25:11 +01:00
bubnikv
92162d8fe5
Merge branch 'et_bug_fixes'
2020-03-20 17:19:46 +01:00
bubnikv
4938d5ab63
Fixed orientations of some 3D connexion axes when in the swapped YZ mode.
2020-03-20 17:19:20 +01:00
Enrico Turri
7c56cc9f22
Follow-up of f912fecad5
-> option to swap y/z axes extended to rotations
2020-03-20 16:13:08 +01:00
YuSanka
ec381c5854
Update of Settings in ObjectList from Tab::update() is suppressed, if Undo/Redo is not completed
2020-03-20 13:45:37 +01:00
bubnikv
a9fc39491e
Fix of weird double extrusions with multiple regions and their
...
parameters being changed between slicing runs.
2020-03-20 13:37:13 +01:00
Enrico Turri
f912fecad5
3DConnexion devices: added option to swap y/z translations
2020-03-20 13:09:42 +01:00
bubnikv
38d06d57a0
Deps libdir for libcurl on linux to land to the same directory
...
as openssl libraries.
Follow-up to 170650169c
2020-03-20 08:55:11 +01:00
bubnikv
170650169c
Deps libdir for openssl on linux
2020-03-19 21:33:03 +01:00
bubnikv
d5149275b0
Hopefully fixing missing OpenSSL dependency of libcurl on Linux 64bit.
2020-03-19 20:48:53 +01:00
bubnikv
b1fbc2c59c
Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer
2020-03-19 17:32:18 +01:00
bubnikv
20d33c19f4
Merge remote-tracking branch 'origin/et_gizmos_tooltip'
2020-03-19 17:31:25 +01:00