d67b5abcae
Merge branch 'tm_cert_store'
2020-03-25 11:07:06 +01:00
26f903d20e
Merge remote-tracking branch 'origin/et_bug_fixes'
2020-03-25 10:39:45 +01:00
418618cad9
ENABLE_AUTO_CONSTRAINED_CAMERA set as default
2020-03-25 10:24:52 +01:00
16e1cd5d19
ENABLE_THUMBNAIL_GENERATOR set as default
2020-03-25 10:15:02 +01:00
b573013761
Search for openssl cert store on app init, if the store is not present.
...
fixes #3851
2020-03-25 09:41:29 +01:00
c5ed253b1b
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_bug_fixes
2020-03-25 09:34:17 +01:00
ca652035bf
Fixed build when ENABLE_GIZMO_TOOLBAR_DRAGGING_FIX is disabled
2020-03-25 09:33:59 +01:00
208ffc85ad
Fixed build when ENABLE_CANVAS_TOOLTIP_USING_IMGUI is disabled
2020-03-25 09:22:37 +01:00
63f16adafb
ENABLE_MODIFIED_GIZMOBAR_MOUSE_EVENT_HANDLING merged into ENABLE_CANVAS_TOOLTIP_USING_IMGUI
2020-03-25 09:05:35 +01:00
92a815b06f
ENABLE_MODIFIED_TOOLBAR_MOUSE_EVENT_HANDLING merged into ENABLE_CANVAS_TOOLTIP_USING_IMGUI
2020-03-25 08:52:57 +01:00
70439b4cf8
ENABLE_CANVAS_DELAYED_TOOLTIP_USING_IMGUI merged into ENABLE_CANVAS_TOOLTIP_USING_IMGUI
2020-03-25 08:43:18 +01:00
92f49ef32c
ENABLE_CANVAS_CONSTRAINED_TOOLTIP_USING_IMGUI merged into ENABLE_CANVAS_TOOLTIP_USING_IMGUI
2020-03-25 08:31:15 +01:00
4218b8a36d
Merge branch 'dev'
2020-03-24 21:51:33 +01:00
ac501bdf8b
Merge branch 'master' into dev
2020-03-24 21:51:05 +01:00
5d61ea8391
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_bug_fixes
2020-03-24 12:26:48 +01:00
c8bffb7f2a
Refactoring of toolbars' tooltip generation
2020-03-24 12:26:30 +01:00
b82eaab2c3
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
59378503fc
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
43c31730b6
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
49ede04084
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_bug_fixes
2020-03-24 08:08:12 +01:00
164342854e
#3897 - Small optimisation in GCodePreviewData::RangeBase::get_color_at (thanks to rongith)
2020-03-23 16:12:52 +01:00
e43b796031
Close undo/redo windows when an item in the list is selected
2020-03-23 16:00:56 +01:00
d194d4ba35
ImGui upgraded to version 1.75 + fixes required by upgrade
2020-03-23 12:41:16 +01:00
135d099682
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
218ac6c821
Bumped up the version number to final.
2020-03-21 11:28:15 +01:00
b370cf0ed0
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
8c767b1b0d
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
fb6400c596
Merge branch 'et_bug_fixes'
2020-03-20 17:19:46 +01:00
8f392f9ec3
Fixed orientations of some 3D connexion axes when in the swapped YZ mode.
2020-03-20 17:19:20 +01:00
88b761c71c
Follow-up of f912fecad5 -> option to swap y/z axes extended to rotations
2020-03-20 16:13:08 +01:00
155ec1daec
Update of Settings in ObjectList from Tab::update() is suppressed, if Undo/Redo is not completed
2020-03-20 13:45:37 +01:00
7fa7d4f16b
Fix of weird double extrusions with multiple regions and their
...
parameters being changed between slicing runs.
2020-03-20 13:37:13 +01:00
de99fd4d71
3DConnexion devices: added option to swap y/z translations
2020-03-20 13:09:42 +01:00
62ac5788bc
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
8d7d8722bb
Deps libdir for openssl on linux
2020-03-19 21:33:03 +01:00
ef74ec6705
Hopefully fixing missing OpenSSL dependency of libcurl on Linux 64bit.
2020-03-19 20:48:53 +01:00
93848d8f37
Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer
2020-03-19 17:32:18 +01:00
6582efa9cd
Merge remote-tracking branch 'origin/et_gizmos_tooltip'
2020-03-19 17:31:25 +01:00
247b9bb38f
Fixed Command character on OSX in ImGUI
2020-03-19 16:10:16 +01:00
7e1189ce92
Fixed tooltip reappering after leaving imgui dialog
2020-03-19 15:12:18 +01:00
ad3a504a3f
Merge branch 'et_gizmos_tooltip' of https://github.com/prusa3d/PrusaSlicer into et_gizmos_tooltip
2020-03-19 14:06:49 +01:00
a6d47d15fd
Modified mouse events handling for gizmobar
...
The gizmobar was consuming the mouse up event preventing the gizmos to update their tooltip
The gizmobar was also consuming the mouse dragging event transforming a gizmo manipulation into a scene rotation
2020-03-19 14:05:49 +01:00
c31c9bd32b
ImGUI characters for OSX keyboard keyboard modifiers are only contained
...
in the CJK fonts, not in the regular fonts. Load them from CJK fonts
even for non CJK languages.
2020-03-19 13:32:34 +01:00
2ba86fcc2b
Fixing spurious deselection of objects when switching from 3d path
...
preview to plater using the bottom tool bar & left mouse click.
This is result of the recent commits refactoring the mouse focus
over toolbars handling. 739d8131ab
2020-03-19 12:39:25 +01:00
df8360fe34
Added readme.md file for imgui
2020-03-19 10:43:48 +01:00
a56d48b277
Adding special OS characters for keyboard shortcuts to ImGUI font map.
2020-03-19 09:52:24 +01:00
cf53ca27cb
Modified mouse events handling for toolbar
...
The toolbar was consuming the mouse up event preventing the gizmos to update their tooltip
2020-03-18 16:59:30 +01:00
90df0aa04a
Merge branch 'et_gizmos_tooltip' of https://github.com/Prusa3d/PrusaSlicer into et_gizmos_tooltip
2020-03-18 14:28:54 +01:00
262cc4aea9
Hiding the tooltip when the window gets deactivated and reactivated.
2020-03-18 14:28:43 +01:00
5260158e92
Merge branch 'et_gizmos_tooltip' of https://github.com/prusa3d/PrusaSlicer into et_gizmos_tooltip
2020-03-18 14:27:02 +01:00