Enrico Turri
90b0cd5cae
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-26 11:16:00 +02:00
Enrico Turri
69ff60b557
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-26 11:15:33 +02:00
bubnikv
1175dc95f6
Storing and recovering the "compatible_printers_condition"
...
and "inherits" fields from / to the AMF/3MF/Config files.
The "compatible_printers_condition" are collected over all active profiles
(one print, possibly multiple filament, and one printer profile)
into a single vector.
2018-06-26 10:50:50 +02:00
YuSanka
2fae893af2
Fixed #998
...
Added detection of gtk2/gtk3 GUI libraries required by Alien::wxWidgets.
Added gtk2/gtk3 include paths, so we may call gtk2/3 API directly if needed for some workaround.
2018-06-26 10:37:36 +02:00
YuSanka
0371f368a4
Merge remote-tracking branch 'origin/master' into new_main_page_ui
2018-06-26 09:26:27 +02:00
tamasmeszaros
3efe6675cb
Merge remote-tracking branch 'origin/master' into feature_slice_to_png
2018-06-25 17:14:29 +02:00
tamasmeszaros
99f6866a1d
Merge branch 'feature_slice_to_png' of github.com:prusa3d/Slic3r into feature_slice_to_png
...
# Conflicts:
# xs/src/slic3r/AppController.cpp
# xs/src/slic3r/AppController.hpp
2018-06-25 17:13:36 +02:00
Enrico Turri
ecda2a6140
Merge branch 'add_kinematics' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-25 16:09:27 +02:00
YuSanka
f9b85b6700
Correct updating of "Machine limits" and "Single extruder MM setup" pages
2018-06-25 16:03:43 +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
b6b14ef819
Fixed conflicts after merge with master branch
2018-06-25 15:26:37 +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
YuSanka
515502e685
Fixed #994 .
...
Print double-type values according to "full" value instead of 2 digits after point
2018-06-25 13:32:28 +02:00
tamasmeszaros
f26cb9ebd6
Merge remote-tracking branch 'origin/master' into feature_slice_to_png
...
# Conflicts:
# lib/Slic3r/GUI/MainFrame.pm
2018-06-25 13:24:37 +02:00
Enrico Turri
581ed7764c
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-25 13:21:52 +02:00
Tamás Mészáros
6737506b14
Separating wx and the app controller.
2018-06-25 12:40:01 +02:00
YuSanka
318212f475
Fixed crashing-bug after language changing (detected under Debug)
2018-06-25 12:27:42 +02:00
YuSanka
362a9d8eda
Fixed bug #995
2018-06-25 11:40:40 +02:00
Enrico Turri
789a760fbd
Fixed conflict after merge with master
2018-06-25 10:49:30 +02:00
Enrico Turri
8a4a5e487e
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-25 08:51:47 +02:00
Enrico Turri
7d15a15e14
Fix of #999
2018-06-25 08:48:36 +02:00
Enrico Turri
3da21a4ce8
Merge branch 'add_kinematics' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-25 08:27:09 +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
bubnikv
b5f97baa28
Merge remote-tracking branch 'remotes/origin/machine-limits-config' into add_kinematics
2018-06-22 17:44:12 +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
YuSanka
54c90ee948
Updated PrintConfig default values for machine limits
...
+ fixed incorrect default value setting for the TextCtrl
2018-06-22 16:13:34 +02:00
Enrico Turri
c948ca647c
Code cleanup
2018-06-22 16:11:00 +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
de540de9aa
5th Attempt to fix texture rendering on OpenGL 1.1 cards
2018-06-22 15:11:04 +02:00
bubnikv
082ed95a94
Activate existing projects after loading AMF/3MF/Config: Initial implementation.
2018-06-22 14:17:03 +02:00
Lukas Matena
e2126c2dd6
Dedicated objects are now not ignored
2018-06-22 14:03:34 +02:00
Enrico Turri
f420ced581
Time estimators use initial data from config
2018-06-22 14:01:27 +02:00
YuSanka
3fdefbfbea
Added updatin of the "Machine limits" page according to "use silent mode"
2018-06-22 13:01:41 +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
15c69a90ec
Changed use of GL_LIGHTING logic and code cleanup
2018-06-22 12:21:43 +02:00
Enrico Turri
ac7d21b50a
Geometry info updated while using gizmos
2018-06-22 11:19:38 +02:00
YuSanka
bfe7896709
Try to fix uncorrect setup on Linux
2018-06-22 10:59:54 +02:00
Enrico Turri
266a4413bd
4th Attempt to fix texture rendering on OpenGL 1.1 cards
2018-06-22 09:42:56 +02:00
YuSanka
9ba1af5834
Merge remote-tracking branch 'origin/master' into add_kinematics
2018-06-22 09:22:29 +02:00
Enrico Turri
be52647440
Smaller gizmos icons
2018-06-22 09:00:01 +02:00
Enrico Turri
4ba3cef496
3rd Attempt to fix texture rendering on OpenGL 1.1 cards
2018-06-22 08:38:13 +02:00
YuSanka
4454c3437f
"Machine limits" page is completed
2018-06-21 16:15:56 +02:00
Enrico Turri
e89083090f
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-21 16:08:40 +02:00
Enrico Turri
e0db2a925d
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-21 16:08:20 +02:00
Enrico Turri
75cd436ae5
2nd Attempt to fix texture rendering on OpenGL 1.1 cards
2018-06-21 15:43:34 +02:00
Lukas Matena
e622401599
Wipe tower bugfix - the tower was printed incorrectly when the rotation angle was close to 90 degrees
2018-06-21 14:05:07 +02:00
Enrico Turri
b139f38784
Attempt to fix texture rendering on OpenGL 1.1 cards
2018-06-21 13:03:53 +02:00
