nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1053 commits 1 branch 0 tags 103 MiB
Commit graph

1053 commits

This branch
This branch
All branches
Author SHA1 Message Date
larsbrubaker
c7a6281eb5 Put back in windows file dialog dependency. 2014-10-09 15:22:04 -07:00
Kevin Pope
a6bf457a54 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-10-09 14:31:29 -07:00
Kevin Pope
c921bd361d Fix async settings load from ini file. 2014-10-09 14:30:59 -07:00
larsbrubaker
c7eb0c9813 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-10-09 14:11:02 -07:00
larsbrubaker
d8010a3116 We can select parts again. 
We don't automatically change the selected mouse state.
 2014-10-09 14:10:17 -07:00
Kevin Pope
b709027236 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-10-09 12:24:18 -07:00
Kevin Pope
3f0850a752 UI related updates. Work on formatting of print history and print library items. Made slice settings import work asynchronously. 2014-10-09 12:23:31 -07:00
larsbrubaker
7afaf66fb4 Merge remote-tracking branch 'Greg/development' into development 2014-10-09 11:31:11 -07:00
larsbrubaker
9270596726 Merge remote-tracking branch 'origin/1.1.3' into development 2014-10-09 11:30:39 -07:00
larsbrubaker
6f0b231c24 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-10-09 11:29:56 -07:00
larsbrubaker
2d3d26a68d Working to get the collision stuff working with mesh groups 
Put in the RomotingLite project to start on TigerSong
 2014-10-09 11:29:33 -07:00
gregory-diaz
84f7f438bc Merge branch 'development' of https://github.com/gregory-diaz/MatterControl into development 2014-10-09 11:17:20 -07:00
gregory-diaz
34f5edfee0 Cleaned up Static Data removed the extra Revolution3D Profile, and corrected the spelling of Velleman in printer white list 2014-10-09 11:16:42 -07:00
Kevin Pope
0efbaacd9f Merge commit '7985254f99' into development 2014-10-09 10:33:19 -07:00
Kevin Pope
67b4749063 Fix solution version. 2014-10-08 19:15:04 -07:00
gregory-diaz
4129d97e96 Added Printer profile for Organic Thinking Systems 2014-10-08 16:43:05 -07:00
larsbrubaker
2783f79818 Merge remote-tracking branch 'Greg/development' into development 2014-10-08 16:35:36 -07:00
larsbrubaker
3a39e79580 Got the rotate and scale working again (with groups) 
Took out some dead code.
Making going into edit mode not do any work.
Changing split to group and ungroup
 2014-10-08 16:34:25 -07:00
gregory-diaz
1066a5a996 Added printer profile for Organic Thinking System 2014-10-08 16:09:13 -07:00
gregory-diaz
4873daeee3 add to library form queue functionality 2014-10-08 16:09:11 -07:00
gregory-diaz
bda4986da2 Added class for new theme selector window that will link to the Configuration tab. UI is mostly done, code needs to be formatted more coherently, and save theme functionality is not there! 2014-10-08 16:09:08 -07:00
gregory-diaz
7985254f99 Merge remote-tracking branch 'upstream/development' into development 2014-10-08 14:28:55 -07:00
gregory-diaz
31a6ad3c78 Added printer profile for Organic Thinking System 2014-10-08 14:24:21 -07:00
larsbrubaker
eff820f567 Turned on avaid_crossing_perimeters by default. 2014-10-08 11:28:59 -07:00
larsbrubaker
158ec2c0dd MatterControl is compiling with the new MeshGroups code. 2014-10-07 18:00:17 -07:00
larsbrubaker
de16a4d30f Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-10-05 21:16:21 -07:00
larsbrubaker
6a2b5e4a55 Made amf preview work 2014-10-05 21:16:02 -07:00
kevinepope
6443b1f82a Add remove action to queue items. 2014-10-05 18:36:14 -07:00
kevinepope
53551add48 More work on Library. Edit mode now contains export and edit functions (during single selection). 2014-10-05 18:12:37 -07:00
kevinepope
bacd85da89 Added sliding action buttons to PrintLibrary and Print History. 
Made it possible to open part preview directly into 'Edit' mode.
 2014-10-05 16:07:06 -07:00
larsbrubaker
f2c728d3b6 We can now load at least some amfs into the 3d view. 2014-10-04 17:57:07 -07:00
Kevin Pope
6cacb2bafd Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-10-03 18:47:08 -07:00
Kevin Pope
dbe574f3b3 Fixed behavior of click widget. 2014-10-03 18:46:52 -07:00
larsbrubaker
0b5039eaa2 Try to use the amf loaded when the file name is .amf 2014-10-03 18:01:00 -07:00
Kevin Pope
ff7ec1b6dd Don't show 3D Layer View in Touchscreen mode (for now). 2014-10-02 18:53:46 -07:00
larsbrubaker
02b520dac3 Merge branch '1.1.3' into development 
Conflicts:
	ConfigurationPage/LanguageSelector.cs
 2014-10-02 15:31:47 -07:00
larsbrubaker
2881375666 Making it possible to register for specific settings changes (extending what we've been doing to be more generic). 2014-10-02 14:42:18 -07:00
Kevin Pope
f9f6332421 Merge branch '1.1.3' of https://github.com/MatterHackers/MatterControl into 1.1.3 2014-09-29 19:17:34 -07:00
Kevin Pope
c040b06b7c Added polish translation. 2014-09-29 19:17:05 -07:00
larsbrubaker
7a3d263f9d Improved the parameters that we pass to gcode renderer (made them a class) 
Made it so we can remove the offsets when rendering multi material gcode
Default to grid on
Extruder offsets are now loadable and savable and editable
 2014-09-29 17:59:57 -07:00
gregory-diaz
2c083cc2e9 add to library form queue functionality 2014-09-26 18:19:24 -07:00
larsbrubaker
1800734347 Starting to get AMF in as a file type 
Unified all the open dialogs to use a common file type list
Made application settings hold the file lists
Made the extruder count a member of ActiveSliceSettings
Made an extruderOffsets mapping
 2014-09-26 17:52:54 -07:00
gregory-diaz
cefaaaf01a Merge remote-tracking branch 'upstream/development' into development 2014-09-26 15:11:34 -07:00
larsbrubaker
e75dc94e0d Fixed a bug when closing the 3D view while it is still loading or processing. 
Working on adding material settings to 3D view.
 2014-09-26 15:04:04 -07:00
larsbrubaker
1b767a6abc Moved Localizations into agg 
working to add ability to compile to 64 bit.
 2014-09-26 12:33:16 -07:00
larsbrubaker
3d75fe91eb Merge remote-tracking branch 'origin/development' into development 2014-09-26 12:01:33 -07:00
larsbrubaker
bbbac004f7 Merge branch '1.1.3' into development 2014-09-26 12:01:22 -07:00
larsbrubaker
db6439d593 Allow integer rotation.. 2014-09-26 10:57:11 -07:00
Kevin Pope
0c557998c5 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-09-26 10:47:21 -07:00
Kevin Pope
64c155f6a1 Make setup method public. 2014-09-26 10:46:49 -07:00