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
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
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
larsbrubaker
b306be1dd5
Merge branch '1.1.3' into development
2014-09-25 16:20:12 -07:00
larsbrubaker
fe88e63c5e
Put zOffset into MatterSlice and implemented the UI for it.
...
Put Robo z offset at 1 for the R1
Turned off 2Point leveling
Turned off auto run print leveling
2014-09-25 11:39:39 -07:00
larsbrubaker
f1272a91e1
Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
2014-09-25 11:01:39 -07:00
larsbrubaker
f39787fa8f
Putting in more multi extruder support
...
Reorganizing the slice settings layouts
2014-09-25 11:01:15 -07:00
Kevin Pope
2faec9d1c0
Work on print history widget.
2014-09-24 19:14:31 -07:00
Kevin Pope
4e4f257737
Updating preview window controls.
2014-09-24 11:15:38 -07:00
larsbrubaker
4e10293225
Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
2014-09-24 11:07:31 -07:00
larsbrubaker
c04e4c81dd
Working on multi extruder ui support
2014-09-24 11:07:08 -07:00
Kevin Pope
a6d109fdfd
Add display mode selector to config page. Fixed location of update notification.
2014-09-23 19:23:54 -07:00
Kevin Pope
49838951ab
Updated options menus.
2014-09-23 19:23:17 -07:00
Kevin Pope
a4ef3f729c
Made display mode driven by theme setting.
2014-09-23 18:02:07 -07:00
Kevin Pope
bda5ac173e
More work on configuration page.
2014-09-23 16:11:06 -07:00
Kevin Pope
5663289ef7
Make application controller a generic object. Fix title of auto-leveling warning window.
2014-09-22 14:16:40 -07:00
Kevin Pope
bdef196434
Changed main application to MVC. UI rework (Configuration Page esp. in progress).
2014-09-19 19:17:12 -07:00
gregory-diaz
1f25493cb8
Merge remote-tracking branch 'upstream/development' into development
2014-09-18 18:24:50 -07:00
gregory-diaz
98d1de459f
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-09-18 18:22:20 -07:00
Kevin Pope
e02655f847
Make controls more consistent looking.
2014-09-18 17:06:45 -07:00
Kevin Pope
73b6c8298b
Added custom themed slider, added double slider.
2014-09-17 19:18:46 -07:00
