Merge remote-tracking branch 'upstream/master'

app/src/processing/app/Editor.java

@@ -2551,6 +2551,22 @@ public abstract class Editor extends JFrame implements RunnerListener {
     }
   }
 
+  
+  /**
+   * Returns the current notice message in the editor status bar.
+   */
+  public String getStatusMessage(){
+    return status.message;
+  }
+  
+  
+  /**
+   * Returns the current mode of the editor status bar: NOTICE, ERR or EDIT. 
+   */
+  public int getStatusMode(){
+    return status.mode;
+  }
+  
 
   /**
    * Clear the status area.

app/src/processing/app/EditorStatus.java

@@ -36,11 +36,9 @@ public class EditorStatus extends JPanel {
   Color[] bgcolor;
   Color[] fgcolor;
 
-  static final int NOTICE = 0;
-  static final int ERR    = 1;
-  //static final int PROMPT = 2;
-  //static final int EDIT   = 3;
-  static final int EDIT   = 2;
+  static public final int NOTICE = 0;
+  static public final int ERR    = 1;
+  static public final int EDIT   = 2;
 
   static final int YES    = 1;
   static final int NO     = 2;

build/windows/launcher/config.xml

@@ -22,7 +22,6 @@
     <cp>core/library/gluegen-rt-natives-windows-i586.jar</cp>
     <cp>core/library/jogl-all-natives-windows-amd64.jar</cp>
     <cp>core/library/jogl-all-natives-windows-i586.jar</cp>
-    <cp>core/library/core.jar</cp>
     <cp>lib/jna.jar</cp>
     <cp>lib/antlr.jar</cp>
     <cp>lib/ant.jar</cp>

core/src/processing/core/PApplet.java

@@ -5261,6 +5261,8 @@ public class PApplet extends Applet
    * @param amt float between 0.0 and 1.0
    * @see PGraphics#curvePoint(float, float, float, float, float)
    * @see PGraphics#bezierPoint(float, float, float, float, float)
+   * @see PVector#lerp(PVector, float)
+   * @see PGraphics#lerpColor(int, int, float)
    */
   static public final float lerp(float start, float stop, float amt) {
     return start + (stop-start) * amt;
@@ -15334,6 +15336,7 @@ public class PApplet extends Applet
    * @param amt between 0.0 and 1.0
    * @see PImage#blendColor(int, int, int)
    * @see PGraphics#color(float, float, float, float)
+   * @see PApplet#lerp(float, float, float)
    */
   public int lerpColor(int c1, int c2, float amt) {
     return g.lerpColor(c1, c2, amt);

core/src/processing/core/PGraphics.java

@@ -7637,6 +7637,7 @@ public class PGraphics extends PImage implements PConstants {
    * @param amt between 0.0 and 1.0
    * @see PImage#blendColor(int, int, int)
    * @see PGraphics#color(float, float, float, float)
+   * @see PApplet#lerp(float, float, float)
    */
   public int lerpColor(int c1, int c2, float amt) {
     return lerpColor(c1, c2, amt, colorMode);

core/src/processing/core/PVector.java

@@ -880,6 +880,7 @@ public class PVector implements Serializable {
    * @brief Linear interpolate the vector to another vector
    * @param v the vector to lerp to
    * @param amt  The amount of interpolation; some value between 0.0 (old vector) and 1.0 (new vector). 0.1 is very near the new vector. 0.5 is halfway in between.
+   * @see PApplet#lerp(float, float, float)
    */
   public void lerp(PVector v, float amt) {
     x = PApplet.lerp(x,v.x,amt);

core/todo.txt

@@ -37,7 +37,8 @@ A   https://github.com/processing/processing/issues/2416
 A fix pixels[] array for video capture
 A   https://github.com/processing/processing/issues/2424
 
-
+_ tint() not working in PDF (regression from previous release)
+_   https://github.com/processing/processing/issues/2428
 
 _ XML.getChildren() fix
 _   https://github.com/processing/processing/issues/2367