|
|
bb4150aa67
|
Merged with master
|
2018-09-17 10:38:14 +02:00 |
|
|
|
033060cfaa
|
Merge remote-tracking branch 'origin/support_improvements'
|
2018-09-14 15:12:20 +02:00 |
|
|
|
04104300c7
|
FirmwareDialog: Add appropriate set of wildcards to the file picker
|
2018-09-14 15:10:50 +02:00 |
|
|
|
8ed4843d5a
|
Fix window size persistence
Fixes #1116
Fixes #1175
|
2018-09-14 15:10:50 +02:00 |
|
|
|
a69a3bc90a
|
Firmware updater: Fix MMU2 lookup wrt. other Prusa devices being connected
|
2018-09-14 15:10:50 +02:00 |
|
|
|
8b65b46546
|
Fix CMake string comparison issue
Fixes #1187
|
2018-09-14 15:10:50 +02:00 |
|
|
|
9aea03f224
|
ConfigWizard: Properly apply gcode_flavor
Fixes #1138
|
2018-09-14 15:10:50 +02:00 |
|
|
|
8946dba9a0
|
Merge remote-tracking branch 'origin/vb_slicing_fix'
|
2018-09-14 15:08:07 +02:00 |
|
|
|
d5d73b674b
|
Merge remote-tracking branch 'origin/parallel_arrange'
|
2018-09-14 15:03:38 +02:00 |
|
|
|
b9f3fcc678
|
Merge remote-tracking branch 'origin/lm_temperature_fix'
|
2018-09-14 14:56:21 +02:00 |
|
|
|
e766fb6545
|
Merge remote-tracking branch 'origin/lm_wipe_tower_consumption'
|
2018-09-14 14:55:43 +02:00 |
|
|
|
0131d86288
|
Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev
|
2018-09-14 14:38:45 +02:00 |
|
|
|
f37d379efc
|
Merge branch 'full_transform' of https://github.com/prusa3d/Slic3r into dev
|
2018-09-14 14:38:21 +02:00 |
|
|
|
4812e470b0
|
Fixed gizmo move 3d axis Z
|
2018-09-14 14:37:13 +02:00 |
|
|
|
a2ee22a617
|
Merge remote-tracking branch 'origin/dev' into new_main_page_ui
|
2018-09-14 14:01:11 +02:00 |
|
|
|
9ac2085a08
|
Fixed settings list for objects
+ fixed showing of an info_manifold_warning_icon
|
2018-09-14 13:59:56 +02:00 |
|
|
|
0fbd706963
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into full_transform
|
2018-09-14 12:47:42 +02:00 |
|
|
|
5f37a30706
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into dev
|
2018-09-14 12:47:16 +02:00 |
|
|
|
317610809b
|
Fixed #1229
|
2018-09-14 11:37:26 +02:00 |
|
|
|
2c72a40e49
|
Merge branch 'dev' of https://github.com/prusa3d/Slic3r into full_transform
|
2018-09-14 08:51:06 +02:00 |
|
|
|
7654f284bb
|
Added strings for correct volume selection
|
2018-09-13 16:20:16 +02:00 |
|
|
|
95dfef0d18
|
Merge remote-tracking branch 'origin/dev' into new_main_page_ui
|
2018-09-13 16:12:07 +02:00 |
|
|
|
a023898422
|
Merge branch 'dev' of https://github.com/prusa3d/Slic3r into full_transform
|
2018-09-13 16:10:47 +02:00 |
|
|
|
9227abaed2
|
Object selection (from object list to 3DScene)
|
2018-09-13 16:09:57 +02:00 |
|
|
|
52fff09f3a
|
Added method int GLCanvas3D::get_in_object_volume_id(int scene_vol_idx) const
|
2018-09-13 16:09:46 +02:00 |
|
|
|
8a60cfe1ff
|
Code cleanup
|
2018-09-13 16:08:19 +02:00 |
|
|
|
e4917ade5e
|
1st installment of 3d offset for ModelInstance
|
2018-09-13 15:15:00 +02:00 |
|
|
|
09b2cf5674
|
Merge remote-tracking branch 'origin/dev' into feature_arrange_with_libnest2d
|
2018-09-13 12:10:59 +02:00 |
|
|
|
1ceb53b632
|
GLCanvas3D child classes/structures set as private
|
2018-09-13 08:35:26 +02:00 |
|
|
|
cebef83502
|
Fixed bug with PrusaDataViewBitmapText ctor on Linux
+ Cleaned code from unusable comments
|
2018-09-12 13:22:13 +02:00 |
|
|
|
ce8eba0224
|
Merge remote-tracking branch 'origin/dev' into new_main_page_ui
|
2018-09-12 11:33:38 +02:00 |
|
|
|
753349157d
|
Try to render wxBitmap instead of wxIcon in wxDataViewCtrl
|
2018-09-12 11:29:59 +02:00 |
|
|
|
2ff93e3a0e
|
Fixed size of scale 3d gizmo reference box
|
2018-09-12 10:56:39 +02:00 |
|
|
|
0dc72ccbd8
|
Added number of toolchanges into 'Sliced info' statistics
|
2018-09-12 09:28:26 +02:00 |
|
|
|
2a689c0025
|
3D gizmos' grabber size as a function of selected objects size
|
2018-09-11 14:48:17 +02:00 |
|
|
|
dcf67876dd
|
Another try to fix IconRendering on OSX
|
2018-09-11 12:44:27 +02:00 |
|
|
|
cb19c0a19f
|
Temporary remove not yet supported transformations from 3D gizmos
|
2018-09-11 12:40:42 +02:00 |
|
|
|
2ca190feeb
|
Merge remote-tracking branch 'origin/dev' into feature_arrange_with_libnest2d
|
2018-09-11 12:38:29 +02:00 |
|
|
|
efbf139466
|
Abort semantics added.
Signed-off-by: tamasmeszaros <meszaros.q@gmail.com>
|
2018-09-11 12:36:24 +02:00 |
|
|
|
9601901d1a
|
Merge remote-tracking branch 'origin/dev' into new_main_page_ui
|
2018-09-11 11:49:36 +02:00 |
|
|
|
69cff8af8b
|
Fix to last commit (vertical expanding of the icon to correct rendering on OSX)
|
2018-09-11 11:39:13 +02:00 |
|
|
|
dd29c2921b
|
Try to use PrusaIconTextRenderer(CustomRenderer) for IconText Rendering
+ experiments with button's color
+ removed "strange control part" from topLeft corner of the right panel
|
2018-09-11 09:51:56 +02:00 |
|
|
|
912df7c914
|
1st installment of gizmo move 3D
|
2018-09-11 09:00:28 +02:00 |
|
|
|
c78432f355
|
Added perl callback for gizmo flatten
|
2018-09-10 14:10:08 +02:00 |
|
|
|
e2a90b9795
|
Try to fix AddSettingsChild on OSX
|
2018-09-10 13:59:44 +02:00 |
|
|
|
70b911eb7a
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into dev
|
2018-09-10 13:49:25 +02:00 |
|
|
|
bac64d6010
|
Fixed compile on Linux
|
2018-09-10 13:48:35 +02:00 |
|
|
|
5979a78502
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into dev
|
2018-09-10 13:19:53 +02:00 |
|
|
|
30ed7fa36e
|
Fixed #1211
|
2018-09-10 13:15:12 +02:00 |
|
|
|
e0ff0e9663
|
Added printfs for code debugging on OSX
|
2018-09-10 12:17:41 +02:00 |
|
