Commit Graph

988 Commits

Author SHA1 Message Date
YuSanka
00a6c43c9a Activated "collapsed sidebar" button 2020-03-29 20:52:14 +02:00
YuSanka
0b372d4fd5 Merge remote-tracking branch 'origin/master' into ys_search 2020-03-29 20:21:00 +02:00
YuSanka
8b0ae2ce18 Implemented Search on Plater, usint imGui 2020-03-28 19:39:24 +01:00
Lukas Matena
563200dd18 Fix of #3916 (macOS crash when generating WarningTexture)
Likely the same cause as #3371, hopefully the same solution as presented in 4f1f507
2020-03-25 23:55:25 +01:00
bubnikv
7f866ee9e8 Merge remote-tracking branch 'remotes/origin/et_slope_shader' 2020-03-25 16:09:04 +01:00
enricoturri1966
11acd7d7e4 Follow-up of bfbcd45209 -> completed fix 2020-03-25 15:30:25 +01:00
enricoturri1966
2fe5dbc5bb Fixed build on Mac 2020-03-25 15:15:20 +01:00
enricoturri1966
ea0b2c2be4 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_canvas_manager 2020-03-25 14:54:10 +01:00
enricoturri1966
78a0893d6a Fixed conflicts after merge with master 2020-03-25 14:41:47 +01:00
bubnikv
7769f9740b 64bit coord_t
Vec3i as a vertex index to TriangleMesh constructor
2020-03-25 14:35:41 +01:00
enricoturri1966
418618cad9 ENABLE_AUTO_CONSTRAINED_CAMERA set as default 2020-03-25 10:24:52 +01:00
enricoturri1966
16e1cd5d19 ENABLE_THUMBNAIL_GENERATOR set as default 2020-03-25 10:15:02 +01:00
enricoturri1966
c5ed253b1b Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_bug_fixes 2020-03-25 09:34:17 +01:00
enricoturri1966
208ffc85ad Fixed build when ENABLE_CANVAS_TOOLTIP_USING_IMGUI is disabled 2020-03-25 09:22:37 +01:00
enricoturri1966
70439b4cf8 ENABLE_CANVAS_DELAYED_TOOLTIP_USING_IMGUI merged into ENABLE_CANVAS_TOOLTIP_USING_IMGUI 2020-03-25 08:43:18 +01:00
enricoturri1966
92f49ef32c ENABLE_CANVAS_CONSTRAINED_TOOLTIP_USING_IMGUI merged into ENABLE_CANVAS_TOOLTIP_USING_IMGUI 2020-03-25 08:31:15 +01:00
Lukas Matena
ac501bdf8b Merge branch 'master' into dev 2020-03-24 21:51:05 +01:00
enricoturri1966
c8bffb7f2a Refactoring of toolbars' tooltip generation 2020-03-24 12:26:30 +01:00
enricoturri1966
e43b796031 Close undo/redo windows when an item in the list is selected 2020-03-23 16:00:56 +01:00
enricoturri1966
d194d4ba35 ImGui upgraded to version 1.75 + fixes required by upgrade 2020-03-23 12:41:16 +01:00
enricoturri1966
dde92b22c7 Fixed conflicts after merge with master 2020-03-20 10:55:37 +01:00
enricoturri1966
7e1189ce92 Fixed tooltip reappering after leaving imgui dialog 2020-03-19 15:12:18 +01:00
bubnikv
90df0aa04a Merge branch 'et_gizmos_tooltip' of https://github.com/Prusa3d/PrusaSlicer into et_gizmos_tooltip 2020-03-18 14:28:54 +01:00
bubnikv
262cc4aea9 Hiding the tooltip when the window gets deactivated and reactivated. 2020-03-18 14:28:43 +01:00
enricoturri1966
5260158e92 Merge branch 'et_gizmos_tooltip' of https://github.com/prusa3d/PrusaSlicer into et_gizmos_tooltip 2020-03-18 14:27:02 +01:00
enricoturri1966
5cbafd9fcc Canvas tooltip constrained inside canvas 2020-03-18 14:13:50 +01:00
Lukas Matena
8f219e8e81 Tooltips are rendered unformatted so percent signs in them do not break rendering 2020-03-18 13:50:08 +01:00
enricoturri1966
bbd5c00ea2 Merge branch 'et_gizmos_tooltip' of https://github.com/prusa3d/PrusaSlicer into et_gizmos_tooltip 2020-03-18 13:36:01 +01:00
enricoturri1966
5e58272af1 Refactoring 2020-03-18 13:35:46 +01:00
bubnikv
9dedecbecd Suppress tooltips when the mouse is processed by an ImGUI dialog. 2020-03-18 13:23:07 +01:00
enricoturri1966
6d9ec8f7a1 Fixed interference between tooltips and imgui dialogs 2020-03-18 10:46:46 +01:00
enricoturri1966
ce896e7ca7 Attempt to fix build on Linux 2020-03-17 15:47:49 +01:00
enricoturri1966
a4c476c97a Initial delay for ImGUI-based tooltip 2020-03-17 14:35:56 +01:00
enricoturri1966
57526d5fd3 Canvas' tooltip using ImGUI 2020-03-17 13:01:38 +01:00
enricoturri1966
0700dc5cff Attempt to fix gizmos tooltip on Mac 2020-03-17 11:02:32 +01:00
enricoturri1966
0eb46d09b9 Fixed gizmos' tooltips 2020-03-16 12:45:39 +01:00
enricoturri1966
abfbcd5d17 Fixed conflicts after merge with master 2020-03-16 08:09:52 +01:00
bubnikv
32f196549c Documented the previous merge. 2020-03-14 07:14:45 +01:00
bubnikv
5e8d384a43 Merge remote-tracking branch 'remotes/origin/et_free_camera' 2020-03-14 07:02:08 +01:00
bubnikv
2bd55b7d1d Fixed crash in skirt preview for multiple objects with different height
and full size skirt used as a draft shield.
2020-03-13 15:57:07 +01:00
enricoturri1966
0647e9c850 New tech ENABLE_SLOPE_RENDERING - 1st installment of rendering objects colored by facets slope 2020-03-13 15:09:07 +01:00
Enrico Turri
3c2adebc4f #3816 - Use constrained camera when navigating the 3D scene with regular mouse, if free camera is not selected 2020-03-12 09:29:24 +01:00
Enrico Turri
39aa5102e7 Fixed initial position of top toolbars 2020-03-11 14:15:36 +01:00
Enrico Turri
9a7d6507b9 Fixed conflict after merge with master 2020-03-11 13:16:15 +01:00
Enrico Turri
5ad274fd62 Fix of crash and/or assert when changing language 2020-03-11 12:19:52 +01:00
Enrico Turri
55306185b7 Fixed conflicts after merge with master 2020-03-09 16:03:15 +01:00
Enrico Turri
0739909934 #3782 - World Z axis always vertical for non-free camera 2020-03-09 15:23:29 +01:00
Enrico Turri
4500fe7d3d Fixed conflicts after merge with master 2020-03-05 10:41:11 +01:00
Enrico Turri
8c731efd53 Removed temporary debug output and clean up 2020-03-05 10:14:12 +01:00
Enrico Turri
467315f25c Added temporary debug output to investigate crash on MAC when closing using Command+Q 2020-03-04 14:19:15 +01:00