3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,050 Commits 1 Branch 1 Tag 249 MiB
4579b71a66
Commit Graph

755 Commits

Author SHA1 Message Date
Enrico Turri
4579b71a66 Merge branch 'scene_manipulators' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-07-18 15:07:56 +02:00
Enrico Turri
3fac0d92cd Unified opengl textures 2018-07-18 15:07:52 +02:00
Enrico Turri
d805c8ac3b Disable slicing when one object crosses the print volume boundary 2018-07-18 14:26:42 +02:00
Enrico Turri
5c90746914 Merge with master + resolved conflicts 2018-07-17 10:44:23 +02:00
bubnikv
83f9813f56 Merge remote-tracking branch 'remotes/origin/opengl_to_cpp' 2018-07-17 09:37:38 +02:00
Enrico Turri
8175c9d306 Merge with master 2018-07-17 08:54:17 +02:00
bubnikv
210eeff160 Merge remote-tracking branch 'remotes/origin/amf_activate_existing_presets' 2018-07-16 19:52:17 +02:00
bubnikv
6b3c24359b Merge branch 'master' into amf_activate_existing_presets 2018-06-28 22:00:10 +02:00
tamasmeszaros
85474e5803 Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d 
# Conflicts:
#	CMakeLists.txt
#	lib/Slic3r/GUI/MainFrame.pm
 2018-06-28 18:50:39 +02:00
tamasmeszaros
ad4d95f60c AppController integration 2018-06-28 18:47:18 +02:00
Enrico Turri
7ff22b9413 Time estimate emitted to gcode at requested interval 2018-06-27 15:35:47 +02:00
Enrico Turri
3dba0be81e Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-27 15:32:31 +02:00
Enrico Turri
d02c90d5d0 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-27 13:54:39 +02:00
Chow Loong Jin
8eb8a8b1f6 Fix format-security violation with croak 
Missed one in https://github.com/prusa3d/slic3r/pull/802.
 2018-06-27 13:54:07 +02:00
Enrico Turri
48915a65fd Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-27 13:52:57 +02:00
Enrico Turri
8db4fdc24c 3rd attempt to fix opengl on ubuntu 2018-06-27 12:36:49 +02:00
Enrico Turri
5c32347449 1st attempt to fix opengl on ubuntu 2018-06-27 11:31:11 +02:00
bubnikv
68e82a7348 Merge branch 'master' into amf_activate_existing_presets 2018-06-27 10:33:14 +02:00
Enrico Turri
ab587babb9 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-26 12:20:41 +02:00
Enrico Turri
9b2f760679 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-26 12:20:23 +02:00
Enrico Turri
a754de4c32 Fixed panning in Layers view 2018-06-26 11:17:30 +02:00
Enrico Turri
714204b227 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-25 15:27:06 +02:00
Enrico Turri
7b0ba7a9d4 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-25 15:24:58 +02:00
Enrico Turri
40b327eb11 Fix of interaction between opengl contexts and main page notebook 2018-06-25 15:17:13 +02:00
Enrico Turri
f9e6bcf872 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-25 08:26:14 +02:00
Enrico Turri
ac0f3a6ef7 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-22 16:13:51 +02:00
Enrico Turri
2a03b90d2b Forced render of 3D scene when changing tab in plater's notebook 2018-06-22 16:06:37 +02:00
Enrico Turri
00ef0610a5 Merge branch 'add_kinematics' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-22 12:57:16 +02:00
Enrico Turri
f8982c0ca1 Merge branch 'machine-limits-config' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-22 12:30:15 +02:00
YuSanka
c10e9a6840 Fixed crash-bug when close application after language changing 2018-06-22 12:27:56 +02:00
Enrico Turri
ac7d21b50a Geometry info updated while using gizmos 2018-06-22 11:19:38 +02:00
YuSanka
9ba1af5834 Merge remote-tracking branch 'origin/master' into add_kinematics 2018-06-22 09:22:29 +02:00
Enrico Turri
a7e9ec5757 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-21 11:05:07 +02:00
Enrico Turri
4ee365194a Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-21 11:03:38 +02:00
Vojtech Kral
1ba81655e2 Octoprint: Add a dialog for setting the filename/path 
and a "print now" option
cf. #880, #245, #55, #87
 2018-06-21 10:44:29 +02:00
Enrico Turri
550f6e307f Faster gizmos update 2018-06-21 08:37:04 +02:00
bubnikv
6b2b970b9a Added machine evelope configuration parameters 
(the MachineEnvelopeConfig class).
Added localization support for libslic3r through a callback
(the callback is not registered yet, so the localization does nothing).
Localized the Print::validate() error messages.
 2018-06-20 13:57:37 +02:00
Enrico Turri
fa9014fc8e Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-20 08:32:27 +02:00
bubnikv
6fef5a07ab Merge remote-tracking branch 'remotes/origin/scene_manipulators' 
Disabled the gizmos.
 2018-06-19 16:12:36 +02:00
bubnikv
5a56f08aad Merge remote-tracking branch 'remotes/origin/opengl_to_cpp' 2018-06-19 16:08:53 +02:00
bubnikv
734273a33a Merge remote-tracking branch 'remotes/origin/fix_model_by_win10' 2018-06-19 10:02:49 +02:00
Enrico Turri
b9ce19b07c Object updated by rotate gizmo 2018-06-19 09:46:26 +02:00
Enrico Turri
a3949b9f01 Object updated by scale gizmo 2018-06-18 15:07:17 +02:00
Enrico Turri
52a7d7ed09 Partial perl code cleanup 2018-06-14 16:09:36 +02:00
Enrico Turri
b2cf576bf3 1st installment of gizmos 2018-06-13 09:12:16 +02:00
Enrico Turri
af3d07bb05 Attempt to workaround bug in wxWidgets IsShownOnScreen() method 2018-06-12 09:18:25 +02:00
Enrico Turri
44220530cb Use a single gl context created in c++ 2018-06-11 15:49:04 +02:00
Enrico Turri
085110c4d9 Removed 3DScene volumes from perl 2018-06-11 13:48:02 +02:00
Enrico Turri
96d9879d72 class 3D on_select callback moved to c++ 2018-06-08 11:37:07 +02:00
Enrico Turri
bf2fd54578 reload_scene method of 3D class moved to c++ 2018-06-08 09:40:00 +02:00