Commit Graph

3549 Commits

Author SHA1 Message Date
f43e20913a Merge with master 2018-05-22 15:03:40 +02:00
7b1f575162 Merge remote-tracking branch 'remotes/origin/scene_manipulators' 2018-05-22 14:32:07 +02:00
b2b5129c15 Fixed correct updating of the modified preset on Plater tab. 2018-05-22 14:00:42 +02:00
baf302a8ae 3DScene's enable_picking variable moved to c++ 2018-05-22 09:02:42 +02:00
dbeeab3859 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-22 08:33:23 +02:00
316714a635 Moved the "Flash firmware" menu to "Configuration",
removed the "Check for updates" from the "Configuration" menu,
added an "Open file explorer at the datadir" item to the Help menu.
2018-05-21 21:04:03 +02:00
38b8ae7cef Firmware updater GUI 2018-05-21 18:58:22 +02:00
dcffbdbc24 Volumes rendering moved to c++ 2018-05-21 15:57:03 +02:00
e73a98e499 Background rendering moved to c++ 2018-05-21 15:24:52 +02:00
7d6811be42 Legend texture moved to c++ 2018-05-21 14:57:43 +02:00
e976dde487 Warning texture moved to c++ 2018-05-21 14:40:09 +02:00
ea62cb6880 Shaders loaded from files 2018-05-21 13:08:02 +02:00
a92a6f8320 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-21 13:06:16 +02:00
0acf7985aa Fixed bugs with non-correct update of buttons enable.
Set minimum size for the scrolled_window_panel.
2018-05-21 12:34:31 +02:00
6fba97639c Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-21 11:17:55 +02:00
cf419463fd Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-21 11:17:45 +02:00
f55ce0934d Fixed object setting dialog on NVIDIA cards 2018-05-21 10:51:47 +02:00
6d4fecc70d Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-21 08:38:05 +02:00
a342eeb3af Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-21 08:37:53 +02:00
4f5c7c51e9 Aligned frequently changing parameters according to presets settings on the Plater tab.
Fixed missing adding of the Filaments preset settings(for multy material case) to the right_panel
2018-05-20 23:58:09 +02:00
e5ec4a5ac6 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-18 14:13:06 +02:00
1b93644962 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-18 14:12:44 +02:00
cacf775b24 3DScene reset_object method moved to c++ 2018-05-18 14:08:59 +02:00
96c6ff9801 Resolved problem with Flickering.
Right column of the Plater is passed to own panel to be able be updated separately from whole Plater panel
2018-05-18 13:56:51 +02:00
9fc6655d57 3DScene axes moved to c++ 2018-05-18 13:02:47 +02:00
6156dc541b 3DScene cutting plane moved to c++ 2018-05-18 11:05:48 +02:00
72f45a82c3 Fixed z layers indices under 3D preview sliders 2018-05-18 10:14:47 +02:00
79e96003ad Tweaks to logic for sliders update in 3D Preview 2018-05-17 16:02:31 +02:00
8c6faf1ee0 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-17 15:22:55 +02:00
f488ac8101 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-17 15:20:25 +02:00
f26d1ff61a Hide legend texture when invalidating gcode by editing config data 2018-05-17 15:18:52 +02:00
53b3b2a1e2 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-17 14:43:27 +02:00
9f0f5a20d4 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-17 14:43:18 +02:00
5086d2aafa Fix in File menu 2018-05-17 12:56:14 +02:00
b2786711d3 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-17 09:31:06 +02:00
deab318685 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-17 09:30:55 +02:00
c097fd9e7f Merge branch 'master' of https://github.com/prusa3d/Slic3r 2018-05-17 09:27:16 +02:00
b41219f4e6 Reset tooltips for manifold objects into object info panel 2018-05-17 09:26:50 +02:00
8baac979f5 Set minimum width for the right sizer 2018-05-17 08:50:05 +02:00
3316594898 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-17 08:33:32 +02:00
26dd132290 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-17 08:33:16 +02:00
3e1abc7135 Fix of https://github.com/prusa3d/Slic3r/issues/791
The preset names have to be set at the PlaceholderParser
before querying Print for a recommended file name.
2018-05-16 12:16:30 +02:00
65246edb41 3DScene's char event handler moved to c++ 2018-05-15 16:09:04 +02:00
c8cb26f076 3DScene bed variables moved to c++ 2018-05-15 15:38:25 +02:00
647791e7ce 3DScene select_view() function moved to c++ 2018-05-15 11:30:11 +02:00
99b6238159 3DScene bed origin moved to c++ 2018-05-15 11:07:32 +02:00
a70711444a 3DScene zoom functions moved to c++ 2018-05-15 10:32:38 +02:00
4b1c778986 1st attempt of perl callback from c++ for 3DScene 2018-05-15 09:50:01 +02:00
c29c471ae4 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-15 09:46:57 +02:00
42ff90b67c Removed auto zoom to volumes when changing view 2018-05-15 09:41:58 +02:00