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

Syncing master and android_linux branches #1506

Merged
merged 71 commits into from Jul 18, 2016

Commits on Feb 25, 2016

  1. Configuration menu
    Copy the full SHA
    dd5901f View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2016

  1. Configuration menu
    Copy the full SHA
    e1996f9 View commit details
    Browse the repository at this point in the history
  2. Fix velocity buffer motion blur sample.

    Now-default alpha blending broke the velocity buffer rendering.
    Simply disabled the alpha blending.
    David Wicks committed Mar 1, 2016
    Configuration menu
    Copy the full SHA
    9f040c2 View commit details
    Browse the repository at this point in the history
  3. Merge pull request cinder#1339 from andrewfb/powerManagementFix

    Fixing OS X sleep-prevention code to address cinder#1323
    andrewfb committed Mar 1, 2016
    Configuration menu
    Copy the full SHA
    9a9679f View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2016

  1. Merge pull request cinder#1356 from sansumbrella/motion_blur

    Fix velocity buffer motion blur sample.
    richardeakin committed Mar 2, 2016
    Configuration menu
    Copy the full SHA
    522873f View commit details
    Browse the repository at this point in the history
  2. Enabling NOMINMAX on WinRT

    andrewfb committed Mar 2, 2016
    Configuration menu
    Copy the full SHA
    6aad897 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    7d5106d View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2016

  1. Configuration menu
    Copy the full SHA
    57db533 View commit details
    Browse the repository at this point in the history
  2. Updating osc and tuio

    bartleyryan committed Mar 3, 2016
    Configuration menu
    Copy the full SHA
    c3b173f View commit details
    Browse the repository at this point in the history
  3. Merge pull request cinder#1352 from richardeakin/msw_include_sdkddkver.h

    include sdkddkver.h in Cinder.h
    andrewfb committed Mar 3, 2016
    Configuration menu
    Copy the full SHA
    390723e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    83cc987 View commit details
    Browse the repository at this point in the history
  5. Merge pull request cinder#1362 from richardeakin/msw_report_cmyk_unsu…

    …pported
    
    detect CMYK files and throw more detailed exception on MSW.
    andrewfb committed Mar 3, 2016
    Configuration menu
    Copy the full SHA
    a7b29ed View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2016

  1. Configuration menu
    Copy the full SHA
    cea170e View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2016

  1. Configuration menu
    Copy the full SHA
    bf3692b View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2016

  1. VertBatch cleanup

    Tobias Thyrrestrup committed Mar 8, 2016
    Configuration menu
    Copy the full SHA
    80438ff View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2016

  1. Merge pull request cinder#1367 from richardeakin/glm_using_additions

    added some popular glsl methods to the using explicit list
    richardeakin committed Mar 10, 2016
    Configuration menu
    Copy the full SHA
    66d6395 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c8b0f52 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    7569a36 View commit details
    Browse the repository at this point in the history
  4. Merge pull request cinder#1377 from cinder/revert-1370-VertBatch_cleanup

    Revert "VertBatch cleanup"
    richardeakin committed Mar 10, 2016
    Configuration menu
    Copy the full SHA
    acd7927 View commit details
    Browse the repository at this point in the history
  5. Merge pull request cinder#1360 from ryanbartley/OscShutdown

    Osc and Tuio updates
    richardeakin committed Mar 10, 2016
    Configuration menu
    Copy the full SHA
    ea05b33 View commit details
    Browse the repository at this point in the history
  6. VertBatch cleanup

    Tobias Thyrrestrup authored and richardeakin committed Mar 10, 2016
    Configuration menu
    Copy the full SHA
    b56df4a View commit details
    Browse the repository at this point in the history
  7. whitespace fixes

    richardeakin committed Mar 10, 2016
    Configuration menu
    Copy the full SHA
    85405e8 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2016

  1. Configuration menu
    Copy the full SHA
    73d76dd View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2016

  1. Merge pull request cinder#1384 from justinbmartin/master

    Fixed gl::Sync Position in Flickr Multi-threaded Sample
    andrewfb committed Mar 15, 2016
    Configuration menu
    Copy the full SHA
    d742716 View commit details
    Browse the repository at this point in the history
  2. Merge pull request cinder#1378 from richardeakin/thyrrestrip_VertBatc…

    …h_cleanup
    
    Thyrrestrup vert batch cleanup
    andrewfb committed Mar 15, 2016
    Configuration menu
    Copy the full SHA
    583e67c View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2016

  1. use a vector<Connection> to store mouse connections, ensuring that we…

    … don't allow duplicate connections
    richardeakin committed Mar 23, 2016
    Configuration menu
    Copy the full SHA
    459d273 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2016

  1. Configuration menu
    Copy the full SHA
    ed94311 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2016

  1. Configuration menu
    Copy the full SHA
    f49a33e View commit details
    Browse the repository at this point in the history
  2. Merge pull request cinder#1406 from ryanbartley/OscFix

    Fixing vc2013 handling of std::atomic
    andrewfb committed Mar 30, 2016
    Configuration menu
    Copy the full SHA
    697de3f View commit details
    Browse the repository at this point in the history
  3. Merge pull request cinder#1399 from notlion/rect-scaledcentered-vec2

    Add vec2 overload of RectT::scaledCentered()
    richardeakin committed Mar 30, 2016
    Configuration menu
    Copy the full SHA
    eda2f1b View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2016

  1. Configuration menu
    Copy the full SHA
    8ff810b View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2016

  1. Allow Surfaces larger than 2GiB

    Previously creating surfaces larger than 2^31 bytes would cause an int32_t overflow on data size calculation, throwing a bad_alloc exception.
    
    This commit converts mRowBytes, mInc and mRowInc to size_t, which causes size calculations to be performed in size_t before the result is used for array allocation and pointer arithmetic. Also, sites where these variables are used have been converted to avoid loss of precision.
    notlion committed Apr 2, 2016
    Configuration menu
    Copy the full SHA
    bb1be35 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2016

  1. Merge pull request cinder#1398 from richardeakin/cameraui_signal_vector

    Clear out existing CameraUi signals before connecting again
    richardeakin committed Apr 4, 2016
    Configuration menu
    Copy the full SHA
    9cf590e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6334b97 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2016

  1. Merge pull request cinder#1413 from richardeakin/ignore_VC.db

    Ignore Visual Studio's new DB file
    richardeakin committed Apr 6, 2016
    Configuration menu
    Copy the full SHA
    cd96790 View commit details
    Browse the repository at this point in the history
  2. Fix typos in exception.

    kitschpatrol committed Apr 6, 2016
    Configuration menu
    Copy the full SHA
    46ac324 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2016

  1. Fixed file names in include

    This caused build errors on case-sensitive filesystems.
    liliomk committed Apr 11, 2016
    Configuration menu
    Copy the full SHA
    5efc6d4 View commit details
    Browse the repository at this point in the history
  2. Merge pull request cinder#1418 from kitschpatrol/patch-1

    Fix typos in exception.
    richardeakin committed Apr 11, 2016
    Configuration menu
    Copy the full SHA
    4f1e0e5 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2016

  1. Configuration menu
    Copy the full SHA
    f1af24b View commit details
    Browse the repository at this point in the history
  2. Check for empty DeviceRef in InputNode and OutputNode base classes

    If so throw an exception indicating that there might not be hardware
    available.
    richardeakin committed Apr 12, 2016
    Configuration menu
    Copy the full SHA
    23926c7 View commit details
    Browse the repository at this point in the history
  3. Don't try to write audio file with zero numFrames, since some plaftor…

    …ms (MF) can't handle that
    richardeakin committed Apr 12, 2016
    Configuration menu
    Copy the full SHA
    34fb72e View commit details
    Browse the repository at this point in the history
  4. MF audio target only Finalize()es the audio file if samples were writ…

    …ten, as it fails otherwise.
    richardeakin committed Apr 12, 2016
    Configuration menu
    Copy the full SHA
    98e62cb View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    63ef1e1 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    af60e4b View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2016

  1. Fixed write position bug in BufferRecorderNode::process()

    Now mWritePos gets updated in process() through
    std::atomic::compare_exchange_strong().
    The update only happens if mWritePos didn't change since the beginning
    of process().
    if it did change, then it means mWritePos has been reset to 0 by another
    thread calling start() and
    therefore it must not be updated ( by adding numWriteFrames to it ) or
    the new recording will start with an offset of numWriteFrames from the
    beginning of the buffer.
    martinfm committed Apr 13, 2016
    Configuration menu
    Copy the full SHA
    1cff126 View commit details
    Browse the repository at this point in the history
  2. Merge pull request cinder#1426 from liliomk/master

    Build fix: Fixed file names in include
    richardeakin committed Apr 13, 2016
    Configuration menu
    Copy the full SHA
    4e6d2f8 View commit details
    Browse the repository at this point in the history
  3. Merge pull request cinder#1425 from richardeakin/audio_target_no_frames

    Handle writing zero frames to an audio::TargetFile
    richardeakin committed Apr 13, 2016
    Configuration menu
    Copy the full SHA
    318218f View commit details
    Browse the repository at this point in the history
  4. Merge pull request cinder#1424 from richardeakin/audio_msw_handle_no_…

    …device
    
    Handle no available audio device in a recoverable manner.
    richardeakin committed Apr 13, 2016
    Configuration menu
    Copy the full SHA
    ac7198d View commit details
    Browse the repository at this point in the history
  5. Merge branch 'master' of https://github.com/martinfm/Cinder into mart…

    …infm-fix_buffer_recorder_process_write
    richardeakin committed Apr 13, 2016
    Configuration menu
    Copy the full SHA
    be05f17 View commit details
    Browse the repository at this point in the history
  6. minor whitespace fix

    richardeakin committed Apr 13, 2016
    Configuration menu
    Copy the full SHA
    0f25ed8 View commit details
    Browse the repository at this point in the history

