0f35a95d75
Merge remote-tracking branch 'origin/master' into ys_bugfixing
2019-06-24 13:13:34 +02:00
14d8621ffe
Color_print issues :
...
- fixed #1933
- implemented thumb moving to the mouse click position
- implemented "discard color changes" button
2019-06-24 13:11:18 +02:00
75ed542686
Reformatted MTUtils with some refined directives.
...
Only whitespace changes in MTUtils.hpp !
2019-06-24 13:03:46 +02:00
121b6c078b
Print bed not considered as object in arrange anymore.
2019-06-24 13:01:52 +02:00
fab3634931
#2395 - Reworked logic of method Model::convert_multipart_object()
2019-06-24 12:43:18 +02:00
1459ad65c6
#2433 - Time Estimator: clamp accelerate/decelerate distances to avoid them to become negative
2019-06-24 12:35:20 +02:00
6b0d75127b
#2428
...
1) Reworked logic for pasting volumes
2) Fixed paste of volumes into different objects
3) Do not apply offset when pasting into the copied object
4) Keep source transformation matrix and relative positions when copy/pasting volumes into another object
2019-06-24 12:26:11 +02:00
1c895ee6a0
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-06-24 11:23:43 +02:00
38d5817bc9
Disabled ENABLE_CAMERA_STATISTICS
2019-06-24 11:23:25 +02:00
1eb7634af7
Merge branch 'updating': Index installation
2019-06-24 11:09:55 +02:00
767dcb9607
Merge branch 'bugfixes': Fixes in fw updater UI
2019-06-24 11:09:07 +02:00
5766e9e915
Fixed conflicts after merge with branch et_perpsective_camera
2019-06-24 11:08:42 +02:00
00b9a3ad32
ENABLE_COMPRESSED_TEXTURES set as default
2019-06-24 09:54:58 +02:00
8b3d88bc0a
Adaptive perspective camera frustrum
2019-06-24 09:38:46 +02:00
301eda7369
ENABLE_TEXTURES_MAXSIZE_DEPENDENT_ON_OPENGL_VERSION set as default
2019-06-24 09:27:19 +02:00
96276394d1
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_experiments
2019-06-24 08:15:41 +02:00
503212181c
Updating: Index installation
...
Prevents cancelled updates from popping up repeatedly
on each application startup
2019-06-20 14:26:29 +02:00
9c0554a33b
Merge branch 'tm_igl_into_deps'
2019-06-20 13:00:22 +02:00
fe395546f0
Added "info" tooltip for a LockButton on Manipulation panel ( #2539 )
2019-06-20 12:56:23 +02:00
b8f9d2e2d8
Update default igl dependency to header-only.
2019-06-20 12:54:43 +02:00
bb58d0fb69
Add some missing methods into the igl patch.
...
Also, make the static igl dep build the default.
2019-06-20 14:15:36 +02:00
8208da0a7b
Firmware updater: Fix MMU flashing in GUI
2019-06-20 11:17:35 +02:00
09da7a84b5
Firmware updater: Prevent empty flashing jobs
2019-06-20 11:17:35 +02:00
e5be8adadf
Fixed build on MacOS
2019-06-20 11:05:05 +02:00
b7f67369c9
Serialized camera type and fixed Mac build
2019-06-20 10:02:52 +02:00
6af69667a3
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera
2019-06-20 08:51:08 +02:00
09f4831f4e
Merge remote-tracking branch 'origin/master' into ys_bugfixing
2019-06-19 16:32:40 +02:00
7f8bb94a55
Fixed wxEVT_CHAR handling for DoubleSlider
2019-06-19 16:28:56 +02:00
8ffd79cdd8
Fix for debug build on Visual Studio
2019-06-19 16:23:53 +02:00
2ae2672ee9
Building igl statically and moving to the dep scripts
...
Fixing dep build script on Windows and removing some warnings.
Use bundled igl by default.
Not building with the dependency scripts if not explicitly stated. This way, it will stay in
Fix the libigl patch to include C source files in header only mode.
2019-06-19 14:52:55 +02:00
5dcc6c7f36
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera
2019-06-19 14:33:31 +02:00
b91b94ad3c
Key K set as camera type toggle and updated keyboard shortcuts dialog
2019-06-19 14:33:09 +02:00
da8179d9c7
More camera related functionalities moved from GLCanvas3D to Camera
2019-06-19 14:18:51 +02:00
89e39e3895
Eliminate magic constant
2019-06-19 13:19:11 +02:00
1e7b5c5a81
Merge branch 'tm_rotcalipers'
2019-06-19 13:11:18 +02:00
a3e6412113
Enabled perspective camera
2019-06-19 13:01:18 +02:00
670a563226
Fix for issue #2536
2019-06-19 12:04:11 +02:00
4a71c42f9b
Merge branch 'master' into tm_rotcalipers
2019-06-19 11:07:21 +02:00
b0b54ed0e6
Fixed flickering of 3D view when moving objects on NVIDIA graphic cards
2019-06-19 11:05:34 +02:00
a15cb597ab
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera
2019-06-19 10:35:27 +02:00
78610de473
Fix build on vs2013
...
Fix 2 for vs2013
2019-06-19 10:18:51 +02:00
28dd52d88b
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera
2019-06-19 08:17:58 +02:00
967dba2b90
Merge branch 'tm_sla_printer_mirror'
2019-06-18 17:58:23 +02:00
2d1f13620c
Merge branch 'tm_ui_jobs'
2019-06-18 17:55:56 +02:00
b4ef812d32
Merge branch 'master' into tm_sla_printer_mirror
2019-06-18 17:42:10 +02:00
18bbf493c1
Merge branch 'master' into tm_ui_jobs
2019-06-18 16:26:56 +02:00
468516aa31
Apply fixes for the ui jobs.
...
- Localization
- Mutual exclusion (ExclusiveJobGroup), only one UI job can run at a time, and background processing is stopped
- m_range not used for finalization anymore
- stop_jobs called before Window is closed
2019-06-18 16:24:30 +02:00
b001eca21f
#2528 - New project command automatically switches to 3D editor view
2019-06-18 14:45:10 +02:00
d60ecb3788
Merge remote-tracking branch 'origin/master' into tm_ui_jobs
2019-06-18 12:16:24 +02:00
917702f252
Fixed DoubleSlider manipulation from Preview scene
2019-06-18 11:40:26 +02:00
