Commit graph

1880 commits

Author SHA1 Message Date
Jack Ha
4659d8616e Fixed some opengl 4.1 core vertex and fragment shaders, layerview anchor. CURA-3273 2017-02-01 16:29:21 +01:00
Jack Ha
4bb8e1b025 Converted layers3d.shader to 41core spec. Contributes to CURA-3273 2017-02-01 16:10:52 +01:00
Ghostkeeper
3aec36018f Add entry that we switched Linux to AppImage format
It was deemed worthy to mention.

Contributes to issue CURA-3048.
2017-01-31 16:54:54 +01:00
Jack Ha
aa923321f8 Fix compatibility mode layout. CURA-3273 2017-01-31 09:19:18 +01:00
Jack Ha
523211c3e8 Merge branch 'layer_view3_cleanup' into layer_view3_layout 2017-01-30 16:48:31 +01:00
Jack Ha
5a2aa8846b Added extruder count detection to layer view. CURA-3273 2017-01-30 13:29:35 +01:00
Jack Ha
d6f00a0a64 Solved merge conflict. CURA-3321 2017-01-30 11:40:53 +01:00
Jack Ha
5f6ed488d1 Layerview removed Color Only Selected Extruder, cleanup 3d shader. CURA-3273 2017-01-30 11:39:59 +01:00
Jack Ha
645d188698 Merge branch 'layer_view3_cleanup' into layer_view3_layout 2017-01-30 11:26:13 +01:00
Jack Ha
2f9618f2ad Merge branch 'master' into layer_view3_cleanup 2017-01-30 11:25:55 +01:00
Jack Ha
b1d95f3464 Layout Layer View menu, removed item, changed size. CURA-3321 2017-01-30 11:24:51 +01:00
Mark Burton
31c1684066 Merge remote-tracking branch 'upstream/master' into mb-infill-line-angles 2017-01-27 15:55:43 +00:00
Mark Burton
db3cf0c0fb Add the [int] setting type for settings that are a list of integers.
The RegExpValidator (more of a restrictor than a validator) requires the
text to start with a '[' and then have a sequence of integers separated by
commas. A trailing ']' is accepted.
2017-01-27 15:54:19 +00:00
Simon Edwards
eb43806d7a Merge branch 'master' into python_type_hinting 2017-01-27 15:37:30 +01:00
Jaime van Kessel
48e5a2237d Merge branch 'master' of github.com:Ultimaker/Cura 2017-01-27 09:33:13 +01:00
Jack Ha
bb1fa3ae04 Started changing layout of layer view. CURA-3321 2017-01-26 17:29:39 +01:00
Jaime van Kessel
d9541a08b8 3mf reader now uses fast normal calculation
CURA-3215
2017-01-26 17:27:41 +01:00
Ghostkeeper
73516fce89
Merge branch 'fieldOfView-fix_unthemed_rects' 2017-01-26 17:21:21 +01:00
fieldOfView
8d7bde02f3 Fix unslicable ("striped") model rendering and add overhang color theming 2017-01-26 11:09:09 +01:00
Ghostkeeper
b377fdd2a6 Merge branch 'fix_unthemed_rects' of https://github.com/fieldOfView/Cura into fieldOfView-fix_unthemed_rects 2017-01-26 10:56:10 +01:00
Ghostkeeper
97bcf5b490
Add new fixes for UM2 firmware in 2.4
This text is at my judgement. No marketing speak.

Contributes to issue CURA-3048.
2017-01-26 10:55:57 +01:00
Ghostkeeper
a44013d384
Add new fixes for UM2 firmware in 2.4
This text is at my judgement. No marketing speak.

