iGoX/OrcaSlicer-bambulab
1
0
Fork 0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-09-14 14:48:09 +02:00
Code Issues Packages Projects Releases Wiki Activity
12,643 Commits 4 Branches 1 Tag
f1ccd38258f63d7f9a04296cab8309f935de9951
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Enrico Turri f1ccd38258 Fixed shaders on Intel Cards - not allowed use of 'active' word 2020-03-31 12:51:50 +02:00
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
enricoturri1966 ed0f3b3406 Small refactoring 2020-03-25 13:55:17 +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
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
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
enricoturri1966 a1ec38a7fb Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_bug_fixes 2020-03-24 08:08:12 +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
Enrico Turri 7c56cc9f22 Follow-up of f912fecad5 -> option to swap y/z axes extended to rotations 2020-03-20 16:13:08 +01:00
Enrico Turri f912fecad5 3DConnexion devices: added option to swap y/z translations 2020-03-20 13:09:42 +01:00
enricoturri1966 5b24a0fb91 Fixed conflicts after merge with master 2020-03-20 10:55:37 +01:00
enricoturri1966 cd5154b8e1 Fixed tooltip reappering after leaving imgui dialog 2020-03-19 15:12:18 +01:00
enricoturri1966 5b3ca3e4b7 Merge branch 'et_gizmos_tooltip' of https://github.com/prusa3d/PrusaSlicer into et_gizmos_tooltip 2020-03-19 14:06:49 +01:00
enricoturri1966 2501cf64c0 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
Enrico Turri 5a4e80fdb2 Added readme.md file for imgui 2020-03-19 10:43:48 +01:00
enricoturri1966 739d8131ab 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
enricoturri1966 9da16aeaa9 Merge branch 'et_gizmos_tooltip' of https://github.com/prusa3d/PrusaSlicer into et_gizmos_tooltip 2020-03-18 14:27:02 +01:00
enricoturri1966 61f3b53ef8 Fixed conflicts after merge with master 2020-03-18 14:26:44 +01:00
enricoturri1966 cd55b235ad Canvas tooltip constrained inside canvas 2020-03-18 14:13:50 +01:00
enricoturri1966 c5552843ab Merge branch 'et_gizmos_tooltip' of https://github.com/prusa3d/PrusaSlicer into et_gizmos_tooltip 2020-03-18 13:36:01 +01:00
enricoturri1966 8a824bb8c2 Refactoring 2020-03-18 13:35:46 +01:00
enricoturri1966 1c1a6b933a Fixed interference between tooltips and imgui dialogs 2020-03-18 10:46:46 +01:00
enricoturri1966 f4aa9c5b0e #3858 - Added missing reset for fan speed visualization 2020-03-18 08:10:05 +01:00
enricoturri1966 a85a2b2e2a Attempt to fix build on Linux 2020-03-17 15:47:49 +01:00
enricoturri1966 166389e6a8 Initial delay for ImGUI-based tooltip 2020-03-17 14:35:56 +01:00
enricoturri1966 7a1fa3d847 Canvas' tooltip using ImGUI 2020-03-17 13:01:38 +01:00
enricoturri1966 12c0170e3c Attempt to fix gizmos tooltip on Mac 2020-03-17 11:02:32 +01:00
enricoturri1966 df6170b9bd Fixed gizmos' tooltips 2020-03-17 09:41:54 +01:00
enricoturri1966 2ab8a474c2 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_slope_shader 2020-03-17 07:59:10 +01:00
enricoturri1966 a0ed240af1 Generate gizmos' tooltip on demand 2020-03-16 16:37:22 +01:00
enricoturri1966 505181ddfd Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_slope_shader 2020-03-16 14:19:30 +01:00
enricoturri1966 abcd01d64a ENABLE_SLOPE_RENDERING - Do not apply slope shading to modifiers and small refactoring 2020-03-16 14:17:19 +01:00
enricoturri1966 19d93b3b01 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-03-16 13:35:15 +01:00
enricoturri1966 350a85cf43 #3034 - Keyboard shortcuts for 'Delete selected' and 'Delete all' commands enabled also in Preview 2020-03-16 13:34:53 +01:00
enricoturri1966 ffe404fc5b Fixed gizmos' tooltips 2020-03-16 12:45:39 +01:00
enricoturri1966 5378b18f18 ENABLE_SLOPE_RENDERING - Fixed fragment shader when the thresholds are identical 2020-03-16 08:35:13 +01:00
enricoturri1966 ac4d9ea172 Fixed conflicts after merge with master 2020-03-16 08:09:52 +01:00
enricoturri1966 b36051af82 New tech ENABLE_SLOPE_RENDERING - 1st installment of rendering objects colored by facets slope 2020-03-13 15:09:07 +01:00
Enrico Turri 3684eea53d Follow-up of 4a59a45d51 -> missed cleanup 2020-03-13 13:20:38 +01:00
Enrico Turri 3fd6c8a2ff #2922 - Fan speed for gcode visualization modified as proposed by rongith 2020-03-13 08:25:48 +01:00
Enrico Turri 4c16ce442f #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 9aa5c13c15 Fixed initial position of top toolbars 2020-03-11 14:15:36 +01:00
Enrico Turri 4d39050dcd Fixed conflict after merge with master 2020-03-11 13:16:15 +01:00
Enrico Turri 2c9bd86a70 Fix of crash and/or assert when changing language 2020-03-11 12:19:52 +01:00
Enrico Turri 591c73a4dd Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_canvas_manager 2020-03-10 13:45:36 +01:00
Enrico Turri 1d337b0e24 #3791 - Linear zoom for 3DConnexion devices 2020-03-10 13:43:49 +01:00
Enrico Turri a8dff7038f Fixed conflicts after merge with master 2020-03-10 13:09:32 +01:00
Enrico Turri a6a9ab9dc7 Follow-up of 6c36577e8e -> World Z axis set to vertical when disconnecting 3d mouse 2020-03-10 13:02:39 +01:00
Enrico Turri 33470f7f6d Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-03-10 12:03:26 +01:00
Enrico Turri 4ca03c3f8a #3802 - Fixed objects list's context menu showing up when moving mouse after changing selection 2020-03-10 12:03:08 +01:00
Enrico Turri 5693545d15 Fixed conflicts after merge with master 2020-03-09 16:03:15 +01:00
Enrico Turri 56fa84c9d9 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-03-09 15:23:38 +01:00
Enrico Turri 6c36577e8e #3782 - World Z axis always vertical for non-free camera 2020-03-09 15:23:29 +01:00
Enrico Turri de7a09f833 Fixed conflicts after merge with master 2020-03-05 10:41:11 +01:00
Enrico Turri dc3df3aec7 Removed temporary debug output and clean up 2020-03-05 10:14:12 +01:00
Enrico Turri dcf3565426 Attempt to fix crash on MAC when closing using Command+Q 2020-03-04 15:19:48 +01:00
Enrico Turri 1bff1f7460 Added temporary debug output to investigate crash on MAC when closing using Command+Q 2020-03-04 14:19:15 +01:00
Enrico Turri 436a055b39 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_canvas_manager 2020-03-04 09:39:00 +01:00
Enrico Turri 96f5430cee Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_canvas_manager 2020-03-03 11:10:59 +01:00
Enrico Turri 0f90b44e3d Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_canvas_manager 2020-03-03 08:34:11 +01:00
Enrico Turri d12cc6cb77 Removed temporary debug output 2020-03-03 08:34:03 +01:00
Enrico Turri a14fe518be Fixed detection of OSX version 2020-03-02 15:55:36 +01:00
Enrico Turri 8b5a08a64a Added temporary debug output 2020-03-02 15:22:41 +01:00
Enrico Turri 0a3555f73b Reintroduced tech ENABLE_HACK_CLOSING_ON_OSX_10_9_5 2020-03-02 14:37:01 +01:00
Enrico Turri 9e06a5e8d6 Fix build on Linux and MAC 2020-03-02 13:09:12 +01:00
Enrico Turri d11548cbf9 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_canvas_manager 2020-03-02 12:45:42 +01:00
Enrico Turri 595128a90d View toolbar's initialization of icon size moved from GLCanvas3D::GLCanvas3D() to Plater::priv::priv() for OSX build 2020-03-02 12:45:04 +01:00
Enrico Turri 7cb92ef5e8 #3646 - Ask user whether remove from recent projects list a project no longer available 2020-03-02 12:33:17 +01:00
Enrico Turri 3f69336204 Removed tech ENABLE_HACK_CLOSING_ON_OSX_10_9_5 2020-03-02 12:13:39 +01:00
Enrico Turri de77328320 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_canvas_manager 2020-03-02 11:42:10 +01:00
Enrico Turri 10d2193645 Fixed build on MAC 2020-03-02 11:40:35 +01:00
Enrico Turri 2f8970de86 Fixed conflicts after merge with master 2020-03-02 11:35:03 +01:00
Enrico Turri 0b629eb905 GLCanvas3DManager moved from being a static member of _3DScene to be a normal member of GUI_App 2020-03-02 10:58:46 +01:00
Enrico Turri dff9af20a4 Follow-up of 47604b6326 -> Fixed layout at startup 2020-02-28 11:19:46 +01:00
Enrico Turri 5ca4698400 Reduce max texture size if physical ram is smaller than 6GB 2020-02-27 15:38:35 +01:00
Enrico Turri d6b86b5e2b Workaround to remove crash when closing PrusaSlicer on OSX 10.9.5 2020-02-27 14:55:27 +01:00
Enrico Turri 47604b6326 #3707 - Fixed buttons layout after closing preference dialog 2020-02-26 10:18:04 +01:00
Enrico Turri 69e1e46dd7 Fixed reload from disk for modifiers 2020-02-26 08:56:05 +01:00
Enrico Turri 0ce730e79a Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-02-13 13:55:27 +01:00
Enrico Turri faf9dd27db Merge remote-tracking branch 'origin/et_shortcuts_dialog' 2020-02-13 13:45:25 +01:00
Enrico Turri 8e4274e100 Fixed conflicts after merge with master 2020-02-13 13:41:42 +01:00
Enrico Turri 4a59a45d51 ENABLE_SHOW_SCENE_LABELS set as default 2020-02-13 13:24:52 +01:00
Enrico Turri 6914f688f8 ENABLE_BACKWARD_COMPATIBLE_RELOAD_FROM_DISK set as default 2020-02-13 12:43:19 +01:00
Enrico Turri 847efec2ed ENABLE_6DOF_CAMERA set as default 2020-02-13 12:13:54 +01:00
Enrico Turri 904263d231 ENABLE_CONFIGURABLE_PATHS_EXPORT_TO_3MF_AND_AMF set as default 2020-02-13 11:25:34 +01:00