Commit Graph

7784 Commits

Author SHA1 Message Date
Ben Fry f52dd7f53a fix for #2297, default bg color problem 2014-04-11 14:23:26 -04:00
Ben Fry f1cc624698 fix for #2439, set bounds on alpha 2014-04-11 13:47:57 -04:00
Ben Fry 16e972f674 check on indices settings for the other Dict classes 2014-04-11 13:35:34 -04:00
Ben Fry 01fb49f172 Merge pull request #2441 from jdf/master
Allow modes to have default extensions other than "pde".
2014-04-11 13:28:55 -04:00
Jonathan Feinberg 882dfa9ccb Prompt user to select a Mode when no sketch.properties are present. 2014-04-11 12:23:18 -04:00
Ben Fry 5101506047 backing out pull #2432 2014-04-11 05:55:05 -04:00
Jonathan Feinberg f8b72be222 Merge branch 'master' of github.com:jdf/processing 2014-04-10 14:26:04 -04:00
Jonathan Feinberg 6573e25361 Allow modes to have default extensions other than "pde".
Aside from not crashing anymore, this patch changes mode-switch behavior as follows:
If you're in FooMode, and you're in an unmodified, empty sketch, the FooMode editor
is closed, and a BarMode editor is created. If you're in an unmodified, non-empty
sketch, it remains on-screen, and a new BarMode editor is created.

Fixes #2419 and #2420.
2014-04-10 14:22:10 -04:00
codeanticode 115b579bb1 removed a couple of unneeded removeListeners() calls in PJOGL 2014-04-10 11:20:00 -04:00
Ben Fry 5411ece732 fix ecj.jar path issue on Windows (and Linux?) 2014-04-09 11:38:09 -04:00
Jonathan Feinberg 8bb5bc7e7b Merge remote-tracking branch 'upstream/master' 2014-04-08 20:30:20 -04:00
Ben Fry ee417dc726 fix formatting to conventions 2014-04-08 12:02:56 -04:00
Ben Fry be94a2abc8 Merge pull request #2433 from Manindra29/master
Added accessor methods for Editor Status properties
2014-04-08 12:00:46 -04:00
Scott Murray a209698e3c Merge branch 'master' of https://github.com/processing/processing 2014-04-08 08:55:09 -07:00
Scott Murray a6c01affe9 Added related links to lerp() and PVector.lerp() 2014-04-08 08:54:57 -07:00
Manindra Moharana ad19f1d80f added accessor methods for editor status properties 2014-04-08 15:59:10 +05:30
Ben Fry 649477cf6c double entry 2014-04-08 04:28:15 -04:00
Ben Fry 00aae1d222 Merge pull request #2432 from jdf/master
Make OpenGL stuff available to PDE runtime on OS X and Windows.
2014-04-08 04:27:28 -04:00
Jonathan Feinberg cb95667ee5 Merge remote-tracking branch 'upstream/master' 2014-04-07 22:29:00 -04:00
Jonathan Feinberg a1bdd2e2ed Make OpenGL core classes available to PDE on Windows. 2014-04-07 21:55:21 -04:00
Jonathan Feinberg c73b206731 Make OpenGL stuff available to PDE runtime on mac. 2014-04-07 21:44:50 -04:00
Ben Fry 052ade2b41 Merge pull request #2429 from jdf/master
Permit Modes to provide their own TokenMarker implementation.
2014-04-07 15:11:59 -04:00
Jonathan Feinberg a3e8adfa80 Permit modes to provide their own TokenMarker implementation while still using the keywords.txt file. 2014-04-07 15:06:32 -04:00
Jonathan Feinberg e08eb3c0f6 Merge with upstream. 2014-04-07 14:02:01 -04:00
Ben Fry ae49afbed8 additional items of note 2014-04-07 13:59:47 -04:00
Ben Fry 71d6d7bf78 slightly more informative update message in console (to differentiate from version) 2014-04-07 13:59:30 -04:00
Ben Fry cc890e79a0 override keyword loading for Python 2014-04-07 13:59:03 -04:00
codeanticode 7c23d482b7 some cleaner logic to allow for #2424, which should also work when video
buffers start accumulating in the cache on slower machines.
2014-04-06 10:07:54 -04:00
codeanticode c7c20f0183 getBufferPixels() removes the buffers from the cache, fixes the #2424 2014-04-05 00:11:34 -04:00
Ben Fry 1e63889060 Merge pull request #2425 from jdf/master
Fix NPE in PDE, affecting color picker and other Tools.
2014-04-03 16:52:08 -04:00
codeanticode a9023be06a don't delete any gl resources in dispose 2014-04-03 11:59:41 -04:00
Jonathan Feinberg 5ffe70516b Fix NPE in PDE, affecting color picker and other Tools. 2014-04-03 10:46:43 -04:00
Ben Fry e06bbcf2fd Merge pull request #2422 from jdf/master
Permit Mode developers to run their Modes in Eclipse (or however they like) during development.
2014-04-03 10:41:04 -04:00
Jonathan Feinberg f493e04687 Permit Mode developers to run their Modes in Eclipse (or however they like) during development. 2014-04-02 16:09:04 -04:00
codeanticode f448bb94a3 Merge pull request #2417 from jdf/master
Make it possible for PApplet subclasses to override exitActual.
2014-04-01 15:37:05 -04:00
Jonathan Feinberg f1a8639e1a Merge remote-tracking branch 'upstream/master' 2014-04-01 15:30:10 -04:00
Jonathan Feinberg baae7829e4 Merge branch 'master' of github.com:jdf/processing 2014-04-01 15:29:09 -04:00
Jonathan Feinberg 8e6dc95ef0 Make it possible for PApplet subclasses to override exitActual. 2014-04-01 15:28:47 -04:00
codeanticode dcf344eab5 check that backFBO and frontFBO are not null 2014-04-01 15:28:46 -04:00
Jonathan Feinberg d52184fc09 Make it possible for PApplet subclasses to override exitActual. 2014-04-01 15:25:11 -04:00
codeanticode ce8eddff15 request draw in PGraphicsOpenGL only if the parent PApplet can draw,
solves #2416
2014-04-01 14:55:20 -04:00
Jonathan Feinberg 4f1d4914ef Merge remote-tracking branch 'upstream/master' 2014-04-01 14:45:44 -04:00
codeanticode d8dacf8ede don't delete opengl resources in the PGraphicsOpenGL finalizer 2014-04-01 14:16:40 -04:00
codeanticode cd8666ca2b removed GLProfile.shutdown() call, JOGL does it automatically 2014-04-01 11:33:27 -04:00
codeanticode f08481924e update to JOGL 2.1.5 2014-04-01 11:31:48 -04:00
codeanticode c5dca8b660 renamed bufferUnit to ppixelsUnit 2014-03-31 15:20:23 -04:00
codeanticode 8cc6d3408b fixes in CubeMapUtils 2014-03-31 15:19:24 -04:00
Ben Fry 804bbce04d removing deps from eclipse project 2014-03-31 14:33:33 -04:00
Jonathan Feinberg 4aea8a4749 Merge remote-tracking branch 'upstream/master' 2014-03-31 14:13:26 -04:00
Jonathan Feinberg a89cb727c3 Remove unnecessary Eclipse dependencies from app project. 2014-03-31 14:12:49 -04:00