Lars Brubaker
|
ffe200c19f
|
Made the average timer a shared resource
Put in the interface material extruder setting
|
2014-12-29 16:31:30 -08:00 |
|
Lars Brubaker
|
519c857832
|
Took out the outline stuff on android as it currently doesn't work.
|
2014-12-29 11:45:26 -08:00 |
|
Lars Brubaker
|
0761a9b75c
|
Added OpenTK as a nuget
|
2014-12-29 10:33:45 -08:00 |
|
Kevin Pope
|
6993a6541e
|
Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
|
2014-12-28 17:29:56 -08:00 |
|
Kevin Pope
|
66726af531
|
Set max height for model chooser in setup wizard.
|
2014-12-28 17:28:39 -08:00 |
|
Kevin Pope
|
27f5bcfddd
|
Adjust spacing of 3D View buttons.
|
2014-12-28 17:28:09 -08:00 |
|
Kevin Pope
|
4f546458a8
|
Ensure selection of part on load of QueueDataView.
|
2014-12-28 17:27:48 -08:00 |
|
larsbrubaker
|
5697cbae2d
|
Fixed problems introduced when directly creating from images.
|
2014-12-28 13:58:16 -08:00 |
|
larsbrubaker
|
54422e50bc
|
Reduced the drawing in part thumbnail widget a bit
Made the draw ms be averaged over 64 draws so it is easier to see.
|
2014-12-28 08:26:29 -08:00 |
|
Lars Brubaker
|
a68276154b
|
Messing with drawing the buttons.
|
2014-12-27 16:21:30 -08:00 |
|
larsbrubaker
|
0a97cf0a1d
|
Started work on z height turning controls.
|
2014-12-27 08:19:48 -08:00 |
|
Kevin Pope
|
60bc071b97
|
Merge pull request #142 from jlewin/development
Add Android ActivePrinter.ComPort override, add exception dumps to IDE w...
|
2014-12-24 12:30:02 -08:00 |
|
John Lewin
|
4456b1bfc1
|
Add Android ActivePrinter.ComPort override, add exception dumps to IDE when debugging
|
2014-12-24 12:12:11 -08:00 |
|
Kevin Pope
|
133ccd88d3
|
Add PrinterSetupStatus file to project.
|
2014-12-24 08:18:03 -08:00 |
|
Kevin Pope
|
f8d53056b4
|
Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
|
2014-12-24 08:15:12 -08:00 |
|
Kevin Pope
|
ac98f1a852
|
Move PrinterSetupStatus to a separate file.
|
2014-12-24 08:14:30 -08:00 |
|
larsbrubaker
|
9f4c463f08
|
Made the pop outs match the theme better.
|
2014-12-23 14:16:01 -08:00 |
|
larsbrubaker
|
a2aee95c56
|
less redundant code
|
2014-12-23 13:17:10 -08:00 |
|
larsbrubaker
|
f532d8cdf8
|
Made the pop up TextTab work much better
Made a PopOutManager class to make it easier to create lots of pop outs.
|
2014-12-23 12:41:56 -08:00 |
|
larsbrubaker
|
057c13d88f
|
Got it to show with the app
|
2014-12-23 08:17:57 -08:00 |
|
larsbrubaker
|
1dd3e9c2a8
|
Merge branch '1.1.4' into development
|
2014-12-22 23:12:53 -08:00 |
|
larsbrubaker
|
4914f8d4b6
|
Put in the open beam printer driver.
|
2014-12-22 23:12:29 -08:00 |
|
larsbrubaker
|
842fc9b1f0
|
Put in the open beam printer driver.
|
2014-12-22 23:03:03 -08:00 |
|
larsbrubaker
|
739ad1b86a
|
Merge branch '1.1.4' into development
|
2014-12-22 22:50:13 -08:00 |
|
larsbrubaker
|
f788ccb6cd
|
Made it so if we crash we can tell.
Made it so if we know we crashed we disable the 3d display o gcode (just in case).
We can make more crash recovery now as well.
|
2014-12-22 22:49:57 -08:00 |
|
larsbrubaker
|
a3238b4f6b
|
Putting settings into 1.1.4
|
2014-12-22 18:57:39 -08:00 |
|
larsbrubaker
|
1697622477
|
Working on App Exit detection.
|
2014-12-22 18:53:49 -08:00 |
|
Kevin Pope
|
6eccc1d8bc
|
Merge pull request #136 from gregory-diaz/development
Added new material, quality, and slice settings for 3d stuffmaker
|
2014-12-22 16:40:49 -08:00 |
|
Gregory Diaz
|
765c9e9e39
|
Added new material, quality, and slice settings for 3d stuffmaker
|
2014-12-22 16:07:42 -08:00 |
|
Kevin Pope
|
aff5d56898
|
Merge pull request #135 from gregory-diaz/development
Fixed crash on OEM builds with only one printer model
|
2014-12-22 14:55:03 -08:00 |
|
Gregory Diaz
|
499468b631
|
Fixed crash on OEM builds with only one printer model
|
2014-12-22 14:53:00 -08:00 |
|
Lars Brubaker
|
1f139cd2d2
|
put in the nuget files
|
2014-12-22 10:41:53 -08:00 |
|
Lars Brubaker
|
f005c0eb89
|
Put in nuget.
|
2014-12-22 10:39:24 -08:00 |
|
larsbrubaker
|
c550f17844
|
More working on pop out windows
|
2014-12-22 08:45:39 -08:00 |
|
larsbrubaker
|
992e6f7544
|
Made it possible to exit without saving or reloading if the part has not been edited.
|
2014-12-20 23:45:13 -08:00 |
|
Lars Brubaker
|
a994b151e5
|
Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
|
2014-12-20 16:09:13 -08:00 |
|
Lars Brubaker
|
e6deae39d4
|
Working on pop out tabs
|
2014-12-20 16:09:03 -08:00 |
|
Lars Brubaker
|
5d44d287eb
|
Merge pull request #134 from gregory-diaz/development
Development
|
2014-12-20 14:33:59 -08:00 |
|
Gregory Diaz
|
6eef38b948
|
Merge remote-tracking branch 'origin/development' into development
|
2014-12-20 14:01:47 -08:00 |
|
Gregory Diaz
|
c76c0019e3
|
Created open beam profile entry
|
2014-12-20 14:00:52 -08:00 |
|
Lars Brubaker
|
ae98ebf478
|
Added open beam.
|
2014-12-20 13:59:17 -08:00 |
|
Lars Brubaker
|
1605688d27
|
Made cancel and not save reload the part.
|
2014-12-20 11:12:02 -08:00 |
|
Gregory Diaz
|
a2f52051d1
|
Merge remote-tracking branch 'origin/development' into development
|
2014-12-20 10:31:25 -08:00 |
|
Kevin Pope
|
9797e901fb
|
Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
|
2014-12-20 09:07:40 -08:00 |
|
Kevin Pope
|
899ece89c8
|
Edit mode button cleanup.
|
2014-12-20 09:07:13 -08:00 |
|
Kevin Pope
|
54ae81a861
|
Merge pull request #132 from gregory-diaz/development
fixed make selection dropdown problem..."Select Make" is now visible aga...
|
2014-12-20 06:18:19 -08:00 |
|
Kevin Pope
|
ae35cd86a8
|
Make touch not broken.
|
2014-12-19 18:48:25 -08:00 |
|
Lars Brubaker
|
9c7c95e810
|
Merge pull request #133 from jlewin/development
Clean up project references
|
2014-12-19 16:45:08 -08:00 |
|
Lars Brubaker
|
af8e8e3298
|
More thinking on pop out tabs.
|
2014-12-19 16:43:08 -08:00 |
|
John Lewin
|
0f13167182
|
Clean up project references
|
2014-12-19 15:50:44 -08:00 |
|