Permalink
Commits on May 21, 2017
  1. Merge pull request #5623 from openframeworks/bakercp-patch-1

    Fixes #5305
    bakercp committed on GitHub May 21, 2017
Commits on May 20, 2017
  1. Fixes #5305

    bakercp committed on GitHub May 20, 2017
Commits on May 19, 2017
  1. Merge pull request #5622 from bakercp/glm-ambiguity-fix

    Fixes #5621.
    bakercp committed on GitHub May 19, 2017
  2. Fixes #5621.

    bakercp committed May 19, 2017
  3. Merge pull request #5616 from openframeworks/bakercp-patch-1

    Download correct RPI libs when arch is not spec'd
    arturoc committed on GitHub May 19, 2017
  4. Merge pull request #5617 from bakercp/update-apothecary

    Update apothecary submodule with GLM update, etc.
    arturoc committed on GitHub May 19, 2017
  5. Define was deprecated/replaced with glm 0.9.8.0.

    This removes deprecation warnings.
    bakercp committed on GitHub May 19, 2017
  6. Merge pull request #5466 from mattfelsen/serial-name-win

    ofSerial: fix port name vs. path parsing on Windows
    bakercp committed on GitHub May 19, 2017
  7. Merge pull request #5586 from johnkingsley/fixwarning-serial

    Fix warning about unused function.
    bakercp committed on GitHub May 19, 2017
  8. Merge pull request #5601 from hamoid/patch-3

    Fix copy paste error in comment
    bakercp committed on GitHub May 19, 2017
  9. Merge pull request #5575 from bakercp/fix-warnings-on-xcode8

    Fix warnings in Xcode 8.
    bakercp committed on GitHub May 19, 2017
  10. Update apothecary submodule commit.

    bakercp committed May 19, 2017
Commits on May 18, 2017
  1. Download correct RPI libs when arch is not spec'd

    bakercp committed on GitHub May 18, 2017
Commits on May 16, 2017
  1. Merge pull request #5595 from openframeworks/bakercp-patch-1

    Update README.md
    bakercp committed on GitHub May 16, 2017
  2. Merge pull request #5609 from Entropy/hotfix-jsonfileexists

    Making sure json file exists before reading from it
    arturoc committed on GitHub May 16, 2017
  3. Forgot to actually load the data :)

    prisonerjohn committed May 16, 2017
  4. Switched to using ofLoadJson.

    prisonerjohn committed May 16, 2017
Commits on May 15, 2017
  1. Merge pull request #5608 from tgfrerer/disentangle_matrix_stack_from_fbo

    remove dependency ofMatrixStack<->ofFbo
    arturoc committed on GitHub May 15, 2017
  2. Making sure json file exists before reading from it (otherwise it cra…

    …shes).
    prisonerjohn committed May 15, 2017
  3. remove dependency ofMatrixStack<->ofFbo

    + ofMatrixStack depends on ofFbo, although it really only calls methods
      of ofFbo's base class, ofBaseDraws - essentially queries onto the
      RenderSurface's geometry.
    
    The proposed changes update ofMatrixStack to require just an
    ofBaseDraws compatible object to be passed as target render surface.
    
    This allows other renderers, such as the vulkan renderer, to use this
    object, without having access to ofFbo.
    tgfrerer committed May 15, 2017
Commits on May 13, 2017
  1. Merge pull request #5603 from Entropy/feature-fileutils

    Switched from string to filesystem::path for some utility functions.
    arturoc committed on GitHub May 13, 2017
  2. Switched from string to filesystem::path for some utility functions.

    prisonerjohn committed May 13, 2017
Commits on May 11, 2017
  1. Fix copy paste error in comment

    hamoid committed on GitHub May 11, 2017
  2. Merge pull request #5600 from hamoid/patch-2

    Fix typos
    arturoc committed on GitHub May 11, 2017
  3. Fix typos

    hamoid committed on GitHub May 11, 2017
Commits on May 9, 2017
  1. fix some warnings

    arturoc committed May 9, 2017
  2. ofxGui: custom events priority

    arturoc committed May 9, 2017
Commits on May 6, 2017
  1. Merge branch 'master' of github.com:openframeworks/openFrameworks

    arturoc committed May 6, 2017
  2. PG latest commmits

    arturoc committed May 6, 2017
  3. vs project: add ofJson

    arturoc committed May 6, 2017
Commits on May 5, 2017
  1. Update README.md

    bakercp committed on GitHub May 5, 2017
Commits on May 4, 2017
  1. Merge pull request #5590 from roymacdonald/fix-ofxColorPicker

    ofxColorPicker fixes.
    arturoc committed on GitHub May 4, 2017
  2. ofxColorPicker fix.

    -changed ofxColorPicker private method for lambda function.
    roymacdonald committed May 4, 2017
  3. Merge pull request #5591 from roymacdonald/fix-audiosamplerate

    Fix audio sample rate issue #5588
    arturoc committed on GitHub May 4, 2017