Contributes to issue CURA-3048.
2017-01-25 16:30:14 +01:00
Jack Ha
7281b46118 Merge branch '2.4' 2017-01-25 15:28:56 +01:00
fieldOfView
a823980d17 Replace "transparent" Rectangles by Items 2017-01-25 15:21:37 +01:00
fieldOfView
bf3d3d46e2 Fix Rectangles that always show as white regardless of the theme 2017-01-25 15:12:57 +01:00
Jack Ha
3a2438937d Removed crappy legend 2017-01-25 12:46:07 +01:00
jack
26ad2c8f6e Merge pull request #1378 from fieldOfView/feature_layerview_legend
Layerview Legend
2017-01-25 11:53:41 +01:00
Jack Ha
a52cb2fa63 Compatibility mode scale line type colors 2017-01-25 09:48:36 +01:00
fieldOfView
878ccc679c Add a legend to Layer View 2017-01-24 23:24:52 +01:00
Jack Ha
e21a6ed62a Cleanup 2017-01-24 16:52:47 +01:00
Jack Ha
f80a04cbc3 Auto detect compatibility mode for layer view. 2017-01-24 16:31:57 +01:00
Jaime van Kessel
b284e8508a Added extra checks to prevent unneeded signal emits 2017-01-24 13:29:33 +01:00
fieldOfView
b0ea72834f Remove unused import
Remnant from another, less tidy, approach
2017-01-24 11:47:02 +01:00
fieldOfView
45c8083423 Use themeable colors in Solid, Xray & Layer view 2017-01-23 22:08:27 +01:00
Arjen Hiemstra
e9db6498ba Correctly write matrices and the cura version metadata tag
Fixes an issue with invalid 3MF files
2017-01-23 17:38:15 +01:00
Ghostkeeper
ac94413e52
Merge branch '2.4' 2017-01-23 17:19:47 +01:00
Ghostkeeper
1727b6dbe1
Add entry that we switched Linux to AppImage format
It was deemed worthy to mention.

Contributes to issue CURA-3048.
2017-01-23 17:18:46 +01:00
Jaime van Kessel
858886d6b7 Merge branch '2.4' of github.com:Ultimaker/Cura 2017-01-23 15:09:48 +01:00
Jaime van Kessel
3d58bd4d49 Workspace & load image dialog can now be resized
CURA-3247
2017-01-23 15:08:37 +01:00
Simon Edwards
cf85831d87 Also check the upgrade plugins. 2017-01-17 20:56:28 +01:00
Simon Edwards
1b43e4981e Fixes for all of the plugins. Added a script to invoke mypy. (I'm stiiiick of .bat files. They are just broken.) 2017-01-17 16:57:37 +01:00
Jack Ha
abe7a8e9a3 Merge branch 'master' into layer_view3_cleanup 2017-01-17 15:16:50 +01:00
Simon Edwards
fb70eb6813 Merge branch 'master' into python_type_hinting 2017-01-17 08:42:55 +01:00
Simon Edwards
38a7ffa7da Some fixes regarding submodules and imports. 2017-01-16 21:35:28 +01:00
Simon Edwards
16a748e0d6 Merge pull request #1326 from Ultimaker/big_flame_graph
Support for the Big Flame Graph profiler
2017-01-12 14:25:18 +01:00
Thomas Karl Pietrowski
5891709800 Using UM.Platform and correcting something minor
Since we already have UM.Platform, I think it is worth to get constancy into our code and use UM.Platform for our detection.
Additionally, I corrected the head of the file, because I think I shall mention Cura and not Uranium. I guess the plugin was moved to Cura, so this was missed.
2017-01-11 19:08:46 +01:00
awhiemstra
47be957f38 Merge pull request #1267 from alephobjects/GCODEReader_upstream
Add a Gcode reader plugin
2017-01-11 17:15:52 +01:00
Simon Edwards
a5181f157e Applied the profiler's pyqtSlot decorator to all of the code. 2017-01-10 13:35:39 +01:00
TheRikke
5ed32230f7 Fix connections to devices not based on arduino
stk500v2 failed to release the serial port on timeout.
2017-01-07 22:22:47 +01:00
Youness Alaoui
ad95f94d40 Remove redundant check 2017-01-05 13:04:56 -05:00