3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
19402 commits 1 branch 1 tag 249 MiB
Commit graph

482 commits

Author SHA1 Message Date
Filip Sykala
37961c36e8 Merge branch 'master' into fs_emboss 
# Conflicts:
#	src/libslic3r/Technologies.hpp
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/GUI_App.cpp
 2022-05-18 14:35:48 +02:00
enricoturri1966
39cefdad89 Tech ENABLE_REMOVE_ASSOCIATION_TO_FILE_FOR_WINDOWS_8_AND_LATER - Disable association to 3mf and stl files if the application is run on Windows 8 or later 2022-05-17 13:19:33 +02:00
Filip Sykala
7ec422d12f Merge branch 'et_world_coordinates' into fs_emboss 
# Conflicts:
#	src/libslic3r/Model.hpp
#	src/libslic3r/Technologies.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.hpp
 2022-04-20 12:13:17 +02:00
enricoturri1966
8a36c12f13 Fixed conflicts after merge with master 2022-04-20 11:53:51 +02:00
Filip Sykala
c58a8302b6 Merge branch 'et_world_coordinates' into fs_emboss 
# Conflicts:
#	src/libslic3r/Technologies.hpp
 2022-04-20 10:41:11 +02:00
enricoturri1966
f504236734 Tech ENABLE_GIZMO_GRABBER_REFACTOR - Refactoring of GLGizmoBase::Grabber to have a single static instance of the cube and cone models to be shared by all grabbers 2022-04-14 15:15:14 +02:00
enricoturri1966
9c15952343 Fixed conflicts after merge with master 2022-04-13 15:37:12 +02:00
enricoturri1966
3ce2d3a700 #8176 - Tech ENABLE_USED_FILAMENT_POST_PROCESS - Fixes used filament data exported to gcode file not taking in account custom gcode 2022-04-13 15:27:46 +02:00
enricoturri1966
2b8f8a2842 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_world_coordinates 2022-03-28 14:14:12 +02:00
Filip Sykala
4e4ba09cbf Merge branch 'et_world_coordinates' into fs_emboss 
# Conflicts:
#	src/libslic3r/Technologies.hpp
 2022-03-24 11:47:59 +01:00
Vojtech Bubnik
fe71e7c597 Merge branch 'master' into et_world_coordinates 2022-03-23 14:05:33 +01:00
Filip Sykala
e6838f7e18 add new cgal as technology 2022-03-22 15:47:34 +01:00
Filip Sykala
65909c74c4 Merge branch 'master' into fs_emboss 
# Conflicts:
#	src/libslic3r/Technologies.hpp
 2022-03-22 12:52:16 +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
21e6dccc12 Fixed conflicts after merge with master 2022-03-18 13:36:32 +01:00
enricoturri1966
8c8e908325 Tech ENABLE_PROCESS_G2_G3_LINES - Processing of gcode G2 and G3 lines 2022-03-18 13:34:53 +01:00
enricoturri1966
a7d466dc7c Tech ENABLE_Z_OFFSET_CORRECTION set as default 2022-03-18 08:32:35 +01:00
enricoturri1966
fb22612d0d Tech ENABLE_SPIRAL_VASE_LAYERS set as default 2022-03-17 15:12:03 +01:00
enricoturri1966
99861f1b6e SPE-1207 - Extensions in Open/Save/Export dialogs - alternative implementation for file_wildcards() 2022-03-17 14:20:35 +01:00
enricoturri1966
4e17c02505 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_new_camera_movements 2022-03-15 09:18:04 +01:00
enricoturri1966
9174fc4872 Removed obsolete tech ENABLE_FIXED_SCREEN_SIZE_POINT_MARKERS 2022-03-14 14:25:09 +01:00
enricoturri1966
d0d89a4d5b Tech ENABLE_GL_IMGUI_SHADERS - Render imgui using shaders 2022-03-14 09:04:44 +01:00
enricoturri1966
ac0ec5fa43 Tech ENABLE_NEW_CAMERA_MOVEMENTS_CTRL_ROTATE renamed as ENABLE_NEW_CAMERA_MOVEMENTS 
Tech ENABLE_NEW_CAMERA_MOVEMENTS_MIDMOUSE_ROTATE merged into ENABLE_NEW_CAMERA_MOVEMENTS

Tech ENABLE_NEW_CAMERA_MOVEMENTS_SHIFT_SELECTION renamed as ENABLE_NEW_RECTANGLE_SELECTION
 2022-03-11 12:36:09 +01:00
