bubnikv
857863102d
Merge branch 'dev_native' into vb_dev_native_background_processing
2018-10-18 18:03:17 +02:00
bubnikv
7ed2752b2b
WIP: Reconstruction of background processing update timer,
...
added unique IDs to the Model / ModelObject / ModelVolume objects,
added a copy of Model hierarchy at the Print,
WIP: new Print::apply() method to update the Print's copy of Model,
to update the Print's PrintObjects, to update status of the Print and
PrintObjects, and to possibly stop the background processing.
2018-10-17 11:12:38 +02:00
Enrico Turri
059ab4a05c
ModelInstance's full 3D transform set as default
2018-10-16 09:51:30 +02:00
Vojtech Kral
0b0e65636f
Build improvements: symlink resources properly with Visual Studio
...
Convert dependencies into a CMake build script in the `deps` dir
2018-10-15 16:47:15 +02:00
Lukas Matena
c1e6eda554
Fixed a crash when deleting an object with sla supports gizmo active
2018-10-10 13:21:14 +02:00
Lukas Matena
ced5e8540f
SLA support points are deleted when an object is cut or split
2018-10-10 11:14:09 +02:00
Lukas Matena
bf5d3ed636
SLA support points are now saved in 3MF
2018-10-05 10:13:21 +02:00
Lukas Matena
6b007986ee
SLA support points are now saved in AMF
2018-10-03 15:13:54 +02:00
Lukas Matena
e89465cc3f
Merge branch 'dev2' into lm_sla_supports_ui
2018-10-03 12:46:11 +02:00
Lukas Matena
ce5c03c894
Refactored previous commit
2018-09-26 14:37:25 +02:00
Lukas Matena
10393ba834
Flatten and SlaSupports gizmos - grabbers rendered correctly when object is dragged
2018-09-26 13:54:09 +02:00
Enrico Turri
025fdc1359
Fixed #1244 - c++ part
2018-09-26 11:24:19 +02:00
Lukas Matena
fc82aaaa2e
Merge remote-tracking branch 'origin/dev2' into lm_sla_supports_ui
2018-09-26 09:18:22 +02:00
bubnikv
6260e43f61
Merge remote-tracking branch 'origin/dev2' into dev_native
2018-09-25 15:33:51 +02:00
Enrico Turri
51cf964b51
Reduced count of opengl draw calls for full 3D transform
2018-09-25 12:15:51 +02:00
bubnikv
9a3db200a5
Updated AMF/3MF import to pass configuration into a DynamicPrintConfig
...
instead of PresetBundle.
2018-09-25 11:53:05 +02:00
Enrico Turri
a651f5f5d7
ModelInstance full 3D transform code moved into a single technology
2018-09-25 10:42:11 +02:00
Enrico Turri
0e1843a871
1st installment of ModelInstance 3D scale components
2018-09-24 15:54:09 +02:00
Enrico Turri
e3d44b07fe
Fixed arrange for objects with 3D rotations
2018-09-24 15:21:18 +02:00
Lukas Matena
a4acca24ff
Added libigl library files (header-only library)
2018-09-24 14:16:53 +02:00
Lukas Matena
9b5c7aadad
Sla support points are saved in ModelObject
2018-09-24 14:04:16 +02:00
Enrico Turri
270341300f
Code cleanup
2018-09-24 10:28:52 +02:00
Enrico Turri
1026a9c817
Tweaks to flatten gizmo
2018-09-24 10:19:40 +02:00
bubnikv
bb386bb148
Simplified dependencies.
2018-09-21 21:16:09 +02:00
bubnikv
8e1b5157b4
Moved the remaining Perl dependencies to xs/CMakeLists.txt
2018-09-21 19:37:35 +02:00
Lukas Matena
b96831529f
SLA supports points batch deletion does not deselect object
2018-09-21 16:05:02 +02:00
Lukas Matena
b539a9148a
Merge remote-tracking branch 'origin/dev2' into lm_sla_supports_ui
2018-09-21 15:46:46 +02:00
Enrico Turri
c5e56911f4
Fixed memory leak in is_splittable_object()
2018-09-21 14:21:08 +02:00
Enrico Turri
8cea821c6a
Dimensions of scale on rotate gizmo as function of object size
2018-09-21 13:44:38 +02:00
Enrico Turri
99e90f2bfb
Enhanced fix of #1229 - c++ part
2018-09-21 12:46:20 +02:00
Lukas Matena
088fe6cec6
Merge branch 'dev2' into lm_sla_supports_ui
2018-09-21 11:43:30 +02:00
Enrico Turri
a079f2a34e
Fixed import of rotations from 3mf files
2018-09-21 10:18:56 +02:00
bubnikv
20d0f046d2
Merge remote-tracking branch 'origin/dev2' into dev_native
2018-09-20 16:48:40 +02:00
bubnikv
add45a8f6e
Added C++ command line processing, thanks @alexrj and @loh
2018-09-20 16:48:13 +02:00
Enrico Turri
07274589a3
1st installment of ModelInstance 3D rotation components
2018-09-20 15:00:40 +02:00
Enrico Turri
f1e0dc2dd7
Ignore mouse up event after double click on gizmos grabbers
2018-09-20 09:50:49 +02:00
bubnikv
9c085dfcc5
Fixed Perl unit tests.
2018-09-19 18:31:41 +02:00
tamasmeszaros
2306c1589a
Polymorphic AppController for cli and gui modes.
2018-09-19 18:02:04 +02:00
bubnikv
6003005812
Removed dependency on wxWidgets from Alien.
...
Updated source code to wxWidgets 3.1.1
Moved invocation of perl unit / integration tests to the xs project.
2018-09-19 17:19:06 +02:00
Enrico Turri
c9acd1252a
reset transformation components to their default value by double clicking on gizmos' grabbers
2018-09-19 15:39:54 +02:00
Lukas Matena
195998ff7c
Sla support points can be deleted, tooltip texture was added
2018-09-19 14:59:57 +02:00
tamasmeszaros
3f0968fb02
Refactoring member variable names for my classes to match our coding style.
2018-09-19 14:54:37 +02:00
bubnikv
ffac360439
Yet another build system fix
2018-09-19 14:43:38 +02:00
tamasmeszaros
1a0b72de2c
png export recovered with the new print object interface.
2018-09-19 14:32:38 +02:00
Enrico Turri
5f587eb362
Fixed colors of extrusion paths
2018-09-19 14:11:36 +02:00
tamasmeszaros
2056f4c336
Zipper concept clarified.
2018-09-19 13:43:15 +02:00
bubnikv
58a0c41713
Fixed compilation on OSX & Linux
2018-09-19 13:12:57 +02:00
bubnikv
7374eafc13
Moved the newly added GUI_Preview files.
2018-09-19 11:34:26 +02:00
bubnikv
e8c16c35e5
Meged with dev2
2018-09-19 11:28:30 +02:00
tamasmeszaros
6b655f9aa3
Merge branch 'dev2' of github.com:prusa3d/Slic3r into dev2
2018-09-19 11:08:29 +02:00
tamasmeszaros
7708fb8ada
Zipper implementation in gui level for png export.
2018-09-19 11:08:10 +02:00
Vojtech Kral
4bf49fe990
Build: Make return value type mismatch an error on Unix
2018-09-19 11:05:48 +02:00
bubnikv
0558b53493
WIP: Moved sources int src/, separated most of the source code from Perl.
...
The XS was left only for the unit / integration tests, and it links
libslic3r only. No wxWidgets are allowed to be used from Perl starting
from now.
2018-09-19 11:02:24 +02:00
Vojtech Kral
51d504c720
Build fixes, conversion of wxString into utf-8 std::string
2018-09-19 10:55:00 +02:00
Enrico Turri
e695164451
Merge branch 'gui_preview_to_cpp' of https://github.com/prusa3d/Slic3r into dev2
2018-09-19 09:00:29 +02:00
Enrico Turri
e79b0a2f25
Code cleanup
2018-09-19 08:59:11 +02:00
tamasmeszaros
4d6fb52047
Removed explicit dependency of wxWidgets from PrintExport.hpp
2018-09-18 19:13:56 +02:00
Enrico Turri
9daae9413a
Perl version of preview removed from Slic3r
2018-09-18 16:13:18 +02:00
Enrico Turri
abdaaf6ede
Method Preview::load_print() ported to c++
2018-09-18 15:50:52 +02:00
Enrico Turri
e3e5948982
1st installment of preview ported in c++
2018-09-18 13:35:05 +02:00
tamasmeszaros
5fa99fd903
removing unnecessary artefacts FindFlann and duplicate c++11 standard definition in cmake.
2018-09-18 11:16:49 +02:00
bubnikv
3ddaccb641
Replaced CONFESS with throw std::exception in libslic3r, so now
...
libslic3r should be compilable without Perl.
2018-09-18 10:09:58 +02:00
Vojtech Bubnik
27bba45331
Fix of compilation on Linux, disabled -Wreorder
2018-09-17 17:17:38 +02:00
bubnikv
153bd108a2
WIP fix of PostProcessor on Linux
2018-09-17 15:32:54 +02:00
bubnikv
fe3b92870f
Merged with dev
2018-09-17 15:12:13 +02:00
bubnikv
d934b63424
Removed Print.pm,
...
ported execution of post processing scripts into C++ (WIP, waits for
update of boost::system module on our build server)
Removed other mention of the "Controller".
2018-09-17 12:01:02 +02:00
Lukas Matena
3957c5bd8e
Merge branch 'dev' into lm_sla_supports_ui
2018-09-17 10:42:16 +02:00
bubnikv
38028187b4
Merged with master
2018-09-17 10:38:14 +02:00
Lukas Matena
37c222a54f
Merge branch 'dev' into lm_sla_supports_ui
2018-09-17 10:26:38 +02:00
bubnikv
4ec4c9364e
Merge remote-tracking branch 'origin/support_improvements'
2018-09-14 15:12:20 +02:00
Vojtech Kral
61a6aa8692
FirmwareDialog: Add appropriate set of wildcards to the file picker
2018-09-14 15:10:50 +02:00
Vojtech Kral
7258c597b9
Fix window size persistence
...
Fixes #1116
Fixes #1175
2018-09-14 15:10:50 +02:00
Vojtech Kral
8988e8cf0a
Firmware updater: Fix MMU2 lookup wrt. other Prusa devices being connected
2018-09-14 15:10:50 +02:00
Vojtech Kral
a8c28e210d
Fix CMake string comparison issue
...
Fixes #1187
2018-09-14 15:10:50 +02:00
Vojtech Kral
646e991d4b
ConfigWizard: Properly apply gcode_flavor
...
Fixes #1138
2018-09-14 15:10:50 +02:00
bubnikv
a744ed7897
Merge remote-tracking branch 'origin/vb_slicing_fix'
2018-09-14 15:08:07 +02:00
bubnikv
7fc0b4375c
Merge remote-tracking branch 'origin/parallel_arrange'
2018-09-14 15:03:38 +02:00
bubnikv
a0e2df5dbb
Merge remote-tracking branch 'origin/lm_temperature_fix'
2018-09-14 14:56:21 +02:00
bubnikv
bd659663f8
Merge remote-tracking branch 'origin/lm_wipe_tower_consumption'
2018-09-14 14:55:43 +02:00
Enrico Turri
083a395078
Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev
2018-09-14 14:38:45 +02:00
Enrico Turri
d139274da8
Fixed gizmo move 3d axis Z
2018-09-14 14:37:13 +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
Lukas Matena
5df70752c0
Merge branch 'dev' into lm_sla_supports_ui
2018-09-14 11:38:51 +02:00
bubnikv
2c9dc4dbbf
Finished porting of the status bar to C++.
2018-09-14 10:59:50 +02:00
bubnikv
36faa090fc
Removed the Controller, Layer View, System Info, ObjectCutDialog,
...
removed unused Perl modules.
2018-09-14 10:25:20 +02:00
bubnikv
9d9e4a0f7b
WIP: Background processing.
2018-09-14 09:28:00 +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
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
bubnikv
bb70ad6090
Removed Strings.hpp, replaced with wxString
...
Fixed UTF8 rendering of status messages.
2018-09-12 13:17:47 +02:00
Lukas Matena
d9322dad95
Sla supports - moving the points
2018-09-12 12:14:20 +02:00
bubnikv
0235f1a821
Merged with dev
2018-09-12 11:59:02 +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
Lukas Matena
ccf27ae1f3
Merge branch 'dev' into lm_sla_supports_ui
2018-09-12 10:04:57 +02:00
Lukas Matena
712fef0669
Added number of toolchanges into 'Sliced info' statistics
2018-09-12 09:28:26 +02:00
Enrico Turri
00b10c7f9d
3D gizmos' grabber size as a function of selected objects size
2018-09-11 14:48:17 +02:00
bubnikv
41ce69f327
Improved constness of the Print / PrintObject / Layer ...
...
Split the wipe tower and time statistics data into separate objects.
Initial work in synchronizing the Model with the Print.
2018-09-11 14:04:47 +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
Lukas Matena
891b6a8a34
First experiments with sla supports ui
2018-09-10 12:08:57 +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
bubnikv
49697ed6aa
Replaced this->m_xxx with just m_xxx
2018-09-10 09:11:49 +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
bubnikv
6de8e21131
New support settings: "support_material_auto" controls, whether
...
the supports shall be generated automatically.
If not, only supports inside support enforcers are generated.
2018-09-07 14:53:42 +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
tamasmeszaros
1acee89006
Refinements for small item arrangement using the increased cpu power.
2018-09-07 12:03:49 +02:00
Enrico Turri
ea15475ad8
Fixed double click on gizmo overlay and toolbar
2018-09-07 12:00:04 +02:00
Enrico Turri
e9d5cd726e
Merge branch 'master' of https://github.com/prusa3d/Slic3r into dev
2018-09-07 10:32:39 +02:00
Enrico Turri
e04805eaa2
Fixed rendering of endcaps on open toolpaths
2018-09-07 10:30:13 +02:00
tamasmeszaros
ec3e1403b6
Cleaning up and fixing localization issues with AppController.
2018-09-07 10:24:05 +02:00
tamasmeszaros
ae2b4dd01c
Merge remote-tracking branch 'origin/master' into parallel_arrange
2018-09-07 09:53:32 +02:00
Martin Loidl
6960958276
minor changes for url_encode
2018-09-06 19:07:54 +02:00
YuSanka
27f196be59
Implement "Add generic" menu item like submenu instead of selection dialog
2018-09-06 16:36:10 +02:00
Enrico Turri
8460926d36
Added select by part tool to toolbar
2018-09-06 16:10:31 +02:00
bubnikv
2a81408e8b
Implemented support enforcers / blockers.
...
Reduced amount of full support interfaces similar to S3D.
2018-09-06 14:19:20 +02:00
YuSanka
4e9e59fd80
Disable "Split" menu item for non-splittable objects
2018-09-06 10:15:57 +02:00
Enrico Turri
c8f1369824
Added Vec3d ModelInstance::transform_vector() method
2018-09-06 09:16:32 +02:00
Enrico Turri
b9287d51dd
Tweaks to ModelObject::center_around_origin()
2018-09-06 08:56:33 +02:00
Martin Loidl
e1417f1827
allow whitespaces for duet upload
...
* now url_encoding characters which could not used for URLs
2018-09-05 19:55:50 +02:00
Enrico Turri
677dad0669
Object's properties updated while manipulating gizmos
2018-09-05 16:22:48 +02:00
Lukas Matena
c83a5474f6
Wipe tower extrusions are now accounted for in the filament consumption statistics
2018-09-05 15:35:35 +02:00
Enrico Turri
42567e3af2
Object's position updated on gui after displacement
2018-09-05 15:35:09 +02:00
Enrico Turri
622e86d9e4
Merge branch 'master' of https://github.com/prusa3d/Slic3r into dev
2018-09-05 15:32:12 +02:00
Enrico Turri
aef871f1a0
Another fix in flatten gizmo's flattening normal
2018-09-05 15:13:29 +02:00
Enrico Turri
df594fc5b0
Tweaks to update of object properties on gui
2018-09-05 15:09:13 +02:00
YuSanka
82838cc640
Final bug-fix for #1169 considering issue #971
2018-09-05 15:03:20 +02:00
Enrico Turri
b9e6f8f3e3
Merge branch 'master' of https://github.com/prusa3d/Slic3r into dev
2018-09-05 14:12:58 +02:00
Enrico Turri
011281068b
Fixed flatten gizmo's flattening normal
2018-09-05 14:02:08 +02:00
YuSanka
8ba48f8dc5
fixed typo-bug
2018-09-05 12:33:04 +02:00
YuSanka
f2563c4a22
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2018-09-05 12:02:52 +02:00
YuSanka
e2830dc337
Fix to last commit
2018-09-05 12:02:34 +02:00
Enrico Turri
407aee9942
Merge branch 'master' of https://github.com/prusa3d/Slic3r into dev
2018-09-05 09:51:31 +02:00
Enrico Turri
77b9982ea7
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2018-09-05 09:49:28 +02:00
Enrico Turri
f95b84e913
Fixed stl import when endsolid lines contains extra data
2018-09-05 09:49:10 +02:00
YuSanka
f67060f012
Fixed bug from issue #1169
2018-09-05 09:47:36 +02:00
Enrico Turri
d41b7a3749
Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev
2018-09-05 09:19:36 +02:00
Lukas Matena
e3de278afc
Another attempt to fix the temperature change issue
2018-09-05 09:18:42 +02:00
Enrico Turri
87c5c8e7f6
Renamed GLVolume member variables to match the corresponding ModelInstance ones
2018-09-05 09:11:58 +02:00
Enrico Turri
6b1b2bad76
Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev
2018-09-04 14:43:14 +02:00
Enrico Turri
15b1340514
Added ModelInstance::world_matrix() method and stl_transform using eigen transform
2018-09-04 14:42:14 +02:00
YuSanka
f471362e86
Added SettingsDigest
2018-09-04 13:15:27 +02:00
Enrico Turri
ab1517caf5
Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev
2018-09-04 12:41:37 +02:00
Enrico Turri
5f2afad95e
Fixed render of picking pass for flatten gizmo
2018-09-04 12:41:14 +02:00
YuSanka
af6a312fea
Fix to last commit
2018-09-04 09:25:54 +02:00
YuSanka
fb3a4015f6
Implemented "Settings to modified" as a subobject for objects and parts
2018-09-03 16:21:08 +02:00
Lukas Matena
b0216b190a
Bugfix - extruder temperature was sometimes not correctly set on the wipe tower
2018-09-03 10:15:40 +02:00
YuSanka
78cedb34d4
Fixed bug with no-slicing of some parts of the object
...
+ Removed text drawing for equal values in DoubleSlider
+ Added functions for adding of the settings item for objects
2018-09-03 09:58:35 +02:00
Enrico Turri
6a48d79b0b
Merge branch 'master' of https://github.com/prusa3d/Slic3r into dev
2018-09-03 08:35:13 +02:00
bubnikv
6a1f15823f
Merge remote-tracking branch 'origin/master' into support_improvements
2018-09-01 11:49:38 +02:00
Martin Loidl
22569de00f
fixes date for uploaded files
2018-09-01 11:23:33 +02:00
YuSanka
3075364da1
Fixed bug with crashing after part split for single material object
2018-08-31 14:15:26 +02:00
YuSanka
a3c2c511f0
Reorganized right panel
2018-08-31 13:42:53 +02:00
Enrico Turri
e79919ac2d
Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev
2018-08-31 13:32:52 +02:00
tamasmeszaros
6e2ed48e5a
Merge remote-tracking branch 'origin/feature_arrange_with_libnest2d' into dev
...
# Conflicts:
# xs/src/slic3r/AppController.cpp
2018-08-31 10:55:55 +02:00
Enrico Turri
ae9355e634
Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev
2018-08-31 08:46:47 +02:00
Enrico Turri
bb4329c8d0
Merge branch 'master' of https://github.com/prusa3d/Slic3r into dev
2018-08-31 08:33:42 +02:00
tamasmeszaros
4f53fc2a5f
Merge remote-tracking branch 'origin/cpp_progress_status_bar' into dev
...
# Conflicts:
# lib/Slic3r/GUI/MainFrame.pm
# xs/src/slic3r/AppController.cpp
# xs/src/slic3r/AppControllerWx.cpp
# xs/src/slic3r/GUI/GUI.hpp
2018-08-30 17:35:49 +02:00
bubnikv
d57725ee18
Bumped up the version number to 1.41.0 release,
...
bundled updated PrusaResearch configs.
2018-08-30 16:08:25 +02:00
YuSanka
1358c8efd2
Removed old sliders from 3DPreview
2018-08-30 15:30:31 +02:00
bubnikv
3c0060d9ac
Merge remote-tracking branch 'remotes/origin/master' into support_improvements
2018-08-30 15:24:49 +02:00
tamasmeszaros
f5b1729af3
fixing build issues
2018-08-30 12:11:52 +02:00
tamasmeszaros
15ad0ef2f2
working C++ status bar.
...
Signed-off-by: tamasmeszaros <meszaros.q@gmail.com>
2018-08-30 11:55:10 +02:00
tamasmeszaros
9e2d48ff3b
Almost working c++ status bar
...
Signed-off-by: tamasmeszaros <meszaros.q@gmail.com>
2018-08-30 11:54:08 +02:00
YuSanka
99aaedffc1
Added PrusaDoubleSlider on 3DPreview
2018-08-30 10:42:55 +02:00
Enrico Turri
3750bd781e
Enhanced gizmo scale 3D
2018-08-29 13:36:03 +02:00
Enrico Turri
4c80a104f5
Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev
2018-08-29 13:35:22 +02:00
YuSanka
6c1b52afa2
Deleted "scale" column from object list
2018-08-29 13:11:30 +02:00
Enrico Turri
67ca355912
Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev
2018-08-29 11:22:30 +02:00
YuSanka
7fd7d83470
Updated PrusaDoubleSlider icons
2018-08-29 11:21:22 +02:00