Permalink
Commits on Feb 7, 2017
  1. Merge pull request #2 from notlion/emscripten

    Hai Nguyen
    Hai Nguyen committed Feb 7, 2017
    Merge emscripten with current master branch
Commits on Feb 4, 2017
  1. Remove flickrTest sample

    notlion committed Feb 4, 2017
Commits on Feb 2, 2017
  1. Merge pull request #1741 from ryanbartley/OscSampleFix

    andrewfb committed Feb 2, 2017
    Incorrect localPort value in sample
Commits on Feb 1, 2017
  1. Merge pull request #1739 from andrewfb/platform-docs

    andrewfb committed Feb 1, 2017
    Preprocessor docs
  2. Merge pull request #1730 from gregkepler/dox-markdown

    andrewfb committed Feb 1, 2017
    Dox markdown script
Commits on Jan 27, 2017
  1. Merge pull request #1736 from richardeakin/cmake_build_all_samples_re…

    richardeakin committed Jan 27, 2017
    …name
    
    cmake: rename CINDER_BUILD_SAMPLES -> CINDER_BUILD_ALL_SAMPLES
Commits on Jan 25, 2017
  1. disabled CINDER_BUILD_ALL_SAMPLES in CI script

    richardeakin committed Jan 25, 2017
    They weren’t enable previously either as the var name was wrong. They won’t currently all build, so this is fine for now.
  2. rename CINDER_BUILD_SAMPLES -> CINDER_BUILD_ALL_SAMPLES to distinguis…

    richardeakin committed Jan 25, 2017
    …h it from CINDER_BUILD_SAMPLE
  3. Merge pull request #1731 from richardeakin/remove_duplicate_NOMINMAX

    andrewfb committed Jan 25, 2017
    Remove duplicate #define NOMINMAX
Commits on Jan 23, 2017
  1. remove duplicate #define NOMINMAX

    richardeakin committed Jan 23, 2017
    It is defined in cinder.vcxproj
  2. Merge branch 'pr/unused_params_various' of https://github.com/MikeGit…

    richardeakin committed Jan 23, 2017
    …b/Cinder into MikeGitb-pr/unused_params_various
Commits on Jan 22, 2017
Commits on Jan 20, 2017
  1. Merge branch 'pr/unused_param_gl' of https://github.com/MikeGitb/Cinder

    richardeakin committed Jan 20, 2017
    … into MikeGitb-pr/unused_param_gl
  2. Merge pull request #1723 from richardeakin/unused_param_audio

    richardeakin committed Jan 20, 2017
    [warnings] Comment unused parameters in cinder/audio v2
  3. Docs - Fixed merge issues

    gregkepler committed Oct 2, 2015
Commits on Jan 19, 2017
  1. Correcting script paths.

    lucasvickers committed Jan 19, 2017
Commits on Jan 18, 2017
  1. Broke out build processes to OS X, iOS, iOS-Sim so that it's more exp…

    Lucas Vickers
    Lucas Vickers committed Jan 18, 2017
    …licit where a failure occured.
  2. Merge pull request #1697 from PetrosKataras/cmake-fix-osx-dynamic-lib…

    richardeakin committed Jan 18, 2017
    …-target
    
    CMake: Fix Cinder dynamic lib target on OS X.
  3. doc improvements

    richardeakin committed Jan 18, 2017