Commit Graph

6443 Commits

Author SHA1 Message Date
Enrico Turri
4b25d3924b Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev 2018-08-27 14:01:03 +02:00
Enrico Turri
fef5a5252e Fixed conflicts after merging with master 2018-08-27 14:00:53 +02:00
bubnikv
4522811f5b Bumped up the version number to 1.41.0-beta2 2018-08-25 22:11:04 +02:00
bubnikv
78a7104994 Changed the wording of "Purge into this object's ..." to "Wipe ..." 2018-08-25 22:09:55 +02:00
bubnikv
fec2545033 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2018-08-24 16:58:53 +02:00
YuSanka
d4c8bc0720 Fixed post-merge compilation problem 2018-08-24 16:56:42 +02:00
Lukas Matena
a4176ef933 Bugfix - dialog that changes number of copies deleted the object when cancelled 2018-08-24 16:52:06 +02:00
bubnikv
3c0d81e7d9 Merge remote-tracking branch 'remotes/origin/lm_lay_flat_round_merged_facets' 2018-08-24 16:39:24 +02:00
bubnikv
de0f8ec267 Merge remote-tracking branch 'remotes/origin/lm_retraction_fix' 2018-08-24 16:33:57 +02:00
YuSanka
02a325556d Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev 2018-08-24 16:28:34 +02:00
YuSanka
90fcdd4e5f Fixed post-commit compilation problems 2018-08-24 16:20:19 +02:00
Enrico Turri
220d430956 Mouse capture when dragging gizmos 2018-08-24 15:49:57 +02:00
Enrico Turri
cda135ada7 Removed scale and rotate actions from toolbar 2018-08-24 15:08:19 +02:00
YuSanka
8b148a4fe4 Merge remote-tracking branch 'origin/new_main_page_ui' into dev 2018-08-24 15:01:26 +02:00
Enrico Turri
bbc465fdf3 Added tooltip to gizmos 2018-08-24 14:11:41 +02:00
YuSanka
bb24ae9f03 Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev 2018-08-24 13:58:21 +02:00
YuSanka
d90f5fa591 Added "one_layer" mode for PrusaDoubleSlider 2018-08-24 13:36:19 +02:00
YuSanka
774315fe07 Fixed after-merging compilation problems 2018-08-24 12:54:21 +02:00
Lukas Matena
be3b8e98da Edited captions and default values of the new parameters (initial loading and unloading speed) 2018-08-24 12:46:32 +02:00
Enrico Turri
bfac36174f Renamed private member functions in GLToolbar 2018-08-24 12:32:14 +02:00
YuSanka
ada6970053 Merge remote-tracking branch 'origin/SLA_ui' into dev 2018-08-24 12:20:24 +02:00
Enrico Turri
8a9d0023a7 Added snap to scale to rotate gizmo 2018-08-24 12:16:11 +02:00
Enrico Turri
5f6a8adf7c Modified render order of gizmos 2018-08-24 12:06:05 +02:00
Lukas Matena
e8aafd3c83 Lay flat - simple rejection of very small surfaces 2018-08-24 11:46:54 +02:00
Vojtech Kral
60a0375ff9 Firmware updater: Fix a race condition
avrdude: Handle OOM with configurable handler
2018-08-24 11:21:29 +02:00
Enrico Turri
7f542a0f85 3D gizmos grabbers always visible to picking pass 2018-08-24 11:17:53 +02:00
Enrico Turri
95ae2d715b Fixed direction of rotate gizmo around y axis 2018-08-24 10:32:05 +02:00
Enrico Turri
acdbd987f5 Use double in place of coordf_t 2018-08-24 10:20:00 +02:00
Enrico Turri
727a5fd997 Better fix for out of print volume detection 2018-08-24 10:03:34 +02:00
Enrico Turri
16259e6f26 Fixed out of print volume detection 2018-08-24 08:56:53 +02:00
Enrico Turri
7e228e6698 Fixed compile on Linux 2018-08-24 08:38:28 +02:00
Enrico Turri
66ce638439 Fixed conflicts after merging with branch eigenize 2018-08-23 15:37:38 +02:00
YuSanka
2ec045a0fb Added SetSliderValues and GetActiveValue functions 2018-08-23 14:44:49 +02:00
YuSanka
2a7059edb3 Added active icon for selected tick 2018-08-23 13:01:18 +02:00
Enrico Turri
a5fcdeec23 Merge branch 'gizmos_3d' of https://github.com/prusa3d/Slic3r into dev 2018-08-23 09:45:04 +02:00
YuSanka
8a9bdc55ee Added functions for tick adding/deleting 2018-08-22 18:00:48 +02:00
bubnikv
76d60070eb Eigenized the admesh structures
(stl_vertex, stl_normal).
2018-08-22 15:34:03 +02:00
bubnikv
6829704475 d .. 2018-08-22 15:03:35 +02:00
YuSanka
d2282c4bf9 Refactored code 2018-08-22 14:24:30 +02:00
Lukas Matena
85ae2d0d2f Merge branch 'master' into lm_lay_flat_round_merged_facets 2018-08-22 14:03:17 +02:00
Lukas Matena
0b21042606 Lay flat minor bugfix (ObjectCutDialog called a changed function using the old signature) 2018-08-22 14:02:32 +02:00
Vojtech Kral
bd667aad6e Merge branch 'duet', closes #1051 2018-08-22 12:52:15 +02:00
Enrico Turri
0924bedd28 Enhanced behaviour of scale 3D gizmo 2018-08-22 11:22:07 +02:00
Martin Loidl
43f8f10445 fixed timestamp for duet upload
* Added missing time=
2018-08-22 11:02:31 +02:00
YuSanka
a5119a41a5 Added overriding of the DoGetBestSize() to correct control sizing on OSX and Linux/GTK 2018-08-22 10:44:11 +02:00
YuSanka
5cd4597d38 Fix for last commit 2018-08-22 08:54:07 +02:00
bubnikv
ac72cd779f Replaced Point3 with Eigen Vec3crd, removed Point3 from the Perl binding. 2018-08-21 22:14:47 +02:00
bubnikv
0b5b02e002 Eradicated the Pointf class, replaced with Eigen Vector3d 2018-08-21 21:05:24 +02:00
bubnikv
cae0806112 Eradicated most of Pointf extras compared to pure Eigen::Vector2d. 2018-08-21 20:34:45 +02:00
YuSanka
bc64154f21 PrusaDoubleSlider improvement
+ OnKeyDown
+ marked selected thumb
+ marked selected control
...
2018-08-21 17:48:52 +02:00