Commits on May 4, 2016

  1. Fixed an issue with Trim::findNonTransparentArea...

    ...where scanning from the right side was off by 1 pixel.
    Paul Houx committed May 4, 2016
    Configuration menu
    Copy the full SHA
    fc90ed1 View commit details
    Browse the repository at this point in the history

Commits on May 5, 2016

  1. Configuration menu
    Copy the full SHA
    403f5b5 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2016

  1. Merge pull request cinder#1456 from paulhoux/fix-trim

    Fixed an issue with Trim::findNonTransparentArea...
    Paul Houx committed May 6, 2016
    Configuration menu
    Copy the full SHA
    235f052 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2016

  1. Configuration menu
    Copy the full SHA
    90a4a94 View commit details
    Browse the repository at this point in the history

Commits on May 20, 2016

  1. Fix typo in comment

    stevensona committed May 20, 2016
    Configuration menu
    Copy the full SHA
    c11c4ac View commit details
    Browse the repository at this point in the history
  2. Update GlslProg.h

    "directive" vice "derictive"
    stevensona committed May 20, 2016
    Configuration menu
    Copy the full SHA
    f958365 View commit details
    Browse the repository at this point in the history
  3. Merge pull request cinder#1468 from stevensona/patch-1

    Fix typo in comment
    andrewfb committed May 20, 2016
    Configuration menu
    Copy the full SHA
    2953709 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2016

  1. Configuration menu
    Copy the full SHA
    6e61203 View commit details
    Browse the repository at this point in the history

