Filip Sykala - NTB T15p
|
52460f0c89
|
Fix truncation text by imgui width
|
2022-11-23 13:35:59 +01:00 |
|
Filip Sykala - NTB T15p
|
c77f8373bd
|
Merge branch 'master' into fs_emboss
# Conflicts:
# src/libslic3r/Technologies.hpp
# src/slic3r/GUI/GLCanvas3D.cpp
# src/slic3r/GUI/Gizmos/GLGizmosManager.cpp
# src/slic3r/GUI/Plater.cpp
# src/slic3r/GUI/Selection.hpp
|
2022-11-07 15:44:33 +01:00 |
|
enricoturri1966
|
da5a9277fa
|
Tech ENABLE_MEASURE_GIZMO set as default
|
2022-11-02 08:50:12 +01:00 |
|
enricoturri1966
|
2c9d047520
|
Fixed conflicts after merge with master
|
2022-10-31 14:59:41 +01:00 |
|
YuSanka
|
fbcdd4191b
|
Merge remote-tracking branch 'PRIVATE/master' into ys_emboss_with_master
|
2022-10-27 13:09:55 +02:00 |
|
enricoturri1966
|
908634d5b7
|
Measuring - Gizmo measure - Disable background fadeout animation when showing imgui modal dialog to edit distance
|
2022-10-12 09:46:11 +02:00 |
|
enricoturri1966
|
395cab88ba
|
Measuring: prototype for uniformly scale a volume by editing the value of the shown distance
Fixed conflicts while rebasing to master
|
2022-10-12 09:45:53 +02:00 |
|
enricoturri1966
|
1f9d42b14f
|
Measuring - GLGizmoMeasure - Added option to copy to clipboard the result of measurement
Fixed conflicts while rebasing to master
|
2022-10-12 09:43:02 +02:00 |
|
YuSanka
|
b4f38883a8
|
Merge remote-tracking branch 'PRIVATE/master' into ys_cut
|
2022-10-03 11:30:49 +02:00 |
|
Filip Sykala - NTB T15p
|
0e3b7cae12
|
Merge branch 'master' into fs_emboss
# Conflicts:
# src/libslic3r/Technologies.hpp
# src/slic3r/GUI/GLCanvas3D.cpp
|
2022-09-29 18:47:21 +02:00 |
|
enricoturri1966
|
3513b800a0
|
Tech ENABLE_PREVIEW_LAYOUT set as default
|
2022-09-29 14:23:41 +02:00 |
|
enricoturri1966
|
524e55edd9
|
Tech ENABLE_LEGEND_TOOLBAR_ICONS set as default
|
2022-09-29 12:19:20 +02:00 |
|
Filip Sykala - NTB T15p
|
3bd557b177
|
Escape ## in name of style in imgui visualization(issue 61)
|
2022-09-21 15:15:32 +02:00 |
|
YuSanka
|
e676d40df5
|
Cut WIP: Beatifications for input window dialog
+ Fixed rendering of the connectors, when cut plane is rotated for 270 deg by Y axis
|
2022-09-21 13:40:24 +02:00 |
|
YuSanka
|
a30a254724
|
After merge fix
|
2022-09-19 11:14:29 +02:00 |
|
Filip Sykala - NTB T15p
|
ed6a1b18f3
|
Merge branch 'master' into fs_emboss
# Conflicts:
# src/slic3r/GUI/GLCanvas3D.cpp
# src/slic3r/GUI/Selection.cpp
|
2022-09-14 11:28:36 +02:00 |
|
YuSanka
|
484eae7a1c
|
Merge remote-tracking branch 'PRIVATE/master' into ys_cut
|
2022-09-08 13:32:14 +02:00 |
|
YuSanka
|
2ca3e47f92
|
"legend_*"-icons from font_icons to font_icons_large to avoid blurring
|
2022-09-06 11:16:05 +02:00 |
|
Filip Sykala - NTB T15p
|
c549c6afbe
|
Merge branch 'master' into fs_emboss
# Conflicts:
# src/libslic3r/CMakeLists.txt
# src/libslic3r/Format/3mf.cpp
# src/libslic3r/Model.hpp
# src/libslic3r/Point.hpp
# src/libslic3r/Technologies.hpp
# src/slic3r/CMakeLists.txt
# src/slic3r/GUI/GLCanvas3D.cpp
# src/slic3r/GUI/GLSelectionRectangle.cpp
# src/slic3r/GUI/GUI_Factories.hpp
# src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
# src/slic3r/GUI/Gizmos/GLGizmoBase.hpp
# src/slic3r/GUI/Gizmos/GLGizmoMove.cpp
# src/slic3r/GUI/Gizmos/GLGizmoMove.hpp
# src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
# src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp
# src/slic3r/GUI/MeshUtils.cpp
# src/slic3r/GUI/MeshUtils.hpp
# src/slic3r/GUI/ObjectDataViewModel.cpp
# src/slic3r/GUI/ObjectDataViewModel.hpp
# src/slic3r/GUI/Selection.cpp
|
2022-08-31 15:22:10 +02:00 |
|
enricoturri1966
|
2b996158d2
|
Merge branch 'master' of https://github.com/Prusa-Development/PrusaSlicerPrivate into et_opengl_es_rebase
|
2022-08-18 12:51:55 +02:00 |
|
Vojtech Bubnik
|
a93620621d
|
Performance improvement of GCodeProcessor:
Replaced std::string with std::string_view for constant parameters
Replaced boost:istarts_with() with boost::starts_with()
|
2022-08-18 10:33:26 +02:00 |
|
YuSanka
|
2ac3861b2a
|
Merge remote-tracking branch 'PRIVATE/master' into ys_cut
|
2022-08-08 10:57:38 +02:00 |
|
enricoturri1966
|
f9c6e8eb7a
|
Added processing of mouse double click in ImGuiWrapper::update_mouse_data()
|
2022-07-29 12:06:52 +02:00 |
|
tamasmeszaros
|
9a7e024f78
|
Update wxWidgets to 3.1.7
added handling for nanosvg with cmake
|
2022-07-29 11:21:54 +02:00 |
|
enricoturri1966
|
5cf71bb094
|
Tech ENABLE_SHOW_TOOLPATHS_COG set as default
|
2022-07-27 15:52:40 +02:00 |
|
YuSanka
|
27f7a8da0f
|
Cut WIP: Added shortcuts for "Edit connectors" ImGuiDialog
+ Added processing for the Ctrl+A ("Select All connectors")
|
2022-07-27 13:53:54 +02:00 |
|
enricoturri1966
|
bb36f0df0c
|
Tech ENABLE_OPENGL_ES - 1st installment
|
2022-07-21 15:43:11 +02:00 |
|
enricoturri1966
|
22b634ca1d
|
Fixed crash at startup on Mac OS
|
2022-07-13 08:56:00 +02:00 |
|
YuSanka
|
89a7f6bdb1
|
Merge remote-tracking branch 'origin/ys_wx317_master' into ys_cut
|
2022-06-29 11:44:11 +02:00 |
|
tamasmeszaros
|
76ea74c289
|
Update wxWidgets to 3.1.7
added handling for nanosvg with cmake
|
2022-06-27 16:40:01 +02:00 |
|
enricoturri1966
|
41541287a1
|
Tech ENABLE_GL_IMGUI_SHADERS merged into ENABLE_LEGACY_OPENGL_REMOVAL
Fixed conflicts during rebase with master
|
2022-05-26 11:08:24 +02:00 |
|
enricoturri1966
|
1a1cf108fc
|
Tech ENABLE_GL_SHADERS_ATTRIBUTES merged into ENABLE_LEGACY_OPENGL_REMOVAL
Fixed conflicts during rebase with master
|
2022-05-26 10:50:32 +02:00 |
|
enricoturri1966
|
eb9af502c8
|
Use OpenGLManager::are_compressed_textures_supported() where needed
|
2022-05-26 08:11:32 +02:00 |
|
enricoturri1966
|
389dc36053
|
Tech ENABLE_GL_CORE_PROFILE - Use OpenGL core profile context - 1st installment
Fixed conflicts during rebase with master
|
2022-05-25 15:29:10 +02:00 |
|
Lukas Matena
|
c695dcc141
|
Cut gizmo: UI simplification and changes
|
2022-05-19 09:36:14 +02:00 |
|
Filip Sykala
|
3e9778b46b
|
Merge branch 'et_world_coordinates' into fs_emboss
|
2022-05-02 10:11:47 +02:00 |
|
YuSanka
|
73469ffa21
|
Merge remote-tracking branch 'origin/master' into ys_cut
|
2022-04-28 13:25:00 +02:00 |
|
Lukas Matena
|
09fe421fe8
|
Merge branch 'stable' (no conflicts fixed)
|
2022-04-27 22:24:13 +02:00 |
|
YuSanka
|
91a1cd30a0
|
Merge remote-tracking branch 'origin/master' into ys_cut
|
2022-04-14 10:04:45 +02:00 |
|
Lukas Matena
|
6288ec4bf0
|
Fix of #8171: Two Chinese characters added into the range to load for ImGui
|
2022-04-11 12:10:16 +02:00 |
|
Filip Sykala
|
331d4d4557
|
Show user warning about unknown symbols by font inside of input text
Fix correct selection of collection ascent, descent, ...
Remove boost log from emboss --> not work properly on thread
|
2022-04-07 16:34:14 +02:00 |
|
Filip Sykala
|
65909c74c4
|
Merge branch 'master' into fs_emboss
# Conflicts:
# src/libslic3r/Technologies.hpp
|
2022-03-22 12:52:16 +01:00 |
|
enricoturri1966
|
9be3d926c5
|
Tech ENABLE_LEGACY_OPENGL_REMOVAL - A few refactorings and fixes
|
2022-03-22 08:18:39 +01:00 |
|
Filip Sykala
|
fec171d14e
|
Merge branch 'master' into fs_emboss
# Conflicts:
# src/libslic3r/Technologies.hpp
|
2022-03-21 21:40:37 +01:00 |
|
enricoturri1966
|
4964d6ecd5
|
ENABLE_GL_IMGUI_SHADERS - Fixes in ImGuiWrapper::render_draw_data()
|
2022-03-21 11:31:32 +01:00 |
|
YuSanka
|
37c32cb93f
|
Merge remote-tracking branch 'origin/master' into ys_cut
|
2022-03-14 14:14:08 +01:00 |
|
enricoturri1966
|
2ab8469cb6
|
Refactoring in ImGuiWrapper::render_draw_data()
|
2022-03-14 13:34:08 +01:00 |
|
enricoturri1966
|
5586fd92f2
|
Follow-up of d0d89a4d5b - Fixed warnings
|
2022-03-14 09:50:25 +01:00 |
|
enricoturri1966
|
d0d89a4d5b
|
Tech ENABLE_GL_IMGUI_SHADERS - Render imgui using shaders
|
2022-03-14 09:04:44 +01:00 |
|
Filip Sykala
|
70b94d592b
|
Merge branch 'et_world_coordinates' into fs_emboss_with_CGAL_5_4
# Conflicts:
# src/libslic3r/Technologies.hpp
# src/slic3r/GUI/Gizmos/GLGizmoBase.hpp
# src/slic3r/GUI/Gizmos/GLGizmosManager.cpp
|
2022-03-09 11:06:58 +01:00 |
|