public_mirrors/OrcaSlicer-bambulab
1
0
Fork 0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-09-14 18:36:31 +00:00
Code Issues Activity
13,239 Commits 4 Branches 1 Tag
5c7b0948bcc76da81112fbded930601102c421bc
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
enricoturri1966 5c7b0948bc Fixed conflict after merge with master 2020-06-19 11:49:59 +02:00
enricoturri1966 e782d34ec8 ENABLE_LAYOUT_NO_RESTART -> Fixed font scaling when switching to non modal setting dialog layout when building against wxWidgets 3.1.3 2020-06-19 11:18:48 +02:00
enricoturri1966 9608103d58 ENABLE_LAYOUT_NO_RESTART -> Fixed font scaling when switching to/from non modal setting dialog layout when building against wxWidgets prior to 3.1.3 2020-06-19 11:04:08 +02:00
enricoturri1966 87c9163a5e Merge remote-tracking branch 'origin/et_layout' 2020-06-17 12:14:47 +02:00
enricoturri1966 f6b5c64642 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_layout 2020-06-17 09:34:56 +02:00
enricoturri1966 3383650c00 ENABLE_LAYOUT_NO_RESTART -> Fixed MainFrame::update_layout() for Linux build 2020-06-17 09:34:33 +02:00
enricoturri1966 cfb552d496 ENABLE_LAYOUT_NO_RESTART -> Another refactoring of MainFrame::update_layout() 2020-06-16 15:16:28 +02:00
enricoturri1966 9d6448480e Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_layout 2020-06-16 08:16:33 +02:00
enricoturri1966 af5c3583e8 Follow-up of dcf68aefd7 - disable old from builds against wxWidgets 3.1.3 2020-06-16 08:15:36 +02:00
enricoturri1966 3982d8b51e Fixed conflict after merge with master 2020-06-15 16:55:14 +02:00
enricoturri1966 dcf68aefd7 Enable built-in DPI changed event handler when building against wxWidgets 3.1.3 2020-06-15 16:20:34 +02:00
enricoturri1966 b9774608e8 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_layout 2020-06-15 10:44:13 +02:00
enricoturri1966 76d9f0f509 Removed unnecessary line 2020-06-15 09:04:21 +02:00
enricoturri1966 04514f009e ENABLE_LAYOUT_NO_RESTART -> Refactoring of MainFrame::update_layout() 2020-06-12 12:35:17 +02:00
enricoturri1966 ab60499298 Fixed conflicts after merge with master 2020-06-12 10:35:18 +02:00
enricoturri1966 aa14b42638 GCodeProcessor -> Added processing of gcode lines G0 2020-06-12 09:01:20 +02:00
enricoturri1966 42a8a4aa77 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_layout 2020-06-12 07:32:06 +02:00
enricoturri1966 af4fb2d174 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_layout 2020-06-11 16:11:19 +02:00
enricoturri1966 9566a05d8f Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-06-11 16:09:22 +02:00
enricoturri1966 a1319cc8f7 Fixed restoring of application starting position 2020-06-11 16:07:28 +02:00
enricoturri1966 8c998e5f08 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_layout 2020-06-11 14:04:08 +02:00
enricoturri1966 920d9677da Added new tech ENABLE_LAYOUT_NO_RESTART -> Enable changing application layout without the need to restart it 2020-06-11 14:02:59 +02:00
enricoturri1966 0a7e2aa8da Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-06-10 09:00:53 +02:00
enricoturri1966 3b061fb4be Fixed serialization of position and size of the non modal settings dialog 2020-06-10 09:00:17 +02:00
enricoturri1966 4c51a258ef GCodeViewer -> Fixed bottom panel not disappearing when switching to gcode viewer from preview 2020-06-09 12:44:22 +02:00
enricoturri1966 48cc358b72 Fixed build on Mac 2020-06-09 11:44:25 +02:00
enricoturri1966 345c01c54f ENABLE_GCODE_VIEWER -> Updated keyboard shortcuts dialog 2020-06-09 08:37:24 +02:00
enricoturri1966 d358fe85fa GCodeViewer -> Show tool marker position when enabled 2020-06-09 08:12:51 +02:00
enricoturri1966 9f94f89808 ENABLE_GCODE_VIEWER_AS_STATE -> Smoother transition between states 2020-06-08 14:37:40 +02:00
enricoturri1966 ea0e9a5873 Follow-up of 70478f226f -> Fixed printbed for regular gcode preview 2020-06-08 13:17:07 +02:00
enricoturri1966 70478f226f ENABLE_GCODE_VIEWER_AS_STATE -> Use default printbed in gcode viewer 2020-06-08 12:27:32 +02:00
enricoturri1966 ca17948f87 ENABLE_GCODE_VIEWER_AS_STATE -> Load gcode from file and process it 2020-06-08 09:12:20 +02:00
enricoturri1966 bd5a5bf78f Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-06-05 16:51:11 +02:00
enricoturri1966 70a6fb0e20 Added new tech ENABLE_GCODE_VIEWER_AS_STATE -> GCodeViewer as a new application state (WIP) + fix of conflicts after merge with master 2020-06-05 16:50:17 +02:00
enricoturri1966 13a2e8e64d Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-06-05 14:25:29 +02:00
enricoturri1966 2b19f471bd Follow-up of 4f63095d9a -> Collapse toolbar disabled by default 2020-06-05 14:25:15 +02:00
enricoturri1966 4f63095d9a Collapse toolbar moved from GLCanvas3D to Plater::priv 2020-06-05 12:33:09 +02:00
enricoturri1966 ad7e7ae1cd Added tech ENABLE_OPENGL_ERROR_LOGGING -> log opengl errors when SLIC3R_LOGLEVEL=5 2020-06-04 14:48:52 +02:00
enricoturri1966 c3d643ead3 Fixed conflicts after merge with master 2020-06-04 13:57:39 +02:00
enricoturri1966 06a8bfa588 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-06-02 10:03:00 +02:00
enricoturri1966 aa92cbf051 New tech ENABLE_SMOOTH_NORMALS (disabled) -> Added two experimental functions to smooth normals using libigl (none of them working properly in detecting edges) when calling GLIndexedVertexArray::load_mesh_full_shading() 2020-06-02 10:02:50 +02:00
enricoturri1966 7b33e780a2 Follow-up of 707268d41d -> Fixed typo 2020-06-01 09:11:16 +02:00
enricoturri1966 707268d41d ENABLE_GCODE_VIEWER -> Improvements in shaders for options 2020-06-01 08:55:44 +02:00
enricoturri1966 71db69ef41 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-29 12:29:24 +02:00
enricoturri1966 dcec684cc7 ENABLE_GCODE_VIEWER -> Refactoring of shaders for options 2020-05-29 12:29:04 +02:00
enricoturri1966 e9d57c932a Fixed conflicts after merge with master 2020-05-28 15:50:21 +02:00
enricoturri1966 0599dc4df7 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-05-28 15:27:39 +02:00
enricoturri1966 c63e03c367 1st installment of tech ENABLE_ENVIRONMENT_MAP 2020-05-28 15:27:29 +02:00
enricoturri1966 96db6aaadb Attempt to fix rambling crash on Mac Asan 2020-05-28 11:14:56 +02:00
enricoturri1966 2904ee6e1a Added missing include 2020-05-28 09:38:08 +02:00
enricoturri1966 9c8892c869 GCodeViewer -> Shaders code cleanup 2020-05-28 09:23:30 +02:00
enricoturri1966 edaabf3fbd GCodeViewer -> Experimental hexagonal icons for toolpaths in legend 2020-05-28 07:52:11 +02:00
enricoturri1966 0cb4a5ce56 GCodeViewer -> Improved depth detection in shader for options 2020-05-28 07:06:54 +02:00
enricoturri1966 0e018e6690 Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-27 16:31:26 +02:00
enricoturri1966 abd7d74800 GCodeViewer -> Small refactoring 2020-05-27 16:31:02 +02:00
enricoturri1966 35190936a3 GCodeViewer -> Newer version of shader for options 2020-05-27 16:19:40 +02:00
enricoturri1966 af3765c04c Follow up of e77fa3512a -> changed logic for DoubleSlider::Control accelerators 2020-05-27 16:14:14 +02:00
enricoturri1966 edb643e178 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-27 16:03:56 +02:00
enricoturri1966 e77fa3512a DoubleSlider::Control -> Shift and Ctrl used as accelerators for moving thumbs with arrows key and mouse wheel 2020-05-27 16:03:40 +02:00
enricoturri1966 100484dabe Added missing include 2020-05-27 15:28:24 +02:00
enricoturri1966 448d92df68 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-27 14:29:54 +02:00
enricoturri1966 a0acf24ab8 DoubleSlider::Control -> Fixed crash when pressing numpad [+] and [-] keys while the horizontal slider has focus 2020-05-27 14:29:27 +02:00
enricoturri1966 94a4689b00 DoubleSlider::Control -> Change text position at the edges of horizontal slider 2020-05-27 11:50:29 +02:00
enricoturri1966 908650630b Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-27 10:45:19 +02:00
enricoturri1966 2eb4b2caed Fixed conflicts after merge with master 2020-05-27 10:32:02 +02:00
enricoturri1966 aa04f0e555 ENABLE_GCODE_VIEWER -> Completed implementation of new GLModel class 2020-05-27 08:06:02 +02:00
enricoturri1966 8f91b4f4f4 DoubleSlider::Control -> Tweaks to text position for horizontal case 2020-05-26 08:34:19 +02:00
enricoturri1966 1d317489fd GCodeViewer -> Temporary ImGui dialog for editing shaders parameters 2020-05-26 08:16:08 +02:00
enricoturri1966 13098938ac Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-25 13:55:23 +02:00
Enrico Turri 2759380000 DoubleSlider:Control platform dependent background color 2020-05-25 13:53:41 +02:00
Enrico Turri 5b7cb8f5a9 Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-25 12:08:26 +02:00
enricoturri1966 a63e5b352e ENABLE_GCODE_VIEWER -> Reduced vertical size of horizontal slider 2020-05-25 12:08:09 +02:00
Enrico Turri 94b66fe987 Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-25 12:01:10 +02:00
enricoturri1966 6810550a6c DoubleSlider::Control background color 2020-05-25 11:59:12 +02:00
Enrico Turri 06b950c8d7 Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-25 11:17:07 +02:00
enricoturri1966 1af798dbd7 DoubleSlider::Control thumb text rendered closer to the slider 2020-05-25 11:16:40 +02:00
enricoturri1966 1c826c063b GCodeViewer refactoring and GLShaderProgram upgrade 2020-05-25 10:48:53 +02:00
enricoturri1966 ed252f1741 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-25 07:07:49 +02:00
Enrico Turri 1b0d1fd143 Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-22 16:50:26 +02:00
enricoturri1966 43b78b630c GCodeViewer -> Enhanced legend icons 2020-05-22 16:37:53 +02:00
enricoturri1966 314995fa0b ENABLE_SHADERS_MANAGER set as default 2020-05-22 16:08:02 +02:00
Enrico Turri 627df86802 Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-22 13:32:30 +02:00
enricoturri1966 4d05ec0856 GCodeViewer -> New shaders for options 2020-05-22 13:21:43 +02:00
Enrico Turri e3cb969474 Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-22 13:15:55 +02:00
enricoturri1966 80c2f107c1 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-22 12:12:56 +02:00
enricoturri1966 83ea38c2f3 GCodeViewer -> Refactoring of options coloring + options added to legend 2020-05-22 11:52:07 +02:00
enricoturri1966 6e279cbec2 GCodeViewer -> Refactoring of sequential view marker positioning 2020-05-22 10:43:59 +02:00
enricoturri1966 f345e58358 Fix in ENABLE_CAMERA_STATISTICS 2020-05-22 09:51:57 +02:00
enricoturri1966 082a30a5db ENABLE_SHADERS_MANAGER -> Added method GLShaderProgram::set_uniform(const char* name, double value) 2020-05-22 09:49:42 +02:00
enricoturri1966 df010a1d4e Added methods GUI_App::is_gl_version_greater_or_equal_to() and GUI_App::is_glsl_version_greater_or_equal_to() 2020-05-22 09:45:31 +02:00
Enrico Turri 78cbba4ce1 Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-21 14:45:12 +02:00
enricoturri1966 8a9dbb3414 ENABLE_SHADERS_MANAGER -> Fixed crash while rendering selection hints 2020-05-21 13:19:07 +02:00
enricoturri1966 4eb1b9432f Fixed selection of thumbs into gcode sequential view slider 2020-05-21 13:07:55 +02:00
enricoturri1966 0d579f5467 ENABLE_SHADERS_MANAGER -> Small refactoring 2020-05-21 12:13:24 +02:00
enricoturri1966 dd424b6bcf Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-21 11:38:22 +02:00
enricoturri1966 4f5aefc919 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-21 10:36:54 +02:00
Enrico Turri a9e2444d29 Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-21 10:32:29 +02:00
enricoturri1966 3bbe2ef960 Fixed typo 2020-05-21 10:27:41 +02:00
Enrico Turri afc378f317 Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-21 10:19:37 +02:00
enricoturri1966 cae84d2857 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-21 10:15:24 +02:00