Enrico Turri
|
083a395078
|
Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev
|
2018-09-14 14:38:45 +02:00 |
|
Enrico Turri
|
eac5272dc5
|
Merge branch 'full_transform' of https://github.com/prusa3d/Slic3r into dev
|
2018-09-14 14:38:21 +02:00 |
|
Enrico Turri
|
d139274da8
|
Fixed gizmo move 3d axis Z
|
2018-09-14 14:37:13 +02:00 |
|
YuSanka
|
2ea5c77e39
|
Merge remote-tracking branch 'origin/dev' into new_main_page_ui
|
2018-09-14 14:01:11 +02:00 |
|
YuSanka
|
eb2b56a87f
|
Fixed settings list for objects
+ fixed showing of an info_manifold_warning_icon
|
2018-09-14 13:59:56 +02:00 |
|
Enrico Turri
|
b3c30a08b0
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into full_transform
|
2018-09-14 12:47:42 +02:00 |
|
Enrico Turri
|
d3a36f98a0
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into dev
|
2018-09-14 12:47:16 +02:00 |
|
Enrico Turri
|
578792be31
|
Fixed #1229
|
2018-09-14 11:37:26 +02:00 |
|
Enrico Turri
|
7ef1eb306a
|
Merge branch 'dev' of https://github.com/prusa3d/Slic3r into full_transform
|
2018-09-14 08:51:06 +02:00 |
|
YuSanka
|
3903ca64d7
|
Added strings for correct volume selection
|
2018-09-13 16:20:16 +02:00 |
|
YuSanka
|
a31ac857ef
|
Merge remote-tracking branch 'origin/dev' into new_main_page_ui
|
2018-09-13 16:12:07 +02:00 |
|
Enrico Turri
|
0041d6ab2f
|
Merge branch 'dev' of https://github.com/prusa3d/Slic3r into full_transform
|
2018-09-13 16:10:47 +02:00 |
|
YuSanka
|
06f395641b
|
Object selection (from object list to 3DScene)
|
2018-09-13 16:09:57 +02:00 |
|
Enrico Turri
|
b779c6492e
|
Added method int GLCanvas3D::get_in_object_volume_id(int scene_vol_idx) const
|
2018-09-13 16:09:46 +02:00 |
|
Enrico Turri
|
3faaff85d5
|
Code cleanup
|
2018-09-13 16:08:19 +02:00 |
|
Enrico Turri
|
af19713a27
|
1st installment of 3d offset for ModelInstance
|
2018-09-13 15:15:00 +02:00 |
|
tamasmeszaros
|
bef19fe6da
|
Merge remote-tracking branch 'origin/dev' into feature_arrange_with_libnest2d
|
2018-09-13 12:10:59 +02:00 |
|
Enrico Turri
|
2e734720b5
|
GLCanvas3D child classes/structures set as private
|
2018-09-13 08:35:26 +02:00 |
|
YuSanka
|
77e09e683d
|
Fixed bug with PrusaDataViewBitmapText ctor on Linux
+ Cleaned code from unusable comments
|
2018-09-12 13:22:13 +02:00 |
|
YuSanka
|
6d499525ee
|
Merge remote-tracking branch 'origin/dev' into new_main_page_ui
|
2018-09-12 11:33:38 +02:00 |
|
YuSanka
|
fc5d62e76e
|
Try to render wxBitmap instead of wxIcon in wxDataViewCtrl
|
2018-09-12 11:29:59 +02:00 |
|
Enrico Turri
|
0f4a2ee69a
|
Fixed size of scale 3d gizmo reference box
|
2018-09-12 10:56:39 +02:00 |
|
Enrico Turri
|
00b10c7f9d
|
3D gizmos' grabber size as a function of selected objects size
|
2018-09-11 14:48:17 +02:00 |
|
YuSanka
|
dbf18ed8d4
|
Another try to fix IconRendering on OSX
|
2018-09-11 12:44:27 +02:00 |
|
Enrico Turri
|
a97df55592
|
Temporary remove not yet supported transformations from 3D gizmos
|
2018-09-11 12:40:42 +02:00 |
|
tamasmeszaros
|
3c6afedcb1
|
Merge remote-tracking branch 'origin/dev' into feature_arrange_with_libnest2d
|
2018-09-11 12:38:29 +02:00 |
|
tamasmeszaros
|
6106ce9ff0
|
Abort semantics added.
Signed-off-by: tamasmeszaros <meszaros.q@gmail.com>
|
2018-09-11 12:36:24 +02:00 |
|
YuSanka
|
73ee3f77c3
|
Merge remote-tracking branch 'origin/dev' into new_main_page_ui
|
2018-09-11 11:49:36 +02:00 |
|
YuSanka
|
775b86a3d8
|
Fix to last commit (vertical expanding of the icon to correct rendering on OSX)
|
2018-09-11 11:39:13 +02:00 |
|
YuSanka
|
e3bb829e42
|
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 |
|
Enrico Turri
|
4479c5444a
|
1st installment of gizmo move 3D
|
2018-09-11 09:00:28 +02:00 |
|
Enrico Turri
|
781df150a1
|
Added perl callback for gizmo flatten
|
2018-09-10 14:10:08 +02:00 |
|
YuSanka
|
9c433f8e08
|
Try to fix AddSettingsChild on OSX
|
2018-09-10 13:59:44 +02:00 |
|
Enrico Turri
|
1516c46d0b
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into dev
|
2018-09-10 13:49:25 +02:00 |
|
Enrico Turri
|
78bc688a7f
|
Fixed compile on Linux
|
2018-09-10 13:48:35 +02:00 |
|
Enrico Turri
|
333bc1523a
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into dev
|
2018-09-10 13:19:53 +02:00 |
|
Enrico Turri
|
be508b003a
|
Fixed #1211
|
2018-09-10 13:15:12 +02:00 |
|
YuSanka
|
e914a719f8
|
Added printfs for code debugging on OSX
|
2018-09-10 12:17:41 +02:00 |
|
Enrico Turri
|
d8936b1ad8
|
Another partial refactoring of 3d gizmos
|
2018-09-10 11:58:24 +02:00 |
|
Enrico Turri
|
5e8bd47988
|
Partial refactoring of 3d gizmos
|
2018-09-10 10:01:49 +02:00 |
|
YuSanka
|
a59a84f237
|
Experiment with icon size
|
2018-09-10 09:28:37 +02:00 |
|
YuSanka
|
b7effbde17
|
Fixed typo for last commit
|
2018-09-07 16:29:16 +02:00 |
|
YuSanka
|
810b48887d
|
Fixed Adding generic modifiers on GTK & OSX
+ Try to fix correct settings adding on GTK & OSX
+ Fixed Linux compilation
|
2018-09-07 16:16:11 +02:00 |
|
Enrico Turri
|
df320523b1
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into dev
|
2018-09-07 16:07:16 +02:00 |
|
Enrico Turri
|
62894d3f7b
|
Export the first M73 line to gcode before custom gcode
|
2018-09-07 16:05:10 +02:00 |
|
Enrico Turri
|
e1deb03d3c
|
Added perl callback for three doubles
|
2018-09-07 14:21:04 +02:00 |
|
Enrico Turri
|
775ec1b546
|
Tweaks to gizmo scale 3D
|
2018-09-07 13:40:26 +02:00 |
|
Enrico Turri
|
d39ed75148
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into dev
|
2018-09-07 13:37:53 +02:00 |
|
Vojtech Kral
|
00c51e06ed
|
Merge pull request #1195 from mloidl/duet_whitespace
duet upload: allow whitespaces in filenames
|
2018-09-07 13:05:37 +02:00 |
|
Enrico Turri
|
ada6dba00b
|
Selection of picking color for gizmo grabber moved into GLGizmoBase
|
2018-09-07 12:20:56 +02:00 |
|