Commit Graph

9309 Commits

Author SHA1 Message Date
Ben Fry 3edd745d20 clean up some font handling 2014-11-17 18:33:59 -05:00
Ben Fry d1e3e357cd add getFontMetrics() override 2014-11-17 17:09:09 -05:00
Ben Fry dea5f890db merge conflict resolution 2014-11-17 17:02:50 -05:00
Ben Fry fe469aaca4 modify the FRC code so that it does not show up in PApplet 2014-11-17 17:01:31 -05:00
Ben Fry 86a1a8bae4 Merge pull request #6 from codeanticode/master
preprocessor parses sketchWidth/Height/Renderer, fixed error handling
2014-11-17 16:58:40 -05:00
Ben Fry 663ea21c0e todo notes 2014-11-17 16:58:12 -05:00
codeanticode 5519bf8615 throw cause of draw exception 2014-11-17 16:45:27 -05:00
codeanticode 3949fd4f67 add java.awt.font.FontRenderContext 2014-11-17 15:55:44 -05:00
codeanticode d630257162 add the retina renderers in writeFooter() 2014-11-17 15:55:06 -05:00
codeanticode 9ac3b9b238 call initSketchSize() in preprocess() 2014-11-17 15:54:27 -05:00
codeanticode 2ad7d2ab21 getting font metrics from default toolkit 2014-11-17 09:54:52 -07:00
codeanticode 97ff4895d8 Merge remote-tracking branch 'upstream/master' 2014-11-16 19:39:30 -07:00
Ben Fry daaad10c43 hammering through placement and sizing issues 2014-11-16 19:32:44 -07:00
codeanticode 166782a9e9 Merge remote-tracking branch 'upstream/master' 2014-11-16 18:43:31 -07:00
codeanticode 3af8680a7a disables v-sync when setting framerate to more than 60fps 2014-11-16 18:41:26 -07:00
Ben Fry 9163900aba make notes about FRC 2014-11-16 18:23:55 -07:00
Ben Fry a44f566f0c added method to get the FRC 2014-11-16 18:19:48 -07:00
Ben Fry 782f293768 Merge branch 'master' of https://github.com/benfry/processing 2014-11-16 18:02:29 -07:00
Ben Fry 1aa3a76c8c Merge pull request #5 from codeanticode/master
removed allocate
2014-11-16 18:02:19 -07:00
Ben Fry 71cd0c32ee clean up some warnings 2014-11-16 18:02:13 -07:00
codeanticode 4f60f5ac12 Merge remote-tracking branch 'upstream/master' 2014-11-16 17:55:25 -07:00
codeanticode 8ac36d5cef removed allocate 2014-11-16 17:52:13 -07:00
Ben Fry 2e55b11ddb Merge pull request #4 from codeanticode/master
handle exceptions outside animator loop
2014-11-16 17:51:43 -07:00
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
Manindra Moharana 686d4729d6 minor error msg tweaks 2014-11-16 14:01:06 -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