viewit/OrcaSlicer-KX
5
1
Fork 1
Code Issues Pull Requests Actions 5 Packages Projects Releases 4 Wiki Activity
13,712 Commits 6 Branches 4 Tags
f58ee46687300a02942572bfdb8c516dcafe7bd5
Commit Graph

3335 Commits

Author SHA1 Message Date
Enrico Turri
3eb6c29c24 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-26 11:16:00 +02:00
Enrico Turri
02f913df23 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-26 11:15:33 +02:00
bubnikv
d157831afb 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
57e83dcbc8 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
369e9496cc Merge remote-tracking branch 'origin/master' into new_main_page_ui 2018-06-26 09:26:27 +02:00
tamasmeszaros
c6d8856ec5 Merge remote-tracking branch 'origin/master' into feature_slice_to_png 2018-06-25 17:14:29 +02:00
tamasmeszaros
07da934398 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
351a36b2c1 Merge branch 'add_kinematics' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-25 16:09:27 +02:00
YuSanka
a46993d9a3 Correct updating of "Machine limits" and "Single extruder MM setup" pages 2018-06-25 16:03:43 +02:00
Enrico Turri
90eb01702b Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-25 15:27:06 +02:00
Enrico Turri
cc8d23eb82 Fixed conflicts after merge with master branch 2018-06-25 15:26:37 +02:00
Enrico Turri
dd392198f8 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-25 15:24:58 +02:00
Enrico Turri
fab492e951 Fix of interaction between opengl contexts and main page notebook 2018-06-25 15:17:13 +02:00
YuSanka
1e946f3952 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
996791ca7c 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
046d1056a6 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
0ee31bc3d1 Separating wx and the app controller. 2018-06-25 12:40:01 +02:00
YuSanka
9175163078 Fixed crashing-bug after language changing (detected under Debug) 2018-06-25 12:27:42 +02:00
YuSanka
6a66d81e76 Fixed bug #995 2018-06-25 11:40:40 +02:00
Enrico Turri
4c6cf7e970 Fixed conflict after merge with master 2018-06-25 10:49:30 +02:00
Enrico Turri
b4959d27f5 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-25 08:51:47 +02:00
Enrico Turri
df781d0c00 Fix of #999 2018-06-25 08:48:36 +02:00
Enrico Turri
69c42a877b Merge branch 'add_kinematics' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-25 08:27:09 +02:00
Enrico Turri
1d81186309 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-25 08:26:14 +02:00
bubnikv
9e46225e4d Merge remote-tracking branch 'remotes/origin/machine-limits-config' into add_kinematics 2018-06-22 17:44:12 +02:00
Enrico Turri
afc4bbb680 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-22 16:13:51 +02:00
YuSanka
0ae427afa3 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
c0fde61e64 Code cleanup 2018-06-22 16:11:00 +02:00
Enrico Turri
13d59bca12 Forced render of 3D scene when changing tab in plater's notebook 2018-06-22 16:06:37 +02:00
Enrico Turri
cad45aaad9 5th Attempt to fix texture rendering on OpenGL 1.1 cards 2018-06-22 15:11:04 +02:00
bubnikv
604098be0f Activate existing projects after loading AMF/3MF/Config: Initial implementation. 2018-06-22 14:17:03 +02:00
Lukas Matena
5551f049d6 Dedicated objects are now not ignored 2018-06-22 14:03:34 +02:00
Enrico Turri
c08daa2e42 Time estimators use initial data from config 2018-06-22 14:01:27 +02:00
YuSanka
1c997f3010 Added updatin of the "Machine limits" page according to "use silent mode" 2018-06-22 13:01:41 +02:00
Enrico Turri
ffb404d4ad Merge branch 'add_kinematics' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-22 12:57:16 +02:00
Enrico Turri
7943c4afca Merge branch 'machine-limits-config' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-22 12:30:15 +02:00
YuSanka
2d1078a7d9 Fixed crash-bug when close application after language changing 2018-06-22 12:27:56 +02:00
Enrico Turri
8479fb588d Changed use of GL_LIGHTING logic and code cleanup 2018-06-22 12:21:43 +02:00
Enrico Turri
f0e09fc4b4 Geometry info updated while using gizmos 2018-06-22 11:19:38 +02:00
YuSanka
59ded46c7b Try to fix uncorrect setup on Linux 2018-06-22 10:59:54 +02:00
Enrico Turri
5db9b363f9 4th Attempt to fix texture rendering on OpenGL 1.1 cards 2018-06-22 09:42:56 +02:00
YuSanka
9390348e2b Merge remote-tracking branch 'origin/master' into add_kinematics 2018-06-22 09:22:29 +02:00
Enrico Turri
d64225f7b1 Smaller gizmos icons 2018-06-22 09:00:01 +02:00
Enrico Turri
5edce87667 3rd Attempt to fix texture rendering on OpenGL 1.1 cards 2018-06-22 08:38:13 +02:00
YuSanka
4a187377b8 "Machine limits" page is completed 2018-06-21 16:15:56 +02:00
Enrico Turri
3c2cbb42aa Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-21 16:08:40 +02:00
Enrico Turri
0b273cd6b0 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-21 16:08:20 +02:00
Enrico Turri
6a39ea4217 2nd Attempt to fix texture rendering on OpenGL 1.1 cards 2018-06-21 15:43:34 +02:00
Lukas Matena
13711a878b 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
f85d5e4dbb Attempt to fix texture rendering on OpenGL 1.1 cards 2018-06-21 13:03:53 +02:00