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
Syncing master and android_linux branches #1506
Commits on Feb 25, 2016
-
Configuration menu - View commit details
-
Copy full SHA for dd5901f - Browse repository at this point
Copy the full SHA dd5901fView commit details
Commits on Mar 1, 2016
-
Configuration menu - View commit details
-
Copy full SHA for e1996f9 - Browse repository at this point
Copy the full SHA e1996f9View commit details -
Fix velocity buffer motion blur sample.
Now-default alpha blending broke the velocity buffer rendering. Simply disabled the alpha blending.
David Wicks committedMar 1, 2016 Configuration menu - View commit details
-
Copy full SHA for 9f040c2 - Browse repository at this point
Copy the full SHA 9f040c2View commit details -
Merge pull request cinder#1339 from andrewfb/powerManagementFix
Fixing OS X sleep-prevention code to address cinder#1323
Configuration menu - View commit details
-
Copy full SHA for 9a9679f - Browse repository at this point
Copy the full SHA 9a9679fView commit details
Commits on Mar 2, 2016
-
Merge pull request cinder#1356 from sansumbrella/motion_blur
Fix velocity buffer motion blur sample.
Configuration menu - View commit details
-
Copy full SHA for 522873f - Browse repository at this point
Copy the full SHA 522873fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 6aad897 - Browse repository at this point
Copy the full SHA 6aad897View commit details -
Configuration menu - View commit details
-
Copy full SHA for 7d5106d - Browse repository at this point
Copy the full SHA 7d5106dView commit details
Commits on Mar 3, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 57db533 - Browse repository at this point
Copy the full SHA 57db533View commit details -
Configuration menu - View commit details
-
Copy full SHA for c3b173f - Browse repository at this point
Copy the full SHA c3b173fView commit details -
Merge pull request cinder#1352 from richardeakin/msw_include_sdkddkver.h
include sdkddkver.h in Cinder.h
Configuration menu - View commit details
-
Copy full SHA for 390723e - Browse repository at this point
Copy the full SHA 390723eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 83cc987 - Browse repository at this point
Copy the full SHA 83cc987View commit details -
Merge pull request cinder#1362 from richardeakin/msw_report_cmyk_unsu…
…pported detect CMYK files and throw more detailed exception on MSW.
Configuration menu - View commit details
-
Copy full SHA for a7b29ed - Browse repository at this point
Copy the full SHA a7b29edView commit details
Commits on Mar 5, 2016
-
Configuration menu - View commit details
-
Copy full SHA for cea170e - Browse repository at this point
Copy the full SHA cea170eView commit details
Commits on Mar 6, 2016
-
Configuration menu - View commit details
-
Copy full SHA for bf3692b - Browse repository at this point
Copy the full SHA bf3692bView commit details
Commits on Mar 8, 2016
-
Tobias Thyrrestrup committed
Mar 8, 2016 Configuration menu - View commit details
-
Copy full SHA for 80438ff - Browse repository at this point
Copy the full SHA 80438ffView commit details
Commits on Mar 10, 2016
-
Merge pull request cinder#1367 from richardeakin/glm_using_additions
added some popular glsl methods to the using explicit list
Configuration menu - View commit details
-
Copy full SHA for 66d6395 - Browse repository at this point
Copy the full SHA 66d6395View commit details -
Merge pull request cinder#1370 from thyrrestrup/VertBatch_cleanup
VertBatch cleanup
Configuration menu - View commit details
-
Copy full SHA for c8b0f52 - Browse repository at this point
Copy the full SHA c8b0f52View commit details -
Configuration menu - View commit details
-
Copy full SHA for 7569a36 - Browse repository at this point
Copy the full SHA 7569a36View commit details -
Merge pull request cinder#1377 from cinder/revert-1370-VertBatch_cleanup
Revert "VertBatch cleanup"
Configuration menu - View commit details
-
Copy full SHA for acd7927 - Browse repository at this point
Copy the full SHA acd7927View commit details -
Merge pull request cinder#1360 from ryanbartley/OscShutdown
Osc and Tuio updates
Configuration menu - View commit details
-
Copy full SHA for ea05b33 - Browse repository at this point
Copy the full SHA ea05b33View commit details -
Configuration menu - View commit details
-
Copy full SHA for b56df4a - Browse repository at this point
Copy the full SHA b56df4aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 85405e8 - Browse repository at this point
Copy the full SHA 85405e8View commit details
Commits on Mar 14, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 73d76dd - Browse repository at this point
Copy the full SHA 73d76ddView commit details
Commits on Mar 15, 2016
-
Merge pull request cinder#1384 from justinbmartin/master
Fixed gl::Sync Position in Flickr Multi-threaded Sample
Configuration menu - View commit details
-
Copy full SHA for d742716 - Browse repository at this point
Copy the full SHA d742716View commit details -
Merge pull request cinder#1378 from richardeakin/thyrrestrip_VertBatc…
…h_cleanup Thyrrestrup vert batch cleanup
Configuration menu - View commit details
-
Copy full SHA for 583e67c - Browse repository at this point
Copy the full SHA 583e67cView commit details
Commits on Mar 23, 2016
-
use a vector<Connection> to store mouse connections, ensuring that we…
… don't allow duplicate connections
Configuration menu - View commit details
-
Copy full SHA for 459d273 - Browse repository at this point
Copy the full SHA 459d273View commit details
Commits on Mar 25, 2016
-
Configuration menu - View commit details
-
Copy full SHA for ed94311 - Browse repository at this point
Copy the full SHA ed94311View commit details
Commits on Mar 30, 2016
-
Configuration menu - View commit details
-
Copy full SHA for f49a33e - Browse repository at this point
Copy the full SHA f49a33eView commit details -
Merge pull request cinder#1406 from ryanbartley/OscFix
Fixing vc2013 handling of std::atomic
Configuration menu - View commit details
-
Copy full SHA for 697de3f - Browse repository at this point
Copy the full SHA 697de3fView commit details -
Merge pull request cinder#1399 from notlion/rect-scaledcentered-vec2
Add vec2 overload of RectT::scaledCentered()
Configuration menu - View commit details
-
Copy full SHA for eda2f1b - Browse repository at this point
Copy the full SHA eda2f1bView commit details
Commits on Mar 31, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 8ff810b - Browse repository at this point
Copy the full SHA 8ff810bView commit details
Commits on Apr 2, 2016
-
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.
Configuration menu - View commit details
-
Copy full SHA for bb1be35 - Browse repository at this point
Copy the full SHA bb1be35View commit details
Commits on Apr 4, 2016
-
Merge pull request cinder#1398 from richardeakin/cameraui_signal_vector
Clear out existing CameraUi signals before connecting again
Configuration menu - View commit details
-
Copy full SHA for 9cf590e - Browse repository at this point
Copy the full SHA 9cf590eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 6334b97 - Browse repository at this point
Copy the full SHA 6334b97View commit details
Commits on Apr 6, 2016
-
Merge pull request cinder#1413 from richardeakin/ignore_VC.db
Ignore Visual Studio's new DB file
Configuration menu - View commit details
-
Copy full SHA for cd96790 - Browse repository at this point
Copy the full SHA cd96790View commit details -
Configuration menu - View commit details
-
Copy full SHA for 46ac324 - Browse repository at this point
Copy the full SHA 46ac324View commit details
Commits on Apr 11, 2016
-
This caused build errors on case-sensitive filesystems.
Configuration menu - View commit details
-
Copy full SHA for 5efc6d4 - Browse repository at this point
Copy the full SHA 5efc6d4View commit details -
Merge pull request cinder#1418 from kitschpatrol/patch-1
Fix typos in exception.
Configuration menu - View commit details
-
Copy full SHA for 4f1e0e5 - Browse repository at this point
Copy the full SHA 4f1e0e5View commit details
Commits on Apr 12, 2016
-
Configuration menu - View commit details
-
Copy full SHA for f1af24b - Browse repository at this point
Copy the full SHA f1af24bView commit details -
Check for empty DeviceRef in InputNode and OutputNode base classes
If so throw an exception indicating that there might not be hardware available.
Configuration menu - View commit details
-
Copy full SHA for 23926c7 - Browse repository at this point
Copy the full SHA 23926c7View commit details -
Don't try to write audio file with zero numFrames, since some plaftor…
…ms (MF) can't handle that
Configuration menu - View commit details
-
Copy full SHA for 34fb72e - Browse repository at this point
Copy the full SHA 34fb72eView commit details -
MF audio target only Finalize()es the audio file if samples were writ…
…ten, as it fails otherwise.
Configuration menu - View commit details
-
Copy full SHA for 98e62cb - Browse repository at this point
Copy the full SHA 98e62cbView commit details -
Configuration menu - View commit details
-
Copy full SHA for 63ef1e1 - Browse repository at this point
Copy the full SHA 63ef1e1View commit details -
Configuration menu - View commit details
-
Copy full SHA for af60e4b - Browse repository at this point
Copy the full SHA af60e4bView commit details
Commits on Apr 13, 2016
-
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.
Configuration menu - View commit details
-
Copy full SHA for 1cff126 - Browse repository at this point
Copy the full SHA 1cff126View commit details -
Merge pull request cinder#1426 from liliomk/master
Build fix: Fixed file names in include
Configuration menu - View commit details
-
Copy full SHA for 4e6d2f8 - Browse repository at this point
Copy the full SHA 4e6d2f8View commit details -
Merge pull request cinder#1425 from richardeakin/audio_target_no_frames
Handle writing zero frames to an audio::TargetFile
Configuration menu - View commit details
-
Copy full SHA for 318218f - Browse repository at this point
Copy the full SHA 318218fView commit details -
Merge pull request cinder#1424 from richardeakin/audio_msw_handle_no_…
…device Handle no available audio device in a recoverable manner.
Configuration menu - View commit details
-
Copy full SHA for ac7198d - Browse repository at this point
Copy the full SHA ac7198dView commit details -
Merge branch 'master' of https://github.com/martinfm/Cinder into mart…
…infm-fix_buffer_recorder_process_write
Configuration menu - View commit details
-
Copy full SHA for be05f17 - Browse repository at this point
Copy the full SHA be05f17View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0f25ed8 - Browse repository at this point
Copy the full SHA 0f25ed8View commit details
Commits on May 4, 2016
-
Fixed an issue with Trim::findNonTransparentArea...
...where scanning from the right side was off by 1 pixel.
Paul Houx committedMay 4, 2016 Configuration menu - View commit details
-
Copy full SHA for fc90ed1 - Browse repository at this point
Copy the full SHA fc90ed1View commit details
Commits on May 5, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 403f5b5 - Browse repository at this point
Copy the full SHA 403f5b5View commit details
Commits on May 6, 2016
-
Merge pull request cinder#1456 from paulhoux/fix-trim
Fixed an issue with Trim::findNonTransparentArea...
Paul Houx committedMay 6, 2016 Configuration menu - View commit details
-
Copy full SHA for 235f052 - Browse repository at this point
Copy the full SHA 235f052View commit details
Commits on May 9, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 90a4a94 - Browse repository at this point
Copy the full SHA 90a4a94View commit details
Commits on May 20, 2016
-
Configuration menu - View commit details
-
Copy full SHA for c11c4ac - Browse repository at this point
Copy the full SHA c11c4acView commit details -
Configuration menu - View commit details
-
Copy full SHA for f958365 - Browse repository at this point
Copy the full SHA f958365View commit details -
Merge pull request cinder#1468 from stevensona/patch-1
Fix typo in comment
Configuration menu - View commit details
-
Copy full SHA for 2953709 - Browse repository at this point
Copy the full SHA 2953709View commit details
Commits on May 24, 2016
-
Make sure CGContext exists before attempting to get windows contents.
Possible fix for issue cinder#1454.
Configuration menu - View commit details
-
Copy full SHA for 6e61203 - Browse repository at this point
Copy the full SHA 6e61203View commit details
Commits on May 27, 2016
-
Configuration menu - View commit details
-
Copy full SHA for cd5ff09 - Browse repository at this point
Copy the full SHA cd5ff09View commit details
Commits on Jun 2, 2016
-
Merge branch 'large-surface' of https://github.com/notlion/Cinder int…
…o notlion-large-surface
Configuration menu - View commit details
-
Copy full SHA for ad33281 - Browse repository at this point
Copy the full SHA ad33281View commit details -
Configuration menu - View commit details
-
Copy full SHA for a6a768c - Browse repository at this point
Copy the full SHA a6a768cView commit details -
Changing signature of SurfaceConstraints::getRowBytes() to take 'requ…
…estedWidth' as an int32_t
Configuration menu - View commit details
-
Copy full SHA for e94f43d - Browse repository at this point
Copy the full SHA e94f43dView commit details
Commits on Jun 5, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 266bca6 - Browse repository at this point
Copy the full SHA 266bca6View commit details -
Configuration menu - View commit details
-
Copy full SHA for a644954 - Browse repository at this point
Copy the full SHA a644954View commit details
Commits on Jun 7, 2016
-
Configuration menu - View commit details
-
Copy full SHA for d163e26 - Browse repository at this point
Copy the full SHA d163e26View commit details -
Merge pull request cinder#1475 from jasonsturges/errata
Typo correction in contributing.md
Configuration menu - View commit details
-
Copy full SHA for 0481475 - Browse repository at this point
Copy the full SHA 0481475View commit details
Commits on Jun 10, 2016
-
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.
Configuration menu - View commit details
-
Copy full SHA for 23f92ba - Browse repository at this point
Copy the full SHA 23f92baView commit details -
Configuration menu - View commit details
-
Copy full SHA for 5e8c64e - Browse repository at this point
Copy the full SHA 5e8c64eView commit details -
Merge pull request cinder#1476 from philcn/fix-dds-parsing
Fixed an issue with uncompressed dds texture
Configuration menu - View commit details
-
Copy full SHA for e7ea5d9 - Browse repository at this point
Copy the full SHA e7ea5d9View commit details
Commits on Jul 17, 2016
-
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
Configuration menu - View commit details
-
Copy full SHA for e0a86ae - Browse repository at this point
Copy the full SHA e0a86aeView commit details
Commits on Jul 18, 2016
-
Fix sample's prepareSettings() function on MSW, vc120 doesn't like th…
…e preprocessor macro.
Configuration menu - View commit details
-
Copy full SHA for de40f20 - Browse repository at this point
Copy the full SHA de40f20View commit details