enricoturri1966
4a5ad304ad Fixed conflicts after merge with master 2022-03-11 09:35:02 +01:00
enricoturri1966
3dddfa919a Debug tech ENABLE_GLMODEL_STATISTICS - Shows an imgui dialog with GLModel statistics data 2022-03-10 15:55:15 +01:00
enricoturri1966
b9b8406ad8 Fixed conflicts after merge with master 2022-03-10 10:32:00 +01:00
enricoturri1966
46283cfde3 Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES renamed as ENABLE_GL_SHADERS_ATTRIBUTES 2022-03-09 08:22:07 +01:00
enricoturri1966
5ffe010a9d Tech ENABLE_GLINDEXEDVERTEXARRAY_REMOVAL merged into ENABLE_LEGACY_OPENGL_REMOVAL 2022-03-08 14:50:32 +01:00
enricoturri1966
05efb88e3f Tech ENABLE_GLBEGIN_GLEND_REMOVAL renamed as ENABLE_LEGACY_OPENGL_REMOVAL 2022-03-08 14:08:11 +01:00
enricoturri1966
5b1c9a34d6 Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders. 
Shader: flat - Volumes picking pass
 2022-02-28 12:05:08 +01:00
enricoturri1966
a5ff37013b Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders. 1st installment. 
Shader: flat - Default bed
 2022-02-28 10:41:01 +01:00
enricoturri1966
cd32254190 Fixed conflicts after merge with master 2022-02-24 13:17:30 +01:00
enricoturri1966
db852fe74f Tech ENABLE_WORLD_COORDINATE_SCALE_REVISITED - Alternate implementation of manipulating scale for instances and volumes using gizmo scale and sidebar object manipulator fields - 1st installment 2022-02-18 08:57:26 +01:00
enricoturri1966
cf245a7995 Tech ENABLE_WORLD_COORDINATE_SHOW_AXES - Show axes of the current reference system when sidebar hints are active for non-world reference systems 2022-02-16 12:36:41 +01:00
enricoturri1966
c1ce2ff68a Tech ENABLE_COORDINATE_DEPENDENT_SELECTION_BOX - Render the selection bounding box in the current reference system 2022-02-15 09:10:41 +01:00
enricoturri1966
ef48b0d85f Follow-up of a1f43f0611 - Re-enable tech ENABLE_WORLD_COORDINATE disabled by mistake 2022-02-14 11:08:16 +01:00
enricoturri1966
a1f43f0611 Tech ENABLE_INSTANCE_COORDINATES_FOR_VOLUMES merged into tech ENABLE_WORLD_COORDINATE 2022-02-14 11:06:16 +01:00
enricoturri1966
6a7e32ad3e Fixed conflicts after merge with master 2022-02-14 09:20:37 +01:00
enricoturri1966
cca1454c38 Tech ENABLE_VOLUMETRIC_RATE_TOOLPATHS_RECALC - Recalculate toolpaths when switching to/from volumetric rate visualization 2022-02-10 12:06:12 +01:00
enricoturri1966
ffa3a1d8fc Tech ENABLE_GLINDEXEDVERTEXARRAY_REMOVAL - Replace GLIndexedVertexArray with GLModel - GLGizmoFlatten::PlaneData::vbo 2022-02-09 09:08:37 +01:00
enricoturri1966
92aa6540f5 Tech ENABLE_SHOW_TOOLPATHS_COG - Show toolpaths center of gravity 2022-02-08 12:57:56 +01:00
enricoturri1966
106e26ace5 Fixed conflicts after merge with master 2022-02-05 08:21:41 +01:00
enricoturri1966
7d87490777 Tech ENABLE_RELOAD_FROM_DISK_REWORK - A bunch of bug fixes in Reload from disk command: 
1) Lost orientation after reload from disk (SPE-1182)

2) Wrong objects replacement from reload from disk command (SPE-1183)

3) Reload from disk not disabled for built-in models (SPE-1184)
 2022-02-02 14:25:36 +01:00
enricoturri1966
3e399f1f98 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_world_coordinates 2022-02-02 08:11:26 +01:00
enricoturri1966
1af59e0e5d Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_new_camera_movements 2022-02-02 08:07:38 +01:00
enricoturri1966
383f6509a9 Added tech DISABLE_GCODEVIEWER_INSTANCED_MODELS to easily turn on/off instanced models to render options in gcode preview 2022-01-31 15:36:40 +01:00
enricoturri1966
9bfab29bc1 Fixed conflicts after merge with dev branch 2022-01-29 11:17:33 +01:00
enricoturri1966
238516a660 Fixed conflicts after merge with dev branch 2022-01-29 09:50:55 +01:00
YuSanka
94b8c4f096 Merge remote-tracking branch 'origin/master' into dev 2022-01-20 15:22:24 +01:00
enricoturri1966
18e2cc2298 Tech ENABLE_SHOW_NON_MANIFOLD_EDGES - 1st installment - Calculate and show in 3D view non-manifold edges as lines 2022-01-20 13:32:24 +01:00