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

4898 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lars Brubaker
47cf855bdb Show the debug info 2016-04-06 16:47:16 -07:00
Lars Brubaker
df925ffde3 Better positions data view text 
Put a background color under the text of data view graph
Tracking more of the ok to send time in printer communication
 2016-04-06 13:53:04 -07:00
Lars Brubaker
0c258355b0 Made data view graph using List rather than a custom class 
Made the printer consume more processor time while printing to service the print thread
 2016-04-06 11:56:48 -07:00
Lars Brubaker
194228e635 Merge pull request #649 from rytz/master 
fixing a G-Code UI reference
 2016-04-04 14:02:58 -07:00
rytz
46be2e1f0c fixing a G-Code UI reference 2016-04-04 12:46:07 -07:00
larsbrubaker
f89f64dadb Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-04-01 21:16:11 -07:00
Lars Brubaker
266f55728e Merge pull request #637 from gregory-diaz/1.5.1 
Temporary hack to make sure that the T7 stand is included in preloade…
 2016-03-29 12:37:41 -07:00
Greg
05f5136e0d Temporary hack to make sure that the T7 stand is included in preloaded library parts 2016-03-29 11:41:02 -07:00
Lars Brubaker
ef3d7cc6d4 Merge pull request #636 from rytz/master 
minor label adjustments - adding 'C' to temperatures, fixing capitalization
 2016-03-29 11:27:20 -07:00
rytz
a91fe125fb minor label adjustments - adding 'C' to temperatures, fixing capitalization 2016-03-29 10:12:09 -07:00
larsbrubaker
86aad1076e Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-03-28 19:43:23 -07:00
Lars Brubaker
e60c136e66 making some bvh debugging tools 
Added get top corner
Refactoring
Spelling
 2016-03-25 17:32:05 -07:00
Lars Brubaker
2ef0285954 Don't use the new mesh data (not working) 2016-03-25 10:13:27 -07:00
Lars Brubaker
892b1bb793 latest agg 2016-03-25 10:08:02 -07:00
Lars Brubaker
adaea31ee8 Merge remote-tracking branch 'origin/1.5.1' 
Conflicts:
	StaticData/PrinterSettings/IRA3D/Poetry Infinity/config.ini
 2016-03-25 10:06:34 -07:00
Lars Brubaker
3c76ab69bc Merge remote-tracking branch 'origin/master' 2016-03-25 10:05:29 -07:00
Lars Brubaker
8a4824a0f5 Merge pull request #633 from gregory-diaz/1.5.1 
1.5.1
 2016-03-24 16:49:40 -07:00
Lars Brubaker
d0f12315a8 Merge pull request #632 from jlewin/master 
Cleanup localization, concise asyncPlatingData init, remove unused vars
 2016-03-24 16:49:11 -07:00
Lars Brubaker
30eef8ebbc Made a new low memory face traceable for mesh 
Made an Empty in AxisAlignedBoundingBox
Created an Intersects test in aabb
Got PointInPoly working for mesh
Wrote a test for same
More comments in IPrimitive
Refactoring
Spelling
 2016-03-24 15:48:11 -07:00
Greg
a93e7cb884 Latest preset changes ira3d 2016-03-24 12:04:58 -07:00
Greg
cad2868866 Latest ira3d printer profile changes 2016-03-24 12:00:24 -07:00
John Lewin
ebac135e14 Cleanup localization, concise asyncPlatingData init, remove unused vars 2016-03-24 06:52:20 -07:00
Lars Brubaker
2a7f9d76cf Better bed size units. 2016-03-23 18:23:36 -07:00
Lars Brubaker
c893a72ef9 Improving bed markings on large format printers 2016-03-23 11:05:44 -07:00
larsbrubaker
df8e26ec28 Latest agg and ms 2016-03-22 22:33:15 -07:00
Lars Brubaker
e0f88b8968 Merge remote-tracking branch 'origin/master' 2016-03-22 15:23:33 -07:00
Lars Brubaker
36c32574d4 Fixed a bug with arc not completing 
Value printing is better in interaction volume
Store the intersection on mouse move
Refacotring
 2016-03-22 15:23:25 -07:00
johnlewin
4f229551e0 Merge pull request #631 from jlewin/master 
Add localization, revise existing
 2016-03-22 07:40:05 -07:00
John Lewin
e02293706e Add localization, revise existing 2016-03-22 07:39:14 -07:00
Lars Brubaker
6442f6485d Display height info in correct position. 2016-03-21 18:10:01 -07:00
Lars Brubaker
d7de3ec23d Made a new class for value display. 
Made height display use it.
 2016-03-21 18:07:53 -07:00
Lars Brubaker
a1652dd2d2 latest agg 2016-03-21 17:19:39 -07:00
Lars Brubaker
239947fc6c Merge pull request #630 from rytz/master 
corrections to slice error text
 2016-03-21 16:17:57 -07:00
rytz
3e986821fa corrections to slice error text 2016-03-21 14:41:32 -07:00
larsbrubaker
4e4206f510 refactoring 
easier to make 2 part connected vertex sources
 2016-03-20 14:34:55 -07:00
larsbrubaker
00ddef2b15 Generated a sphere png. 2016-03-19 21:35:39 -07:00
larsbrubaker
e46f78a585 Make it possible to tell if a interaction volume is rendering with zbuffer 
guard against divide by zero.
 2016-03-19 18:13:32 -07:00
larsbrubaker
fbb4ed42a6 refactoring 2016-03-19 13:54:25 -07:00
Lars Brubaker
ea17419335 Merge remote-tracking branch 'origin/master' 2016-03-18 18:07:43 -07:00
Lars Brubaker
32aa7161c3 Change clean signature. 
A lot more work on Revolve (still not solid)
Put in a new icon
 2016-03-18 18:07:36 -07:00
Lars Brubaker
734d46fd16 Merge pull request #629 from unlimitedbacon/master 
New README file
 2016-03-18 15:42:41 -07:00
Tyler Anderson
3e42e40ab7 New README 2016-03-18 13:55:24 -07:00
Lars Brubaker
7cbdf6c7dd Merge remote-tracking branch 'origin/master' 2016-03-18 13:53:32 -07:00
Lars Brubaker
09aaa2b046 Merge remote-tracking branch 'origin/1.5.1' 2016-03-18 13:53:26 -07:00
johnlewin
fb51808120 Merge pull request #628 from jlewin/master 
Remove invalid SamplePart
 2016-03-18 12:09:29 -07:00
johnlewin
c8ed5fd90b Merge pull request #627 from gregory-diaz/1.5.1 
WIP StaticData changes IRA3D
 2016-03-18 12:07:00 -07:00
Lars Brubaker
774d768e8d Merge remote-tracking branch 'origin/1.5.1' 2016-03-18 12:03:05 -07:00
Lars Brubaker
05aa6bcd31 Got face textures to align better. 
Enabling 3D controls
 2016-03-18 12:02:46 -07:00
John Lewin
71540ef149 Remove invalid SamplePart 2016-03-18 11:55:55 -07:00
Greg
65a6bc01f4 WIP StaticData changes IRA3D 2016-03-18 11:54:19 -07:00