9285 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
codeanticode	5abab95ddf	Merge remote-tracking branch 'upstream/master'	2014-11-16 17:36:04 -07:00
Ben Fry	8627f22256	remove warning crap	2014-11-16 17:34:46 -07:00
codeanticode	45ab86acc9	Merge remote-tracking branch 'upstream/master'	2014-11-16 17:32:20 -07:00
codeanticode	a410c7c724	reimplemented exception handling	2014-11-16 17:31:30 -07:00
Ben Fry	a6fe48c00e	Merge branch 'master' of https://github.com/benfry/processing	2014-11-16 17:28:01 -07:00
Ben Fry	c0b19b02eb	deal with VerifyError with new 7u72 and bad tools, also convert line endings, continue work with Canvas embedding	2014-11-16 17:27:34 -07:00
Ben Fry	7be07b3e05	deal with VerifyError with new 7u72 and bad tools, also convert line endings	2014-11-16 17:14:40 -07:00
Ben Fry	51d2214347	cleaning out use of arrays of ArrayList objects	2014-11-16 16:02:31 -07:00
codeanticode	5af1891170	more cleaning up	2014-11-16 15:49:05 -07:00
Ben Fry	3fde590d74	changes for new Canvas setup	2014-11-16 15:36:43 -07:00
Ben Fry	02026eb6d7	need to set the size so that the Image object is created	2014-11-16 15:32:11 -07:00
Ben Fry	03deac7945	oops, add that method	2014-11-16 15:29:48 -07:00
Ben Fry	58cc7e6e2f	working on embedded Canvas	2014-11-16 15:27:30 -07:00
Ben Fry	0b5e825d67	oops, that was in use	2014-11-16 15:27:16 -07:00
Ben Fry	709871d0c1	Merge pull request #3 from codeanticode/master ... Retina support	2014-11-16 13:45:43 -07:00
Ben Fry	9b22a5494e	Merge remote-tracking branch 'upstream/master'	2014-11-16 13:45:03 -07:00
Manindra Moharana	b0cc4ea6e0	Merge branch 'master' of https://github.com/processing/processing	2014-11-16 13:39:36 -07:00
Ben Fry	83b8344289	rolling over for the next release	2014-11-16 12:59:29 -07:00
Manindra Moharana	43beeb4f61	grey text in completion panel workin again	2014-11-16 12:49:02 -07:00
Manindra Moharana	f258702441	Merge branch 'master' of https://github.com/processing/processing processing-0232-3.0a5	2014-11-16 11:49:20 -07:00
Manindra Moharana	54a9bac187	last min fix	2014-11-16 11:49:09 -07:00
Ben Fry	283c5dcc1d	Merge branch 'master' of github.com:processing/processing	2014-11-16 11:33:16 -07:00
Ben Fry	bf761ac4b0	build fixes for Mac OS X code signing	2014-11-16 11:33:10 -07:00
Manindra Moharana	3f7bc95e04	Merge branch 'master' of https://github.com/processing/processing	2014-11-16 11:32:56 -07:00
Manindra Moharana	0db785766a	Fixes #2956	2014-11-16 11:32:51 -07:00
Ben Fry	d81919555e	last bits of the revisions for the release	2014-11-16 11:17:24 -07:00
Ben Fry	68fc8238a9	Merge branch 'master' of github.com:processing/processing	2014-11-16 11:05:57 -07:00
Ben Fry	729f869503	turn on code completion	2014-11-16 11:05:54 -07:00
Manindra Moharana	ca6ac59193	cc length decreased	2014-11-16 11:01:42 -07:00
Manindra Moharana	2c5b1fee11	completion behavior toggled, see preferences	2014-11-16 10:39:15 -07:00
codeanticode	ef666123b7	Merge remote-tracking branch 'upstream/master'	2014-11-16 10:29:01 -07:00
Ben Fry	7d796b31ff	Merge remote-tracking branch 'upstream/master'	2014-11-16 10:25:26 -07:00
Ben Fry	6cd185b5a2	add note about pixel reference	2014-11-16 10:24:59 -07:00
Ben Fry	02812b651d	Merge branch 'master' of github.com:processing/processing	2014-11-16 10:12:35 -07:00
Ben Fry	60ec10bf53	fix is3D/set3D mixup, add getVertexCount() warning	2014-11-16 10:12:31 -07:00
Manindra Moharana	926adf104d	Merge branch 'master' of https://github.com/processing/processing	2014-11-16 10:07:11 -07:00
Manindra Moharana	c53c82771e	fixed completion offset bug, grey color disabled for now	2014-11-16 10:07:06 -07:00
codeanticode	68b194c980	Retina support	2014-11-16 09:47:44 -07:00
Ben Fry	6f803fecfd	note about the keyword fix	2014-11-16 09:45:52 -07:00
Ben Fry	12e7c82069	Merge pull request #2 from codeanticode/master ... more architectural work	2014-11-16 08:26:04 -07:00
Ben Fry	717c2b2b57	Merge pull request #2958 from JakubValtar/bugfix-keywords-parenthesis ... Highlighting of keywords followed by parens (#2099)	2014-11-16 08:24:15 -07:00
codeanticode	5ae7a470e7	don't use JOGL's FBO backing, use manual backing only when requested	2014-11-16 08:05:39 -07:00
Jakub Valtar	ffdfb2a400	Highlighting of keywords with parens, fixes #2099	2014-11-16 14:15:13 +01:00
Ben Fry	cc2412d0a1	release notes!!!	2014-11-15 23:16:53 -07:00
codeanticode	35074e41a8	Merge remote-tracking branch 'upstream/master'	2014-11-15 23:05:37 -07:00
codeanticode	e85237a626	cleaning up PGL	2014-11-15 23:04:32 -07:00
Ben Fry	2671da1696	Merge remote-tracking branch 'upstream/master'	2014-11-15 22:56:32 -07:00
Ben Fry	49e7120556	merging and merging	2014-11-15 22:55:12 -07:00
Ben Fry	bafa50db51	merge with the work folders	2014-11-15 22:54:44 -07:00
Ben Fry	ae84fee822	and more?	2014-11-15 22:47:55 -07:00