Commit graph

3151 commits

Author SHA1 Message Date
Lars Brubaker
0587fb2d23 ran code maid. 2015-11-23 10:49:08 -08:00
Lars Brubaker
f73d3b7eb9 latest ms 2015-11-20 17:28:57 -08:00
Lars Brubaker
743e8c70ab latest ms 2015-11-19 18:02:40 -08:00
johnlewin
fa7b0421e1 Merge pull request #462 from jlewin/master
Add .vs/ to ignore file
2015-11-19 17:18:46 -08:00
John Lewin
647cbad1ec Add .vs/ to ignore file 2015-11-19 17:17:11 -08:00
johnlewin
0f2b2b9624 Merge pull request #454 from gregory-diaz/master
Added more automated Local Library Tests
2015-11-19 15:59:53 -08:00
Gregory Diaz
ce835942d3 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2015-11-19 15:50:39 -08:00
johnlewin
ded87078b2 Merge pull request #461 from jlewin/master
Apply whitelist
2015-11-19 15:30:36 -08:00
John Lewin
06e98e8248 Apply whitelist 2015-11-19 13:54:37 -08:00
Gregory Diaz
5f3338879c Added tests for Adding single/multiple Local Library Items to Queue. Also Added tests for making sure Library Item View button opens Part Preview Window 2015-11-18 15:28:50 -08:00
Gregory Diaz
3accc83de5 Added new profiles for Ultimaker printers. 2015-11-18 11:42:00 -08:00
Gregory Diaz
28434ce40d Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2015-11-18 11:37:54 -08:00
Lars Brubaker
9233b273c8 Try to move to the seam hiding position as soon as possible to help the outside edge quality. 2015-11-18 09:58:14 -08:00
Lars Brubaker
05e41e85c1 Working on creating a GCodeFile proxy to add generator type functionality. 2015-11-17 18:24:41 -08:00
johnlewin
fd6640162f Merge pull request #459 from jlewin/master
Fix casing
2015-11-17 12:53:37 -08:00
Tyler Anderson
05e4355616 Fix casing 2015-11-17 12:51:30 -08:00
larsbrubaker
491cebe864 Merge branch 'master' of https://github.com/MatterHackers/MatterControl
Conflicts:
	Submodules/agg-sharp
2015-11-17 07:08:17 -08:00
Lars Brubaker
26295923df Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2015-11-16 18:01:45 -08:00
Lars Brubaker
ec15e7b14b Tracking performance a bit better. 2015-11-16 18:01:25 -08:00
Lars Brubaker
9a90881be0 Merge pull request #457 from mmoening/master
Implemented scrolling in the terminal widget
2015-11-16 12:31:58 -08:00
Matt Moening
a4f24af5a8 Implemented scrolling in the terminal widget 2015-11-16 12:27:31 -08:00
Lars Brubaker
4bd28d9155 Make 7 and 13 point not run if it has not be initialized. 2015-11-16 12:01:37 -08:00
Lars Brubaker
d06a276c32 Attempting to fix a bug with homing not being immediately accounted for before relative movement in 7 and 13 point print leveling. 2015-11-16 11:55:07 -08:00
larsbrubaker
1dae8693b4 Using the new data converters (same functions) to create extrusion.
Moving code out of RenderOpenGl into more appropriate classes
More work on pathing demo
2015-11-15 07:24:54 -08:00
larsbrubaker
3192c5b253 Merge remote-tracking branch 'origin/1.4.0' 2015-11-14 07:27:57 -08:00
johnlewin
54bc63aad8 Merge pull request #455 from jlewin/master
Handle missing ManufacturerNameMapping data from settings.json
2015-11-13 18:31:00 -08:00
John Lewin
70f3b7df68 Handle missing ManufacturerNameMapping data from settings.json 2015-11-13 18:29:39 -08:00
Gregory Diaz
3172da7b55 Added more automated Local Library Tests 2015-11-13 18:06:44 -08:00
Lars Brubaker
797f6166a9 latest agg and ms 2015-11-13 16:08:18 -08:00
johnlewin
419961d8ef Merge pull request #453 from gregory-diaz/master
Added some automated tests around Local Library functionality
2015-11-13 13:08:53 -08:00
Gregory Diaz
cf4cd4c693 Added requested changes for ME3D 2015-11-13 12:46:38 -08:00
Gregory Diaz
66dc5b9a57 Added some automated tests around Local Library functionality 2015-11-13 11:57:19 -08:00
Lars Brubaker
9b3a34257c ability to set line width in graphics 2d
Better bed coordinate rendering.
2015-11-13 11:16:59 -08:00
johnlewin
bf2f291325 Merge pull request #452 from jlewin/master
User configurable library folders
2015-11-12 11:46:07 -08:00
John Lewin
3a59bf7c6b User configurable library folders 2015-11-12 11:45:03 -08:00
johnlewin
4aa45030c6 Merge pull request #451 from jlewin/master
Suppress error reporting and abort on COM AccessDenied errors
2015-11-12 11:23:49 -08:00
John Lewin
9463d64d22 Suppress error reporting and abort on COM AccessDenied errors
- Fixes #108023844
 - Revise whitespace
 - Refactor to use optional BreakInDebugger parameter
2015-11-12 11:20:22 -08:00
johnlewin
42d33e8b43 Merge pull request #450 from jlewin/master
Revise projection to include file extension
2015-11-10 15:34:57 -08:00
John Lewin
3406f1ce57 Revise projection to include file extension 2015-11-10 15:33:16 -08:00
Lars Brubaker
c97574662f Making gl rendering of grid a bit faster. 2015-11-10 15:07:01 -08:00
johnlewin
07e95a7882 Merge pull request #449 from jlewin/master
Calibration filesync fixes
2015-11-10 13:55:53 -08:00
John Lewin
d26a163ba2 Only add the first matching item
- Move LibraryProvider creation outside of foreach loop
 - Fixes #107851232, #107860700
2015-11-10 13:53:22 -08:00
John Lewin
beffdda91e Drop file extension before performing string match
- Fixes #107851156
2015-11-10 13:01:27 -08:00
Lars Brubaker
9a77adc853 Merge branch '1.4.1'
Conflicts:
	Submodules/agg-sharp
2015-11-10 12:00:17 -08:00
Lars Brubaker
1d7aa5d825 latest matter slice and agg. 2015-11-10 11:55:28 -08:00
Lars Brubaker
a0fd4f170d fling threshold not working on touch. Took it out for now. 2015-11-10 09:47:31 -08:00
Lars Brubaker
7f866f83dd better fling speeds. 2015-11-10 09:25:43 -08:00
larsbrubaker
15a8e38834 Correct time evaluation 2015-11-09 19:33:13 -08:00
larsbrubaker
3b42cfd3cd Merge branch '1.4.1' 2015-11-09 19:27:41 -08:00
larsbrubaker
d74bb8dd46 Made it possible to stop the part and have it not spin.
Fixed a typo
2015-11-09 19:26:38 -08:00