YuSanka
c07a193b4e
Implemented BitmapChoiseRenderer
2019-09-30 14:34:29 +02:00
YuSanka
f5593c05aa
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-09-30 14:04:45 +02:00
YuSanka
904bbcc006
Fix of SPE-1035 (Wrong filament color updating for multi-material print)
2019-09-30 13:59:26 +02:00
bubnikv
b425ee50a9
Merge remote-tracking branch 'remotes/origin/et_pull_2922'
2019-09-30 10:23:16 +02:00
Enrico Turri
7f7b3e0b0b
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion
2019-09-30 08:15:20 +02:00
Lukas Matena
5ded376fe2
An attempt to fix #2997
...
More fixes might be needed on the other platforms
2019-09-28 09:57:26 +02:00
Enrico Turri
1aa559585c
Added missing include
2019-09-27 15:26:13 +02:00
Enrico Turri
4b3eab0ed9
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion
2019-09-27 14:52:30 +02:00
Enrico Turri
f958cfd2ff
ENABLE_3DCONNEXION_DEVICES - 1st installment of support for 3Dconnexion devices
...
Implemented using hidapi library (https://github.com/libusb/hidapi ) and https://github.com/koenieee/CrossplatformSpacemouseDriver/tree/master/SpaceMouseDriver as reference
Unsolved issues:
- When manipulating the SpaceNavigator wxWidgets generates a mouse wheel event that needs to be filtered out
- wxWidgets does not detect devices being connected/disconnected to the pc
- Current state forces a continuous rendering
- Current state misses dependence on camera zoom
- Non intuitive movement limits
- Translation and rotation speed factors are hardcoded
- Number of device buttons hardcoded
2019-09-27 14:52:19 +02:00
YuSanka
c370fccd8b
Changed default values.
...
And bottle_volume is preferred to recalculation instead of bottle_weight
2019-09-27 12:08:08 +02:00
YuSanka
82bc243281
Implemented possibility to set a resin cost
2019-09-26 16:36:31 +02:00
YuSanka
1a03b664b9
Some changes for alignments in manipulation panel
2019-09-25 15:04:39 +02:00
Enrico Turri
6f8a9bc1ff
Fixed visual hints in 3D scene not disappearing when tabbing out of size z field in object manipulators sidebar
2019-09-25 13:05:18 +02:00
Lukas Matena
dbc51a140d
Fixed erroneous use of logical OR where bitwise OR was meant
...
Also, PrintBase::SlicingStatus enum had two entries assigned to 0 - removed the one that was never used
2019-09-25 12:18:30 +02:00
YuSanka
efb9ef37f6
Merge remote-tracking branch 'origin/master' into ys_manipulation_panel_rw
2019-09-25 11:33:19 +02:00
Enrico Turri
fdbe339622
Fixed gizmo scale for objects added to scene using the new context menu
2019-09-25 11:25:14 +02:00
YuSanka
6faf67d90c
Add binding for ManipulationEditors
2019-09-25 11:25:05 +02:00
Lukas Matena
7861fa5086
Whitespace changes to supress misleading indentation warnings
...
These appear in newer gcc when spaces and tabs are mixed
2019-09-24 16:01:01 +02:00
YuSanka
b2e7081d31
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-09-24 14:33:20 +02:00
YuSanka
9607fbeb6d
Fix of SPE-1027
2019-09-24 14:32:59 +02:00
Enrico Turri
2fd5044460
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-09-24 14:13:22 +02:00
Enrico Turri
7c1706f7ee
Follow-up of f4910cafed -> Fix extended to Mac
2019-09-24 14:13:03 +02:00
Lukas Matena
c1e3be9b27
MeshUtils.cpp: MeshRaycaster is now aware of the clipping plane
2019-09-24 12:58:12 +02:00
Enrico Turri
a68a72a660
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-09-24 09:11:43 +02:00
Enrico Turri
e6604afd05
#2972 - Fixed selection after adding an instance with autocenter active
2019-09-24 09:11:27 +02:00
YuSanka
a234193dea
Fixed localization for "Configuration Wizard" menu item
2019-09-23 16:29:07 +02:00
Enrico Turri
2dc9949a4c
ENABLE_ENHANCED_RELOAD_FROM_DISK set as default
2019-09-23 15:35:49 +02:00
Enrico Turri
82a52e8b21
#2922 - Port of commit: f42edd35ce by jschuh
2019-09-23 14:56:27 +02:00
YuSanka
d90a27d5f8
Merge remote-tracking branch 'origin' into ys_manipulation_panel_rw
2019-09-23 14:37:06 +02:00
YuSanka
c0c937425f
Added missed comment to 7e060f84bd
2019-09-23 14:24:53 +02:00
Enrico Turri
4a45c1aa41
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk
2019-09-23 12:34:18 +02:00
YuSanka
4e22761f95
Fix of #2977
2019-09-23 10:17:53 +02:00
Enrico Turri
c0576a8770
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk
2019-09-23 08:27:01 +02:00
Lukas Matena
656569b0e9
Fix of https://github.com/prusa3d/PrusaSlicer/issues/2953
...
printf-like function argument mismatch: num was long, which was obfuscated by the auto keyword
2019-09-20 16:47:10 +02:00
YuSanka
89ebf1f1e8
Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into dev
2019-09-20 11:30:53 +02:00
YuSanka
7e060f84bd
Forcing of explicit SetWidth for the columns under OSX, as an attempt to fix a narrow column width on 4(5)K monitors under OSX
2019-09-20 11:30:29 +02:00
Enrico Turri
d66bf7e1e1
Follow-up of 8aaff08355 -> Do not show the new context menu when the user pans the scene + cleanup
2019-09-20 11:19:06 +02:00
Lukas Matena
abaebb489a
Added a config option to not print sparse layers on the wipe tower
2019-09-20 10:54:20 +02:00
YuSanka
a27026aa03
Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into dev
2019-09-20 09:58:33 +02:00
YuSanka
8aaff08355
Added Possibility to create "shape" as an independent object from 3dScene,
...
using right click on empty place
2019-09-20 09:57:27 +02:00
Enrico Turri
9e09c52ab0
#2948 - Max zoom takes in account custom bed model size
2019-09-20 09:53:35 +02:00
bubnikv
110d5b9d56
Merge branch 'dev' of https://github.com/Prusa3d/PrusaSlicer into dev
2019-09-19 17:16:43 +02:00
bubnikv
6ce1011a09
Slic3r -> PrusaSlicer in config snapshot dialog.
2019-09-19 17:16:37 +02:00
YuSanka
e34ef1dd07
Merge remote-tracking branch 'origin/dev' into ys_manipulation_panel_rw
2019-09-19 15:39:13 +02:00
YuSanka
29f3c938e6
Fix of SPE-1026 (Height range value works differently if you press enter and if you leave textbox)
...
Related to GH #2946
2019-09-19 15:28:36 +02:00
YuSanka
381735581b
Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into dev
2019-09-19 14:12:12 +02:00
YuSanka
ddf37d3b01
Fix under OSX for 584b37513f
2019-09-19 14:11:56 +02:00
Enrico Turri
0de8245432
Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into dev
2019-09-19 14:03:05 +02:00
Enrico Turri
355a7d6a8c
Fixed empty filename when trying to export a plate where no object is selected and no object is printable
2019-09-19 14:01:17 +02:00
Enrico Turri
74747226f7
ENABLE_ENHANCED_RELOAD_FROM_DISK
...
1) Modified .zip.amf import/export to save/load volume matrices and source data
2) Incremented .zip.amf version to 3
2019-09-19 12:39:59 +02:00