Commits on May 27, 2016

  1. Minor tweaks to previous

    andrewfb committed May 27, 2016
    Configuration menu
    Copy the full SHA
    cd5ff09 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2016

  1. Merge branch 'large-surface' of https://github.com/notlion/Cinder int…

    …o notlion-large-surface
    andrewfb committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    ad33281 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a6a768c View commit details
    Browse the repository at this point in the history
  3. Changing signature of SurfaceConstraints::getRowBytes() to take 'requ…

    …estedWidth' as an int32_t
    andrewfb committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    e94f43d View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2016

  1. Configuration menu
    Copy the full SHA
    266bca6 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a644954 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2016

  1. Typo correction

    Change 'consise' to 'concise'
    jasonsturges committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    d163e26 View commit details
    Browse the repository at this point in the history
  2. Merge pull request cinder#1475 from jasonsturges/errata

    Typo correction in contributing.md
    andrewfb committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    0481475 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2016

  1. Fixed an issue with uncompressed dds texture

    it should respect the DDPF_FOURCC bit in the pixel format flags (often
    absent in uncompressed dds files) and handle the case when fourcc is not
    used.
    philcn committed Jun 10, 2016
    Configuration menu
    Copy the full SHA
    23f92ba View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5e8c64e View commit details
    Browse the repository at this point in the history
  3. Merge pull request cinder#1476 from philcn/fix-dds-parsing

    Fixed an issue with uncompressed dds texture
    andrewfb committed Jun 10, 2016
    Configuration menu
    Copy the full SHA
    e7ea5d9 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2016

  1. Merge branch 'master' into android_linux

    Resolved conflicts:
    	include/cinder/Cinder.h
    	include/cinder/audio/msw/ContextWasapi.h
    	include/cinder/audio/msw/DeviceManagerWasapi.h
    	vc2015_winrt/cinder.vcxproj
    richardeakin committed Jul 17, 2016
    Configuration menu
    Copy the full SHA
    e0a86ae View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2016

  1. Configuration menu
    Copy the full SHA
    de40f20 View commit details
    Browse the repository at this point in the history