Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merges and fixes merge conflicts for upstream master changes #598

Merged
merged 26 commits into from
Apr 10, 2015

Conversation

indefinit
Copy link
Contributor

big ticket items:
p5.Graphics2D is now p5.Graphics3D (subclass), p5.Graphics2D (subclass), and p5.Graphics (supperclass)
createCanvas() now chooses between webgl and p2d renderers.

lauren mccarthy and others added 26 commits August 18, 2014 16:02
Implements a Matrix class for eventual 3d tranformation
* master:
  issue processing#503
  Changed pageX/Y to screenX/Y in touch events
  Removed reference to touches array in the ptouch documentation
  Changed reference from pmouseX to ptouchX
  Fixed documentation for touch events
  Break color method examples into separate codeblocks
  Add documentation for CSS colors to fill(), background() and stroke()
  Remove p5.Color._patterns from documentation: not a public interface
  Add documentation for CSS color strings to p5.prototype.color
  Refactor unit tests: test public interface, not internal logic
  Add missing svg named color: Magenta (#ff00ff)
  Add support for named CSS & SVG color strings, like "red"
  Parse hex, rgb() and rgba() CSS color strings
  Resolve DECIMAL regex to handle rgb( .9%,...) case, and improve tests
  Improve legibility of regexes and add tests for failing case
  Add CssColor pattern regular expressions, with tests
@lmccart lmccart merged commit 55bdea1 into processing:renderers Apr 10, 2015
Dhanush111 added a commit to Dhanush111/p5.js that referenced this pull request Oct 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants