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

Jump to bottom

Apothecary - OpenCV formula Fix. #4605

Merged
merged 1 commit into from Nov 19, 2015
Merged

Apothecary - OpenCV formula Fix. #4605

merged 1 commit into from Nov 19, 2015

Conversation

danoli3
Copy link
Member

@danoli3 danoli3 commented Nov 19, 2015

Fixes merge issues / reverts of #4577 and #4579

danoli3 added a commit that referenced this pull request Nov 19, 2015
@danoli3
Merge pull request #4605 from danoli3/Apothecary/OpenCVfix
97d1096 
Apothecary - OpenCV formula Fix.
@danoli3 danoli3 merged commit 97d1096 into openframeworks:master Nov 19, 2015
@danoli3 danoli3 deleted the Apothecary/OpenCVfix branch November 19, 2015 06:42
2bbb added a commit to 2bbb/openFrameworks that referenced this pull request Jan 6, 2016
@2bbb
merge master
c1c5566 
commit 26692fe8fc683180c32932b08d35fc56b88bb1f7
Merge: 285e3f8 2fc50bf
Author: arturo <arturo@openframeworks.cc>
Date:   Tue Jan 5 13:05:01 2016 +0100

    Merge pull request #4714 from whg/master

    optimise ofPixels::setImageType() on Windows VS

commit 2fc50bf0affec75360d6287a149ac8b35949adad
Author: Will Gallia <wgallia@gmail.com>
Date:   Tue Jan 5 11:21:04 2016 +0000

    optimise ofPixels::setImageType()

    Using Visual Studio, calling getNumChannels() inside the for each pixel
    loop has a huge effect on performance. By simply caching this result we
    can get a 20x speed up. 180 -> 9ms on an 1920x1080 RGB to grayscale.

    The difference with Xcode is minimal.

commit 285e3f80be7b89db28d7c3597579534937875ca5
Merge: 695e86a 65e0efc
Author: Christopher Baker <me@christopherbaker.net>
Date:   Wed Dec 30 11:21:08 2015 -0600

    Merge pull request #4140 from tpltnt/bugfix-ofXml

    (style) fixes ofXml

commit 695e86aa294e622a2e38916f675d9751c5d5cfbb
Merge: 34ff489 c6d5be3
Author: arturo <arturo@openframeworks.cc>
Date:   Wed Dec 30 16:05:13 2015 +0100

    Merge pull request #4707 from arturoc/fix-dsplayerformat

    DS VideoPlayer: add support for all different RGB formats

commit 34ff4898554755529637bc917f555c70880d9b6b
Merge: 773595a 8827319
Author: arturo <arturo@openframeworks.cc>
Date:   Wed Dec 30 15:10:44 2015 +0100

    Merge pull request #4704 from arturoc/bugfix-rpi2-armv6

    linux arm7: switch back rpi2 to specific target and generic to default

commit c6d5be3916e905260cee9645a6d3abf4ca617e09
Author: arturoc <arturo@openframeworks.cc>
Date:   Wed Dec 30 15:00:27 2015 +0100

    DS VideoPlayer: add support for all different RGB formats

    Closes: #4679

commit 882731993cc4cc6c4ab6e6a6d2d42ce1a5fb8a8e
Author: arturo castro <arturo@openframeworks.cc>
Date:   Tue Dec 29 13:15:37 2015 +0100

    rpi2 specific makefile config

commit 0e40dcf39c48e4ce84bb5a689a52d8a93e3b65b7
Author: arturo castro <arturo@openframeworks.cc>
Date:   Tue Dec 29 12:36:41 2015 +0100

    linux arm7: switch back rpi2 to specific target and generic to default

    using armv7 with raspbian is problematic since raspbian binaries are
    compiled for armv6. we switch to recommending people to use armv6
    when using raspbian and set generic as the default target on arm7

    Closes #4409

commit 773595ac8578793b984a10309e77e48ef277d6ff
Merge: 54109a0 7c66f04
Author: arturo <arturo@openframeworks.cc>
Date:   Tue Dec 29 12:10:52 2015 +0100

    Merge pull request #4697 from openframeworks/bugfix-fullscreenrot

    bugfix for 90 degree orientation not working for fullscreen

commit 54109a0c1dafaaa1162eeefcd66ca41809e98ecf
Author: arturo castro <arturo@openframeworks.cc>
Date:   Tue Dec 29 12:08:07 2015 +0100

    GLFW special ofSetupOpenGL: better comments and include

commit 989400a6f15c1df1858693d0658977d35ba1d7d2
Merge: 8a6e0df a4df842
Author: arturo castro <arturo@openframeworks.cc>
Date:   Tue Dec 29 12:00:43 2015 +0100

    Merge branch 'bugfix-set-multifullscreen' of github.com:openframeworks/openFrameworks

commit 8a6e0dfd12f0829378238f4590ebb4ce6facb6af
Author: arturo castro <arturo@openframeworks.cc>
Date:   Tue Dec 29 11:59:26 2015 +0100

    ofWindowSettings: add title to window settings

commit 1e14fbf48103a0beef2fce6cbdd05f1d65011f0f
Merge: 23f450d 45838e0
Author: arturo castro <arturo@openframeworks.cc>
Date:   Tue Dec 29 11:51:28 2015 +0100

    Merge branch 'master' of github.com:openframeworks/openFrameworks

commit 23f450daa4ae608fa63d534c635539b65c76058f
Author: arturo castro <arturo@openframeworks.cc>
Date:   Tue Dec 29 11:50:58 2015 +0100

    ofBufferObject: better logic for binding/unbinding when mapping

commit a4df8421884cae5a59c715302221208864c10877
Author: ofTheo <theo@openframeworks.cc>
Date:   Mon Dec 28 16:42:09 2015 -0500

    ifdef for glfw

commit 45838e08f46f2257497a15411a3d98f145433246
Author: ofTheo <theo@openframeworks.cc>
Date:   Mon Dec 28 16:00:04 2015 -0500

    bugfix for multi monitor fullscreen not accounting for pixel density. closes #4699

commit c9e6c0deb4b458d990a6c8177889c1232e3f3319
Author: ofTheo <theo@openframeworks.cc>
Date:   Mon Dec 28 15:56:12 2015 -0500

    bugfix for shrinking window on ofToggleFullscreen closes #4696

commit 7c66f0441b9f021076978495deb990f1dff650a4
Author: ofTheo <theo@openframeworks.cc>
Date:   Mon Dec 28 15:49:38 2015 -0500

    fix for windows

commit b8ea95d4d65780c073739ba30bc5cac04f3a9548
Author: ofTheo <theo@openframeworks.cc>
Date:   Mon Dec 28 14:48:13 2015 -0500

    moved the include to the cpp.

commit 5c91e490004f3845d4866ecf895515c06564313d
Author: ofTheo <theo@openframeworks.cc>
Date:   Mon Dec 28 14:46:09 2015 -0500

    app runner changes

commit 84f6a225b2699d577ba935c02361204cc98cec74
Author: ofTheo <theo@openframeworks.cc>
Date:   Mon Dec 28 14:43:18 2015 -0500

    bugfix for being able to set the multidisplay fullscreen with the legacy window approach. closes #4698

commit 9a99336c806ed3cc69f1881528cde6854c1a5c27
Merge: 93ba21f ac80dc0
Author: Theodore Watson <theo@openframeworks.cc>
Date:   Mon Dec 28 14:12:50 2015 -0500

    Merge pull request #4701 from openframeworks/bugfix-retina-setupsize

    fixes issue where the window size is half as big on retina machines only on the initial setup.

commit ac80dc0718f2f999583dda9453fb440438b19e3e
Author: ofTheo <theo@openframeworks.cc>
Date:   Mon Dec 28 14:11:09 2015 -0500

    fixes issue where the window size is half as big on retina machines only on the initial setup. closes #3733

commit 93ba21fbda278527a308d3ccf439c4b82e9b6b58
Merge: 1e3db9a 9204579
Author: Theodore Watson <theo@openframeworks.cc>
Date:   Mon Dec 28 12:12:14 2015 -0500

    Merge pull request #4490 from NickHardeman/bugfix-glfw-fullscreen-multi

    Bugfix glfw fullscreen multi - fix for setting monitor and fullscreen in glfw settings on OSX

commit 9dabba759a698f4ffd15af76f294a2b974116b4f
Author: ofTheo <theo@openframeworks.cc>
Date:   Mon Dec 28 12:02:40 2015 -0500

    bugfix for 90 degree orientation not working for fullscreen and small bugfix for window shrinking on hidpi screens. closes #4696 closes #4682

commit 1e3db9af1c0f9be0892ce565e0ee500aeabb169f
Merge: 5ba0285 2052051
Author: arturo <arturo@openframeworks.cc>
Date:   Mon Dec 28 10:41:43 2015 +0100

    Merge pull request #4690 from i-n-g-o/ofAVFoundationVideoPlayer_accept_volume_anyway

    set volume even if we are not ready

commit 5ba028551f0a248a5ea3fb09d1a840a0bedf0432
Merge: b1239cd d95b158
Author: arturo <arturo@openframeworks.cc>
Date:   Mon Dec 28 10:41:21 2015 +0100

    Merge pull request #4695 from roymacdonald/hotfix_ofSoundBuffer_getChannel

    Hotfix ofSoundBuffer::getChannel

commit d95b1583deddddd6c9bed0f4b1148d2a0502d76a
Author: Roy Macdonald <macdonald.roy@gmail.com>
Date:   Mon Dec 28 02:15:40 2015 -0300

    Hotfix: ofSoundBuffer::getChannel
    -was ignoring the targetChannel argument. now fixed.
    -The targetBuffer argument was being resized to the incorrect value, thus returning wrong data

commit adc12b64e1a8d68566b164f253c257760a3cbdd4
Author: Roy Macdonald <macdonald.roy@gmail.com>
Date:   Thu Dec 24 18:21:35 2015 -0600

    hotfix->ofSoundBuffer::getChannel(ofSoundBuffer & targetBuffer, std::size_t sourceChannel) would ignore sourceChannel and it will always return the first channel. Now fixed

commit 2052051bcf293ad27c3f8b908d2bd57b5b79fa59
Author: Ingo Randolf <ingo.randolf@servus.at>
Date:   Fri Dec 25 07:36:28 2015 +0900

    set volume even if we are not ready

commit 65e0efc2a23572b40b98ebba48e8d8b4bf7f42c4
Author: tpltnt <tpltnt.github@dropcut.net>
Date:   Thu Dec 24 13:27:44 2015 +0100

    redo some style fixes

commit d5c7965fb00e1afb79cd87cd16c82d456e49f0de
Merge: fdc0d7f b1239cd
Author: tpltnt <tpltnt.github@dropcut.net>
Date:   Thu Dec 24 13:07:59 2015 +0100

    synced with master & resolved merge conflicts

commit b1239cd23ae59e377f03b553c364cc9d31080bbf
Merge: db663f1 0331d8c
Author: arturo <arturo@openframeworks.cc>
Date:   Tue Dec 22 23:11:10 2015 +0100

    Merge pull request #4687 from bakercp/ofParameterGroup-const-fix

    Const correction for ofParameterGroup::contains

commit 0331d8cb529303f64e2d0f04e387c601e3881135
Author: Christopher Baker <me@christopherbaker.net>
Date:   Tue Dec 22 10:33:13 2015 -0600

    Const correction.

commit db663f1b78d16a26d527cec4cdcecb931aa501d7
Merge: 7981fe4 48e5767
Author: arturo <arturo@openframeworks.cc>
Date:   Tue Dec 22 12:19:45 2015 +0100

    Merge pull request #4685 from mattfelsen/pg-rename

    Update create_package.sh for pg electron folder name change

commit 48e576728be103d2d8a09a9c06bfabdaae8a61ee
Author: Matt Felsen <mattfelsen@gmail.com>
Date:   Mon Dec 21 10:55:16 2015 -0500

    Update create_package.sh for pg electron folder name change

commit 7981fe4585ec05fbcd18ac4352682588d75b7d5f
Merge: 9333412 458d2f6
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sat Dec 19 12:37:54 2015 +0100

    Merge branch 'master' of github.com:openframeworks/openFrameworks

commit 93334123637dbc50aa8ca85cfabde2af8a21b13e
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sat Dec 19 12:37:21 2015 +0100

    ofBufferObject: fix pack/unpack targets

commit 458d2f6ccdd776100918abdd21b5ee8937809dfd
Merge: 66a0629 d6d1b24
Author: Daniel Rosser <danoli3@gmail.com>
Date:   Sat Dec 19 06:17:01 2015 +1100

    Merge pull request #4681 from i-n-g-o/iOS_AVFoundationPlayer_simplify_setVolume

    simplified setVolume

commit 66a0629225290ffa5613acf7e5c222ff84d3f7c9
Merge: ad68e77 44a9983
Author: arturo <arturo@openframeworks.cc>
Date:   Fri Dec 18 00:15:15 2015 +0100

    Merge pull request #4669 from i-n-g-o/ofAVFoundationVideoPlayer_simplified_setVolume

    ofAVFoundationVideoPlayer: simplified setVolume

commit d6d1b249c6a93d3c79eb66db2400e396c031678d
Author: Ingo Randolf <ingo.randolf@servus.at>
Date:   Thu Dec 17 18:35:39 2015 +0100

    simplified setVolume

commit ad68e77e25ad06f51f5c8fcf10823775d6111f5c
Merge: 9bb1ebc ed6bdad
Author: Daniel Rosser <danoli3@gmail.com>
Date:   Wed Dec 16 04:06:40 2015 +1100

    Merge pull request #4674 from danoli3/Android/Fix-androidSwipeExample

    Fix androidSwipeExample

commit ed6bdad64df56e48eaa353ddbeeaec175dbc3c88
Author: Daniel Rosser <danoli3@gmail.com>
Date:   Wed Dec 16 04:05:50 2015 +1100

    Fix androidSwipeExample

commit 9bb1ebce5c8bd0876dcfa9d41db43ba39b17568a
Merge: 128d2f8 0808132
Author: arturo castro <arturo@openframeworks.cc>
Date:   Tue Dec 15 17:54:42 2015 +0100

    Merge branch 'master' of github.com:openframeworks/openFrameworks

commit 128d2f803cb246b08c00c1fc0b5770497137bbad
Author: arturo castro <arturo@openframeworks.cc>
Date:   Tue Dec 15 17:54:13 2015 +0100

    PG: update to latest master

commit 08081325b6c959c176f7837c10cde2063a9b533f
Merge: 177f146 bfc6bd7
Author: arturo <arturo@openframeworks.cc>
Date:   Tue Dec 15 16:44:23 2015 +0100

    Merge pull request #4548 from HalfdanJ/android_studio_template

    Android studio template

commit 177f1468399be5392654e540f93109755d8bf6bc
Merge: fa2aa50 6691de8
Author: arturo <arturo@openframeworks.cc>
Date:   Tue Dec 15 16:43:29 2015 +0100

    Merge pull request #4611 from 2bbb/PR/ofxOsc_tidying_up

    ofxOsc tidying up

commit fa2aa504f6f7eccba523d6f6743562b4e753f3ab
Merge: 6345308 6eb3964
Author: Daniel Rosser <danoli3@gmail.com>
Date:   Wed Dec 16 01:07:49 2015 +1100

    Merge pull request #4672 from danoli3/OSX/opencv-9.1

    Apothecary - ofxOpenCV Updated Library - OS X

commit 6345308c773527fcc6e7d1503194a86f9b116691
Merge: 693e7fb 4217c2e
Author: Daniel Rosser <danoli3@gmail.com>
Date:   Wed Dec 16 01:07:36 2015 +1100

    Merge pull request #4671 from danoli3/iOS/opencv-9.1

    Apothecary - ofxOpenCV - iOS Updated Static libs

commit 6eb3964cc79be2d10e8e4880bef1be1bd3355990
Author: Daniel Rosser <danoli3@gmail.com>
Date:   Wed Dec 16 00:29:00 2015 +1100

    Apothecary - ofxOpenCV Updated Library - OS X

commit 4217c2e99ea5b84ba523f1f77f1f23ebe26d05b8
Author: Daniel Rosser <danoli3@gmail.com>
Date:   Tue Dec 15 23:59:58 2015 +1100

    Apothecary - ofxOpenCV - iOS Updated Static libs (arm64, armv7, i386, x86_64)

commit 693e7fbb788fc08bf3ef96418050c6ba8daee689
Merge: 0138029 74aa1b0
Author: Daniel Rosser <danoli3@gmail.com>
Date:   Tue Dec 15 22:54:40 2015 +1100

    Merge pull request #4670 from danoli3/iOS/Fix-iOS8

    Fix for Cannot find protocol declaration iOS UIViewControllerTransitionCoordinator

commit f66151791d3ccdc9651d777691bafe691eb662d3
Author: arturo castro <arturo@openframeworks.cc>
Date:   Tue Dec 15 11:42:08 2015 +0100

    ofShader: better fix for uniforms cache

commit 0138029d5078a9c7530bc413080751ea1b864e5f
Author: arturo castro <arturo@openframeworks.cc>
Date:   Tue Dec 15 11:40:45 2015 +0100

    install_dependencies: bring back jack libs

    there was a temporary error in the test servers

commit 74aa1b0bd6c7b5ec18dcd5076155fe99811a4d0d
Author: Daniel Rosser <danoli3@gmail.com>
Date:   Tue Dec 15 20:47:37 2015 +1100

    Fix for  Cannot find protocol declaration for 'UIViewControllerTransitionCoordinator' iOS <8 SDK

commit df55613debd1689c648f334eb502ed311676f501
Author: arturo castro <arturo@openframeworks.cc>
Date:   Mon Dec 14 15:12:53 2015 +0100

    remove libaudio-dev fails on 14.04

commit 624a58dfa141d235661e63624dd5e45c035f76b3
Author: arturo castro <arturo@openframeworks.cc>
Date:   Mon Dec 14 14:50:41 2015 +0100

    install_dependencies.sh_: remove jack seems to fail in test servers

commit 56d09337b479e19369ef35033a81b0f7b21c616b
Author: arturo castro <arturo@openframeworks.cc>
Date:   Mon Dec 14 14:40:38 2015 +0100

    install_dependencies ubuntu: fixsing non-existing package

commit 5a12aa7a987cc2aac7ebbe29485f3b4ba61e0897
Author: arturo castro <arturo@openframeworks.cc>
Date:   Mon Dec 14 14:18:21 2015 +0100

    ofParameter: add getNumListeners

commit 505dc14fdd4a5d2971b8eb788dae404b90f2e0f1
Author: arturo castro <arturo@openframeworks.cc>
Date:   Mon Dec 14 13:16:36 2015 +0100

    ofNode: fix compiling on windows

commit 19f2fbb296f6e303a03070249fb685885e1ece98
Author: arturo castro <arturo@openframeworks.cc>
Date:   Mon Dec 14 13:05:59 2015 +0100

    ubuntu install_dependencies: fix some package that seems to have disappeared in the official repositories

commit bd95979de0c0305759ba646a4488095270f89ba0
Merge: 7059c6f e9701cb
Author: arturo castro <arturo@openframeworks.cc>
Date:   Mon Dec 14 13:03:17 2015 +0100

    Merge branch 'master' of github.com:openframeworks/openFrameworks

commit 7059c6f1db2ad5d59eb44701a1488b63553f5b44
Author: arturo castro <arturo@openframeworks.cc>
Date:   Mon Dec 14 13:02:21 2015 +0100

    ofNodeExample: fix window size, and some small details to make the movement a little better

commit 50991695bd061be767a5a3930b14e541ff9f2a1a
Author: arturo castro <arturo@openframeworks.cc>
Date:   Mon Dec 14 13:01:50 2015 +0100

    fix ofNode to notify it's children when it's position, orientation or scale change

commit 5abbed693d33a6dc73228dc939ed98a2d4604844
Merge: 549447a 34e2bef
Author: arturo castro <arturo@openframeworks.cc>
Date:   Mon Dec 14 12:51:04 2015 +0100

    Merge branch 'feature/add-ofNode-example' of github.com:edap/openFrameworks into fix-node-notifychildren

commit e9701cbe1afb56ee4ed07705ea94bc6bb8ff7fee
Merge: 549447a 5ff655f
Author: arturo <arturo@openframeworks.cc>
Date:   Mon Dec 14 11:53:16 2015 +0100

    Merge pull request #4666 from i-n-g-o/ofAVFoundationVideoPlayer_close_potential_leaks

    ofAVFoundationVideoPlayeR: close potential leak in early exits, videoOutput

commit 549447a09484c0fd6350ae39c7293e99d4aa843a
Author: arturo castro <arturo@openframeworks.cc>
Date:   Mon Dec 14 11:48:25 2015 +0100

    move tutorials/shader to examples, the tutorial in the web has been updated accordingly

    Fixes #4148

commit b2fe292aee09638f85715710e6b398d8e7b03803
Merge: bbdc648 3a7224a
Author: arturo <arturo@openframeworks.cc>
Date:   Mon Dec 14 11:11:56 2015 +0100

    Merge pull request #4665 from i-n-g-o/ofAVFoundationPlayer_remove_bTextureCacheSupported

    remove bTextureCacheSupported. fixes #4073

commit 44a9983e228cc29f4bc6a65d57b364f4e62d2294
Author: Ingo Randolf <ingo.randolf@servus.at>
Date:   Mon Dec 14 10:18:14 2015 +0100

    fixes: SetVolume produces clicks and noises at start #3763

commit 34e2bef362473e690cad3e23d3a6a244e71f4f59
Author: edapx <lastexxit@gmail.com>
Date:   Sun Dec 13 15:21:04 2015 +0100

    fix tabs and correct typo

commit dee98d373c3154290e9cfcc2dbcf78fcdac0ad4f
Author: edapx <lastexxit@gmail.com>
Date:   Sun Dec 13 15:14:36 2015 +0100

    Add ofNode example

commit 5ff655f0386fc75de21ea4c7fc043e6e6fe57363
Author: Ingo Randolf <ingo.randolf@servus.at>
Date:   Sun Dec 13 12:53:25 2015 +0100

    close potential leak in early exits, videoOutput

commit 3a7224aea5807d52a75c91ef64c49a9c3c77fcc6
Author: Ingo Randolf <ingo.randolf@servus.at>
Date:   Sun Dec 13 12:31:19 2015 +0100

    remove bTextureCacheSupported. fixes #4073

commit bbdc648dc692978891d7ec3978b8d96c972c0ddc
Merge: eefd868 082b851
Author: arturo castro <arturo@openframeworks.cc>
Date:   Fri Dec 11 18:09:20 2015 +0100

    Merge branch 'master' of github.com:openframeworks/openFrameworks

commit eefd868bab67c9b2b509a8104aa292f00b24d03d
Author: arturo castro <arturo@openframeworks.cc>
Date:   Fri Dec 11 18:08:45 2015 +0100

    ofShader: fix cache creation

commit 082b8519da349a9a21da3c8baa486dc66215eaea
Merge: 190f0f3 c5be57e
Author: arturo <arturo@openframeworks.cc>
Date:   Tue Dec 8 16:14:25 2015 +0100

    Merge pull request #4658 from mrbichel/patch-2

    Fixed spelling in error message

commit c5be57e0772dce39d95401dc81ef1bf2b24cf834
Author: Johan Bichel Lindegaard <public@johan.cc>
Date:   Tue Dec 8 14:14:35 2015 +0100

    Fixed spelling in error message

    changed createMovoeFromPath to createMovieFromPath

commit 190f0f3fd94a85cd9333d8c89c837bcf51a410ca
Merge: a545bd9 47886c2
Author: arturo <arturo@openframeworks.cc>
Date:   Tue Dec 8 10:59:08 2015 +0100

    Merge pull request #4655 from danomatika/master

    save window position on OS X before going fullscreen

commit 47886c285a9293e9b206ae10cce011689ee33ae7
Author: danomatika <danomatika@gmail.com>
Date:   Mon Dec 7 21:31:32 2015 -0700

    make sure to set window shape if started in fullscreen, related to #4655

commit cd757e517f35f9c58a05e57c70a88eb0ee31beb8
Author: danomatika <danomatika@gmail.com>
Date:   Mon Dec 7 21:21:17 2015 -0700

    importing small whitespace change for #4639 PR

commit 6b2f93106a050de0ae9fb00247bc24ec5e869623
Author: danomatika <danomatika@gmail.com>
Date:   Mon Dec 7 21:12:52 2015 -0700

    save window shape on OSX before going fullscreen, fixes #4639

commit a545bd96485b20344adb9ab4ed6ad5f4b3e1aed6
Author: arturo castro <arturo@openframeworks.cc>
Date:   Mon Dec 7 23:03:01 2015 +0100

    ofShader: fix cache for array uniforms

commit 27ec07c489f1a197f420eb2a544428f700aafecd
Author: arturo castro <arturo@openframeworks.cc>
Date:   Mon Dec 7 12:41:42 2015 +0100

    ofPixels: fix for not owned move assignment and tests

commit 9d9dfa4c85d142d1ecdfb01bcaeba38fb4799fe7
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sun Dec 6 15:05:15 2015 +0100

    ofAppGLFWWindow: fix GLES

    had syntax error in creating rendeder and was creatring wrong renderer
    for the selected GLES version. Closes #4634

commit 52b3f7e08cc0be98ae691f78bd8a3d61ecae23ee
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sun Dec 6 15:02:08 2015 +0100

    gst grabber: workaround for bad functioning drivers returning wrong fps

    Closes #4647

commit 7c9a7ea5c13c79c96704b833efc0791b928ffe14
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sun Dec 6 14:28:53 2015 +0100

    udp test: test that ports stay bound after send and receive

commit c4d5fd3ef359f292a0f897a57c085dbf2c98d783
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sun Dec 6 14:06:22 2015 +0100

    tcp: fix test for #3478

commit e6cb4e2cfe39ccb105cd5c7cd5690a1a7cf3a0f1
Merge: e760a01 053a19a
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sun Dec 6 13:28:13 2015 +0100

    Merge branch 'master' of github.com:openframeworks/openFrameworks

commit e760a015f4ccf2693132f6b21ca1ccaefa518de1
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sun Dec 6 13:27:39 2015 +0100

    tests tcp: test sending max size TCP message

commit 053a19af6da2f11c89533585757b3d6500fb30ae
Merge: c76efba 20838af
Author: arturo <arturo@openframeworks.cc>
Date:   Sun Dec 6 11:34:18 2015 +0100

    Merge pull request #4632 from tenderbolton/fix-ofSerial-NoDataWin

    ofSerial::readByte not returning OF_SERIAL_NO_DATA on Windows

commit c76efba1340b7fd39ff92429adebf9cec96d816c
Merge: 1874775 e704609
Author: arturo <arturo@openframeworks.cc>
Date:   Sun Dec 6 11:02:44 2015 +0100

    Merge pull request #4638 from arturoc/tests-windows

    windows CI (work in progress)

commit e704609d8bd3682ef2e2887a877de5c24311bff3
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sun Dec 6 01:44:33 2015 +0100

    networ tests: use test_gt for timeouts

commit 67e3e0639b70e5c664a76459196d51e2a6135f63
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sun Dec 6 01:25:48 2015 +0100

    unit tests: revert REST api reporting, moved to a different PR

commit 9416b5675b3ccdee7a31468e74dc9b90bdda8fe0
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sun Dec 6 01:19:20 2015 +0100

    ofUtils: revert change

commit 9e343b8216360af54848704afff701d862d93f67
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sun Dec 6 01:18:15 2015 +0100

    ofUtils: revert change

commit 35ed82163b833e81d031275ba8d1af385ea68c81
Merge: 06f9d4e 1874775
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sun Dec 6 01:16:51 2015 +0100

    Merge branch 'master' of github.com:openframeworks/openFrameworks into tests-windows

commit 1874775b1c52eafd9c53794d51e4b580462df82d
Merge: c67da3b 4a7fd75
Author: arturo <arturo@openframeworks.cc>
Date:   Sun Dec 6 01:14:55 2015 +0100

    Merge pull request #4649 from arturoc/fix-fileutils

    ofFileUtils: fix several problems in windows:

commit c67da3baa783843d1c119d0a9adf49b3fedc13f0
Merge: 09fdc15 6f082c6
Author: arturo <arturo@openframeworks.cc>
Date:   Sun Dec 6 01:14:41 2015 +0100

    Merge pull request #4648 from arturoc/fix-ofPixelsMove

    ofPixels: add move constructor and move return values

commit 06f9d4e2bad9255366eef71fbed57907cd3e55e6
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sun Dec 6 01:12:56 2015 +0100

    reenable travis testing

commit 4ae32c808e121a73bacb57830c9a7cc9d2cf3081
Merge: db7655b 60a5014
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sun Dec 6 01:11:50 2015 +0100

    Merge branch 'feature-httppost' into tests-windows

commit db7655b83c9d88f1fa5ce92a7b060fa3b9fb98c4
Merge: 1e971c6 6f082c6
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sun Dec 6 01:11:00 2015 +0100

    Merge branch 'fix-ofPixelsMove' into tests-windows

commit 1e971c6722497a500c59aac5137db2a12e3197e5
Merge: 811bd99 4a7fd75
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sun Dec 6 01:10:35 2015 +0100

    Merge branch 'fix-fileutils' into tests-windows

commit 60a5014f5dbc2f79ab834cc51d2ae58eb847b353
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sun Dec 6 00:52:50 2015 +0100

    ofURLFileLoader: add basic support for POST method

commit 4a7fd759272c9719b5009b73eeeeaa10c75dde23
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sun Dec 6 00:37:22 2015 +0100

    ofFileUtils: fix several problems in windows:

    - moveTo was trying to move with the stream opened which failed on windows
    - create was loosing the binary mode when changing the mode
    - getHomeFolder wash using getenv which might fail
    - adds ofGetEnv for multiplatform getenv

commit 6f082c66d0ec43423a40d184c712422bdc47cff4
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sun Dec 6 00:27:49 2015 +0100

    ofPixels: add move constructor and move return values

    solves a problem with planes not referencing the original and instead
    makeing a copy

commit 811bd999f56955d0daa8297dadf5865cbde567e8
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sun Dec 6 00:25:45 2015 +0100

    ofFileUtils: use ofGetEnv instead of getenv

commit 65c1bafb45e80bf22cb5485cdb5c2dd35bc73831
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sun Dec 6 00:15:41 2015 +0100

    ofPixels: clear pixels before moving assignment

commit 2c96f607375bec1b4fa15b6223e29063533036dc
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sat Dec 5 20:27:55 2015 +0100

    unit tests: better logging for failed tests

commit e471b41929ff4861c358993574885eda5421c6d4
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sat Dec 5 19:53:01 2015 +0100

    file tests: missing windows path separators

commit 3df524caef079efaedcb2340c98fa465ba98a515
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sat Dec 5 19:40:27 2015 +0100

    file tests: fix some backslashes in windows tests

commit d8d8d6005f03cdc3f26e67e9a051d9a773973efe
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sat Dec 5 19:36:33 2015 +0100

    file tests on windows: fix number of existing files and don't check canExecute on dirs

commit 642e460548620d29343db1fd0fa5f7249b8a575c
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sat Dec 5 19:16:34 2015 +0100

    fileutils test: list directory contents in case number of files is not expected

commit 328af0f1599ae744bf829e9517d86710267d3e1d
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sat Dec 5 19:08:32 2015 +0100

    fileutils tests: don't test canRead on windows

commit f8b8b4623d8fd5675c260483a72aaab5a153d165
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sat Dec 5 19:07:47 2015 +0100

    ofFile::moveTo: close file before trying to moveTo otherwise windows will complain

commit c906e4d1f358c0f7e3ebd3f49c6eb4fbcfb02511
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sat Dec 5 18:55:56 2015 +0100

    fileutils test: actually write something to noread file

commit eec5b49d3e6c0f7a86778594afb220e8f5689f4a
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sat Dec 5 18:43:54 2015 +0100

    unit tests: fix functions not returning a value

commit 459711646d12e0b8f3d5b117c61775c0c2b34553
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sat Dec 5 18:33:57 2015 +0100

    unit tests: have test return a bool to check result on runtime

commit d6137b8ee6ce3db7544824e5c2dceb1383475c1b
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sat Dec 5 18:25:35 2015 +0100

    fileUtils test: testing if setting no read permissions works in windows

commit 840ce8a629fc01f0ae0a8a4fc9c8988bbe87775c
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sat Dec 5 18:10:57 2015 +0100

    fileUtils: add error check to set permissions

commit 8f5616adef5828a5bce039533f5011e0e7528173
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sat Dec 5 18:10:45 2015 +0100

    Revert "ofFile::canRead: try to use std::filesystem in windows. Fixing win tests"

    This reverts commit 087c34ece002362c017a157c4bf3e9bf82e9bc7a.

commit 087c34ece002362c017a157c4bf3e9bf82e9bc7a
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sat Dec 5 17:50:03 2015 +0100

    ofFile::canRead: try to use std::filesystem in windows. Fixing win tests

commit 544b5c7a322bbdbf38af3b55588ffc9a91505092
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sat Dec 5 17:20:45 2015 +0100

    ofGetEnv: fix posix implementation

commit 42cbf9a7cc6bd8b01327fb68db0b771f97e67f94
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sat Dec 5 17:19:59 2015 +0100

    ofPixels: add move operators and move results when it makes sense

    trying to fix windows errors in tests

commit 6cea4e65672d3bce3bed1c23b831127a5d42399e
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sat Dec 5 16:52:18 2015 +0100

    ofGetEnv: fix windows syntax

commit 32205ffd605c63bd23797a0f16a5ed2b1ad2df65
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sat Dec 5 16:27:13 2015 +0100

    ofUtils: add ofGetEnv

commit 6e6979ef694a6a008078589fb66ff208dc939aae
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sat Dec 5 16:19:53 2015 +0100

    unit tests: refactor appveyor reporting

commit 5de4866bfbb57b5d1bd1f7a4c1ac4dc3f153e916
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sat Dec 5 16:02:07 2015 +0100

    unit tests: appveyor separate err from out in tests

commit 3c9389945133c3db58962f95bedffd471cab3066
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sat Dec 5 14:29:34 2015 +0100

    unit tests: trying to colorize tests output

commit dda57a0e08e25440e59ce52bf1ed9b29fac2ad94
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sat Dec 5 13:49:03 2015 +0100

    appveyor: fixing  json escaping

commit 6c2d0c1d15806b2f5e7623c9e26185d6ec0e1a75
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sat Dec 5 13:16:13 2015 +0100

    unit tests: limit body size

commit 883ce355f2dfdfd2cf09040732544bbee184badc
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sat Dec 5 13:05:18 2015 +0100

    appveyor: trying to limit post size

commit dfa14e4fa39f95d45b81c2a991589828b94a0b4b
Author: arturo castro <arturo@openframeworks.cc>
Date:   Fri Dec 4 16:39:03 2015 +0100

    unit tests: fixing appveyor

commit 9cf1441f18b76e94857aba3f98887ec357ce23ef
Author: arturo castro <arturo@openframeworks.cc>
Date:   Fri Dec 4 11:21:40 2015 +0100

    unit tests: properly escape json

commit e31aef17313751c624dc126198b43ce0303d2343
Author: arturo castro <arturo@openframeworks.cc>
Date:   Fri Dec 4 11:12:14 2015 +0100

    unit tests: fixing appveyor

commit 0601ddc0f4eb29fc5defa9ef80ded3c7804961d6
Author: arturo castro <arturo@openframeworks.cc>
Date:   Fri Dec 4 11:00:58 2015 +0100

    trying to fix unit tests on appveyor

commit 3b87be23924c212b4a6eafa370a3c6f5e217170e
Author: arturo castro <arturo@openframeworks.cc>
Date:   Fri Dec 4 00:17:31 2015 +0100

    unit tests: remove colors from rest logs

commit b8f55829a3ccef6875c53732b5706f9b89377325
Author: arturo castro <arturo@openframeworks.cc>
Date:   Thu Dec 3 23:15:37 2015 +0100

    unit tests: fix appveyor

commit 9a8c6b35d60e4736a9d674448faacb7b70a3ecd2
Author: arturo castro <arturo@openframeworks.cc>
Date:   Thu Dec 3 22:46:10 2015 +0100

    fix appveyor logger

commit 09fdc157645a2a0809273363572b293d92ea7db5
Merge: 64ac9bf ab527fa
Author: arturo <arturo@openframeworks.cc>
Date:   Thu Dec 3 22:41:22 2015 +0100

    Merge pull request #4644 from bakercp/ofParameter-init-values-fix

    Bug fix - Set max to max().

commit ab527fa5d24348d28f58570b9ca3e8fa1a152ab5
Author: Christopher Baker <me@christopherbaker.net>
Date:   Thu Dec 3 15:03:31 2015 -0600

    Bug fix - Set max to max().

commit 59faf898237db7e050d17841448dc1b7498d3431
Author: arturo castro <arturo@openframeworks.cc>
Date:   Thu Dec 3 20:25:55 2015 +0100

    unit tests: appveyor logs:  add stdout

commit 73ecc7d6754855239bbcf4f31fa605210f7f377a
Author: arturo castro <arturo@openframeworks.cc>
Date:   Thu Dec 3 20:11:39 2015 +0100

    ofURLFileLoader: fix content length

commit 525d9b62500a0651e67b5c48818d4e9017592982
Author: arturo castro <arturo@openframeworks.cc>
Date:   Thu Dec 3 19:51:56 2015 +0100

    ofURLFileLoader: trying to fix content length

commit f2fac79204c3b7ba1d5c8be625bba50e55f0a7f5
Author: arturo castro <arturo@openframeworks.cc>
Date:   Thu Dec 3 19:40:33 2015 +0100

    appveyor: fixing rest url method

commit b5a99542f22ab4dbc0f7d05105a0d331a0d0a4dd
Author: arturo castro <arturo@openframeworks.cc>
Date:   Thu Dec 3 19:28:18 2015 +0100

    appveyor trying to fix url

commit 596e070b10216d52f8d377ec4bb2bd94af031bd5
Author: arturo castro <arturo@openframeworks.cc>
Date:   Thu Dec 3 19:18:52 2015 +0100

    appveyor trying to fix REST api

commit 80dabebbbda73471d7d46f8b7a49099989c7cb31
Author: arturo castro <arturo@openframeworks.cc>
Date:   Thu Dec 3 18:05:21 2015 +0100

    url file loader: trying to fix body send

commit fbac339b3837b6ae57d4be866da56decdc94b699
Author: arturo castro <arturo@openframeworks.cc>
Date:   Thu Dec 3 14:58:07 2015 +0100

    fix urlFileLodaer

commit 1cdbe136bd473d1b52c11f27aa1382b3b8265165
Author: arturo castro <arturo@openframeworks.cc>
Date:   Thu Dec 3 13:40:22 2015 +0100

    trying to fix appveyor REST api

commit f80c6753d990a37a0beb036d00c89f4a578a8844
Author: arturo castro <arturo@openframeworks.cc>
Date:   Thu Dec 3 11:40:11 2015 +0100

    appveyor tests: report url

commit d3660947e0293437e045f9283dfabe8cc555a24a
Author: arturo castro <arturo@openframeworks.cc>
Date:   Thu Dec 3 11:23:08 2015 +0100

    appveyor tests: set url

commit 3a5fc09422049258732d6a6694fdf5924c6630b7
Author: arturo castro <arturo@openframeworks.cc>
Date:   Thu Dec 3 11:06:11 2015 +0100

    unit tests: fix sytax errors

commit d46eec21be1bb28216081e52fc9605ff32e65166
Author: arturo castro <arturo@openframeworks.cc>
Date:   Thu Dec 3 10:51:22 2015 +0100

    unit tests, send REST request

commit 79f38c7ee5d4fa1fd463a96c05fbc1f18685e867
Author: arturo castro <arturo@openframeworks.cc>
Date:   Thu Dec 3 10:39:08 2015 +0100

    unit tests appveyor try to report through rest API

commit 5d995656b1d02a64d68815045b01834d0a919f93
Author: arturo castro <arturo@openframeworks.cc>
Date:   Wed Dec 2 22:50:19 2015 +0100

    fix syntax for appveyor runtests

commit c12a0956f86ca51ebd51f1fee4df338e287f9bbb
Author: arturo castro <arturo@openframeworks.cc>
Date:   Wed Dec 2 22:42:17 2015 +0100

    appveyor runtests: fix syntax

commit ad19ec8c276821bb9fd40516664e840dc653e29b
Author: arturo castro <arturo@openframeworks.cc>
Date:   Wed Dec 2 21:36:18 2015 +0100

    appveyor tests: try to report compiler errors

commit 65d8ef57c808a3428ce958697bdeb9fe62b8e21c
Author: arturo castro <arturo@openframeworks.cc>
Date:   Wed Dec 2 21:04:05 2015 +0100

    runtests.bat: fix exit status

commit 33320a2b46adaefccc0e44929f396087dffb39c6
Author: arturo castro <arturo@openframeworks.cc>
Date:   Wed Dec 2 20:32:33 2015 +0100

    fix runtests.bat

commit 01233163502d7651718f25b65bff6c15e6385bff
Author: arturo castro <arturo@openframeworks.cc>
Date:   Wed Dec 2 20:13:07 2015 +0100

    fixing appveyor scripts

commit ada5613206cdc938c56d1bf6b43b2269fc5962e2
Author: arturo castro <arturo@openframeworks.cc>
Date:   Wed Dec 2 20:00:06 2015 +0100

    fixing appveyor scripts

commit 18fcf97559d60f8f961547b7140202ce45f4f35b
Author: arturo castro <arturo@openframeworks.cc>
Date:   Wed Dec 2 19:50:20 2015 +0100

    runtests.bat: trying to fix exit status

commit adb93a512a9b591609dbd8fbf1bd008af985864e
Author: arturo castro <arturo@openframeworks.cc>
Date:   Wed Dec 2 19:31:12 2015 +0100

    unit tests: fix tests on windows

commit 06218c079084dbd9641818a2b233c57c56da31fe
Author: arturo castro <arturo@openframeworks.cc>
Date:   Wed Dec 2 19:22:46 2015 +0100

    appveyor tests: log to console and trying to fix wrong status

commit 0a9662764a74f9a88e93227da27fc91c2b524d6b
Author: arturo castro <arturo@openframeworks.cc>
Date:   Wed Dec 2 19:04:23 2015 +0100

    unit tests: trying to fix appveyor breaklines

commit 156d15da821ffb16077a38ec2f988c68010f0328
Author: arturo castro <arturo@openframeworks.cc>
Date:   Wed Dec 2 18:27:48 2015 +0100

    unittests: trying to escape breakines

commit c1fbe61a07be298bafb1c7538bfea9d5cbd74956
Author: arturo castro <arturo@openframeworks.cc>
Date:   Wed Dec 2 18:17:32 2015 +0100

    unit tests: trying powershell appveyor logger

commit 513707ac8239907a8094e1a069777c351fd3da7e
Author: arturo castro <arturo@openframeworks.cc>
Date:   Wed Dec 2 18:08:08 2015 +0100

    unit tests: trying to fix tests output

commit 7b489c69aa3ab8a3179ad622c81da3ca957d90f7
Author: arturo castro <arturo@openframeworks.cc>
Date:   Wed Dec 2 17:49:55 2015 +0100

    unit tests: trying to fix logger output

commit 125e2083e7ea09a610545bf3e81b5bbc2b2a0c33
Author: arturo castro <arturo@openframeworks.cc>
Date:   Wed Dec 2 17:40:24 2015 +0100

    unit tests: fix logger

commit 10c991d084ccbfed567f22f8ffe8ea0449eb1b35
Author: arturo castro <arturo@openframeworks.cc>
Date:   Wed Dec 2 17:31:59 2015 +0100

    pixels tests: cast char* so they don't print out as string

commit 8ba4b0a91bd8f085dc06375959a60637bc4139f9
Author: arturo castro <arturo@openframeworks.cc>
Date:   Wed Dec 2 17:27:18 2015 +0100

    unit tests: fix appveyor out

commit 64ac9bf80e309436f452f435e68bc035789021a9
Merge: 5113f1b 68b660b
Author: arturo <arturo@openframeworks.cc>
Date:   Wed Dec 2 17:16:31 2015 +0100

    Merge pull request #4640 from tgfrerer/fix-draw-arrow

    fix an issue with arrow heads not drawing centered

commit 9e4dacfa48c6210b3da6186b5bf217509643b13b
Author: arturo castro <arturo@openframeworks.cc>
Date:   Wed Dec 2 16:47:43 2015 +0100

    unit tests: reenable appveyor uri function

commit 385798fbf54574d4cbfca405ee906cf446372431
Author: arturo castro <arturo@openframeworks.cc>
Date:   Wed Dec 2 16:30:53 2015 +0100

    unit tests: fix errors in appveyor logger

commit 68b660b180c4149ced8656068d5694142ec36754
Author: Tim Gfrerer <tim@poniesandlight.co.uk>
Date:   Wed Dec 2 15:29:15 2015 +0000

    fix an issue with arrow heads not drawing centered

    The cones used to draw arrow heads were drawing at the wrong
    position, offset slightly (0.5 * headSize) from where they
    should be. This was especially apparent when arrowheads were
    larger.

    This commit fixes this.

commit e226854e9fe9a00c37f9df650d07f0a1d9996453
Author: arturo castro <arturo@openframeworks.cc>
Date:   Wed Dec 2 16:23:34 2015 +0100

    unit tests: using system cmd instead of post for appveyor

commit 45ccfad3cd9f7c57f04990b3eab0c27f8e5bed7f
Author: arturo castro <arturo@openframeworks.cc>
Date:   Wed Dec 2 15:55:16 2015 +0100

    unit tests: trying to fix appveyor logger

commit beeba7e5211ac27959c299aba5b7c1cb53393e0f
Author: arturo castro <arturo@openframeworks.cc>
Date:   Wed Dec 2 15:47:36 2015 +0100

    unit tests: catch appveyor logging errors

commit e32bb964f3aeef2bfd1a7974b099a13a52d05d42
Author: arturo castro <arturo@openframeworks.cc>
Date:   Wed Dec 2 15:28:01 2015 +0100

    unit tests: fix appveyor logger

commit 0b2e6d004b100b9b809774372e6be8520df465bc
Author: arturo castro <arturo@openframeworks.cc>
Date:   Wed Dec 2 15:26:56 2015 +0100

    unit tests: fix appveyor logging

commit 6dcbefecd11e5163147a77554cef7e05167120cb
Author: arturo castro <arturo@openframeworks.cc>
Date:   Wed Dec 2 15:18:11 2015 +0100

    unit tests: fix appveyor logger

commit 8be501524d3f58ed1e87dafcd35062251e38178f
Author: arturo castro <arturo@openframeworks.cc>
Date:   Wed Dec 2 15:05:11 2015 +0100

    unit tests: fix appveyor logging

commit 11f2f43c8a6e22371b2f760991f535e74e950f2c
Author: arturo castro <arturo@openframeworks.cc>
Date:   Wed Dec 2 14:51:53 2015 +0100

    unit tests: fix appveyor logging

commit db87a87319c966ae65bcf3c7f91e73576d8a8253
Author: arturo castro <arturo@openframeworks.cc>
Date:   Wed Dec 2 14:44:16 2015 +0100

    unit tests: fix appveyor logger

commit 45c201c54b0658366224644cee39457c121fef36
Author: arturo castro <arturo@openframeworks.cc>
Date:   Wed Dec 2 14:37:09 2015 +0100

    unit tests: fix appveyor logging

commit 80c3818e40e08e932e6b6192529098cb05cdea14
Author: arturo castro <arturo@openframeworks.cc>
Date:   Wed Dec 2 14:08:06 2015 +0100

    unit tests: fix appveyor string type

commit ba2a0456511bcccdc0a2a6093afe51ed37267bf4
Author: arturo castro <arturo@openframeworks.cc>
Date:   Wed Dec 2 13:03:42 2015 +0100

    ofURLFileLoader: add body and contentType to requests

commit 36842f3ed8e44b698944c88cb5b6dc4b8dc46a7b
Author: arturo castro <arturo@openframeworks.cc>
Date:   Wed Dec 2 12:45:31 2015 +0100

    ofURLLoader: fix pointer semantics

commit 0cdc2b131e2aa88e8652e874923531a09ea9d413
Author: arturo castro <arturo@openframeworks.cc>
Date:   Wed Dec 2 12:23:56 2015 +0100

    AppVeyor LogChannel

commit ff3396bb6af0b4fe873b04ba12a1025b85aaf781
Author: arturo castro <arturo@openframeworks.cc>
Date:   Wed Dec 2 11:42:42 2015 +0100

    run_tests.bat: try to log test results to appveyor

commit d6f70126426f2f4c5f18181b723851ed465060c7
Author: arturo castro <arturo@openframeworks.cc>
Date:   Wed Dec 2 11:19:11 2015 +0100

    appveyor: move tests script to .ba in scripts/ci

commit 75086c073bbf4411913af56221ce55fb6afd0639
Author: arturo castro <arturo@openframeworks.cc>
Date:   Wed Dec 2 00:01:41 2015 +0100

    appveyor: fixing build script

commit 15786a06d71776784221f46e0419e95e070e5abe
Author: arturo castro <arturo@openframeworks.cc>
Date:   Tue Dec 1 23:50:26 2015 +0100

    appveyor.yml: fix breaklines

commit bbb1b1bd82981d1f5aa6b1951d3e65c1f13edd9b
Author: arturo castro <arturo@openframeworks.cc>
Date:   Tue Dec 1 20:04:37 2015 +0100

    disable travis.yml temporarily for this PR

commit 8e69cc9c3030fc3fe228dea370e5c6a242195b6d
Author: arturo castro <arturo@openframeworks.cc>
Date:   Tue Dec 1 20:02:38 2015 +0100

    appveyor: trying to fix multiline script

commit c58457dab3bc95f131acb948eb6f18109f05bfc3
Author: arturo castro <arturo@openframeworks.cc>
Date:   Tue Dec 1 19:54:39 2015 +0100

    don't convert breaklines for appveyor

commit 99c4cfa1e3c4007251783b31aac537d097d613bb
Author: arturo castro <arturo@openframeworks.cc>
Date:   Tue Dec 1 19:52:13 2015 +0100

    fixing .appveyor

commit 402a266de8962332a39f8192866f5f99d4f296c1
Author: arturo castro <arturo@openframeworks.cc>
Date:   Tue Dec 1 19:43:16 2015 +0100

    appveyor config, fix build script

commit 73a491e14e65e02a81956617f216e4d10778518f
Author: arturo castro <arturo@openframeworks.cc>
Date:   Tue Dec 1 19:32:30 2015 +0100

    appveyor config file

commit 5113f1b07c83ac5a0938ae3b28ee5080c14662f6
Merge: e23470c 6807562
Author: arturo <arturo@openframeworks.cc>
Date:   Tue Dec 1 18:57:19 2015 +0100

    Merge pull request #4636 from arturoc/fix-network

    several fixes for  ofxNetwork TCP

commit e23470c7bb25e985d98e4b503bd1ab667f9b3dcc
Merge: 4372562 14d5879
Author: arturo <arturo@openframeworks.cc>
Date:   Tue Dec 1 18:56:58 2015 +0100

    Merge pull request #4637 from arturoc/fix-thread-join

    ofThread: fix thread join

commit 14d58794b3c2b466b6693a989b29f05771b857db
Author: arturo <arturo@openframeworks.cc>
Date:   Tue Dec 1 18:21:55 2015 +0100

    ofThread: fix thread join

    Sometimes when trying to join a thread that has already been detached
    poco throws an exception. This catches it so the app doesn't crash

commit 6807562465c5c5797560d9beba3c5689b1d46224
Merge: 74d7c33 db321ab
Author: arturo <arturo@openframeworks.cc>
Date:   Tue Dec 1 18:19:18 2015 +0100

    Merge branch 'fix-network' of github.com:arturoc/openFrameworks into fix-network

commit 74d7c33b203d4c51509d0baab7dfdd94719d7356
Author: arturo <arturo@openframeworks.cc>
Date:   Tue Dec 1 18:17:25 2015 +0100

    ofxNetwork: fix uninitialized udp timeout

commit db321ab232e2d118096c9f22e7e7155d50ccc9d0
Author: arturo castro <arturo@openframeworks.cc>
Date:   Tue Dec 1 18:09:12 2015 +0100

    ofxNetworkUtils: don't report EINTR usually triggers false positive on windows

commit 97b7b02d21321de186b55cbf0179a3bb2dc6c289
Author: arturo castro <arturo@openframeworks.cc>
Date:   Tue Dec 1 17:49:40 2015 +0100

    network tests vs project: add unit tests addon

commit 3bef67ed76958bbd3d319bba432a4d3b2b3603cd
Author: arturo castro <arturo@openframeworks.cc>
Date:   Tue Dec 1 17:28:05 2015 +0100

    network udp tests: add unit tests addon

commit 18673fdd2b378a2ad12832fda209127517d251ed
Author: arturo castro <arturo@openframeworks.cc>
Date:   Tue Dec 1 17:22:18 2015 +0100

    tests: fix vs project files

commit a997f07922bcd839884919e0d061195d1a9bd7a5
Author: arturo castro <arturo@openframeworks.cc>
Date:   Tue Dec 1 17:16:23 2015 +0100

    UPD tests

commit c6cad8bac091f81bc8acc112156e0d1ff4b5f2d9
Author: arturo castro <arturo@openframeworks.cc>
Date:   Tue Dec 1 16:24:02 2015 +0100

    tests: add ofInit

commit 8150bbd70257810325571c5b3a66ac76db3d2809
Author: arturo <arturo@openframeworks.cc>
Date:   Tue Dec 1 16:12:48 2015 +0100

    tests: custom window needs ofInit

commit 120843767923f4ec233e7f5ba170f3bdb3fcd0ba
Author: arturo castro <arturo@openframeworks.cc>
Date:   Tue Dec 1 15:26:51 2015 +0100

    add visual studio projects

commit 6335c55c7d1fe196731330ae808adf27a00eb49f
Author: arturo castro <arturo@openframeworks.cc>
Date:   Tue Dec 1 15:07:08 2015 +0100

    ofxNetwork: fix time syntax

commit 405fa8bd86505b1c256e52d743aa7bb208c81848
Author: arturo castro <arturo@openframeworks.cc>
Date:   Tue Dec 1 14:36:03 2015 +0100

    ofxNetwork: fix timeouts + tests

commit 52c3998aa27d10f4e36f261b950d5e4798a8cd3c
Author: arturo castro <arturo@openframeworks.cc>
Date:   Tue Dec 1 12:22:00 2015 +0100

    TCPManager: fix wrong connect detection + tests

commit 9aa04a119ac3658be40ab81b8ce0e7e7d9b80ec7
Author: arturo castro <arturo@openframeworks.cc>
Date:   Mon Nov 30 20:46:39 2015 +0100

    ofxTCPClient: removed an error check when no error returned

commit 528c8c2030918d163c2a1793156cc811f6d03a9a
Author: arturo castro <arturo@openframeworks.cc>
Date:   Mon Nov 30 20:28:22 2015 +0100

    network tests: wait half second for connection to be ready

    shouldn't be needed!

commit 28c8dda56de111ca4def84a9f3774fb91c8b1c0a
Author: arturo castro <arturo@openframeworks.cc>
Date:   Mon Nov 30 20:27:50 2015 +0100

    ofxNetwork: add condition to wait on while server thread gets to listen

commit 7f622ee2ee0ccf98c7225dda65d1b9279c35ee01
Author: arturo castro <arturo@openframeworks.cc>
Date:   Mon Nov 30 19:59:53 2015 +0100

    run_Tests osx: fix bin path

commit ef7268b69f6fb05a7df90f77191ff62cb8565260
Author: arturo castro <arturo@openframeworks.cc>
Date:   Mon Nov 30 19:56:51 2015 +0100

    run_tests.sh: exit with status if error running tests

commit 82c3ea9456c2ca9f027f7281b68128efa84bb8f1
Author: arturo castro <arturo@openframeworks.cc>
Date:   Mon Nov 30 19:56:36 2015 +0100

    tests: return status on exit

commit d5655c648abcf8ce9ea40b4c5cca1c42acab3a99
Author: arturo castro <arturo@openframeworks.cc>
Date:   Mon Nov 30 19:56:20 2015 +0100

    iofxNetwork: add disconnectAll

commit 4a21cc2ef1eef29e3f06d203e4ad74652eb79d51
Author: arturo castro <arturo@openframeworks.cc>
Date:   Mon Nov 30 19:36:55 2015 +0100

    fix run_tests scripts

commit ab2fe926ef0b9f876de706e700328bd52e4c41fb
Author: arturo castro <arturo@openframeworks.cc>
Date:   Mon Nov 30 19:20:42 2015 +0100

    ci: fix run_tests error detection

commit 93d3e2fed0f39871dd44c328e6b8361844bf64af
Merge: 79fb987 15a952c
Author: arturo castro <arturo@openframeworks.cc>
Date:   Mon Nov 30 18:51:13 2015 +0100

    Merge branch 'fix-network' of github.com:arturoc/openFrameworks into fix-network

commit 15a952c980849b4204ea56535403f6abf0a754e0
Author: arturo <arturo@openframeworks.cc>
Date:   Mon Nov 30 18:45:28 2015 +0100

    network tests: add addons.make

commit 30dd7aefe8b9efd86e1ee7603fc2ebc923e3b69c
Author: arturo castro <arturo@openframeworks.cc>
Date:   Mon Nov 30 18:43:00 2015 +0100

    tests: add network tcp raw tests

commit 5ae23f1994c4ac4e052202077159ed5ab6451c65
Author: arturo castro <arturo@openframeworks.cc>
Date:   Mon Nov 30 18:11:26 2015 +0100

    network: add tcp tests

commit 79fb9877eef8233760fef1bbc1f1a6b30899ab69
Author: arturo <arturo@openframeworks.cc>
Date:   Mon Nov 30 17:28:30 2015 +0100

    ofxNetwork: fix wait condition for reconnection on windows

commit 1d35483a15e8261ae9311161af38cfdeebe53b1a
Merge: ecf9c43 ef61891
Author: arturo <arturo@openframeworks.cc>
Date:   Mon Nov 30 17:17:59 2015 +0100

    Merge branch 'fix-network' of github.com:arturoc/openFrameworks into fix-network

commit ecf9c431156c742435adf03035c586606886e5a4
Author: arturo <arturo@openframeworks.cc>
Date:   Mon Nov 30 17:16:49 2015 +0100

    ofxNetworkUtils: don't report non blocking related errors

commit ef618911707f05879ae3500f0231fba0795e6aab
Author: arturo <arturo@openframeworks.cc>
Date:   Mon Nov 30 17:14:02 2015 +0100

    ofxNetwork: fixes for server closing sequence

commit 82e0ad35e558ff80d2e94a4066fcc9bc0c2ee88d
Author: arturo <arturo@openframeworks.cc>
Date:   Mon Nov 30 16:51:41 2015 +0100

    network tcp: fix half open connection detection for osx

commit 2c75a8a7027e5b79cc613b45443e12e06bdbdf90
Author: arturo <arturo@openframeworks.cc>
Date:   Mon Nov 30 15:27:15 2015 +0100

    ofxNetwork: fixes for osx

commit a745ff003fd55011d365daa15dd1dc1eefd88db4
Author: arturo <arturo@openframeworks.cc>
Date:   Mon Nov 30 14:20:27 2015 +0100

    ofxNetwork: fix some error conditions

commit eada5a5c07dd246b43f2902a22991578ae0c0411
Author: arturo <arturo@openframeworks.cc>
Date:   Mon Nov 30 14:16:11 2015 +0100

    ofxNetwork: more closing conditions

commit 7f7a72daa897481e8ec4aeaf63a387b645f4af87
Author: arturo <arturo@openframeworks.cc>
Date:   Mon Nov 30 14:11:11 2015 +0100

    network: ifdex for posix

commit 7a08ee225c5f1af5546c7bf8d190ac8a7b9adc24
Author: arturo <arturo@openframeworks.cc>
Date:   Mon Nov 30 14:06:14 2015 +0100

    network tcp: fixes for windows + half open connection detection

commit 573ebe1b77e023338efb25f5cc30f89fce99c2af
Author: arturo castro <arturo@openframeworks.cc>
Date:   Mon Nov 30 12:32:26 2015 +0100

    network examples: better comments

commit 6921b2984d37da38549d1e4095133768536bb865
Author: arturo castro <arturo@openframeworks.cc>
Date:   Mon Nov 30 12:28:00 2015 +0100

    netwrok tcp server example: throttle sending with time functions

    before it relayed on the fps of the app

commit b398922799bee98ab6ecd1c045fbc786e359a7af
Author: arturo castro <arturo@openframeworks.cc>
Date:   Mon Nov 30 12:04:55 2015 +0100

    network examples: fix logic

commit abd15c078087b8c668113a9d2be49d21b2e688c4
Author: arturo castro <arturo@openframeworks.cc>
Date:   Mon Nov 30 12:04:23 2015 +0100

    ofxNetwork: check error condition on ofxTCPClient to have more control

commit 2501ce2ee21c30ae83c830d8abbd17772c860ae1
Author: arturo castro <arturo@openframeworks.cc>
Date:   Mon Nov 30 11:24:52 2015 +0100

    networkTCP examples: fix logic to not send every frame, only when message changes

commit 71144c4a28221c2e13f1d6aee660ac7c7c669d46
Author: arturo castro <arturo@openframeworks.cc>
Date:   Mon Nov 30 11:24:14 2015 +0100

    ofxNetwork: fix several problems with close conditions

commit 20838afe9b66c249d33cfcd1d97d73afdd2f6867
Author: Christian Clark <christian@shaman.uy>
Date:   Fri Nov 27 14:10:59 2015 -0300

    readByte : removed nRead value check  from common code, and added the same value check on win and osx.

commit e6f5a240ec3aefa918b0d364985e165f826bfec2
Author: Christian Clark <christian@shaman.uy>
Date:   Fri Nov 27 11:03:32 2015 -0300

    - fixed issue:

    ofSerial::readByte not returning OF_SERIAL_NO_DATA on Windows #4630

commit 43725624f06b6729e7de7b45090764fc2b91e4db
Merge: f2149a9 57c221f
Author: arturo <arturo@openframeworks.cc>
Date:   Fri Nov 27 09:56:44 2015 +0100

    Merge pull request #4623 from bilderbuchi/fix-2791

    Add .gitignore template for project generator. Closes #2791

commit f2149a97c85154a531c1395f21e29f257d67901b
Merge: a51f487 c674fc0
Author: arturo <arturo@openframeworks.cc>
Date:   Thu Nov 26 12:51:58 2015 +0100

    Merge pull request #4625 from arturoc/fix-lookAtDefault

    ofNode: better default for up vector on lookAt. Closes #4594

commit a51f487ecfc70f15ad1e9584d69e4326a2fbce24
Author: arturo castro <arturo@openframeworks.cc>
Date:   Thu Nov 26 12:47:33 2015 +0100

    threadChannelExample: small fixes

    - don't autoallocate texture
    - don't draw if texture is not allocated
    - show a message if no frames have been received yet

commit c674fc0d7b24a34102f8ede5d68a7cf1875f021d
Author: arturo castro <arturo@openframeworks.cc>
Date:   Thu Nov 26 09:14:39 2015 +0100

    better estimation of lookAt up default

commit a98080f10cee81c27dcd98313d8fa4725725752d
Author: arturo castro <arturo@openframeworks.cc>
Date:   Wed Nov 25 18:01:56 2015 +0100

    ofNode: better default for up vector on lookAt. Closes #4594

    Instead of using {0,1,0} get's the vector of the camera position to
    the lookAt point. then figures out the rotation that transforms {0,0,1}
    into that vector and rotates {0,1,0} by that rotation to get the up vector.

commit 57c221f2d28cae30af1d4a1eac0198d5c68fc016
Author: Christoph Buchner <bilderbuchi@users.noreply.github.com>
Date:   Wed Nov 25 11:28:41 2015 +0100

    Add Android studio to the gitignore template

commit 035af4555da07ec7cd332cec4ee75af9e1bffdda
Merge: d6fded3 2f2309d
Author: arturo <arturo@openframeworks.cc>
Date:   Wed Nov 25 10:39:10 2015 +0100

    Merge pull request #4624 from arturoc/applestore

    Fixes for install_name_tool and apple store compatibility

commit 2f2309dd19f609551ecfc4de59c7ce640eee28c5
Author: arturo <arturo@openframeworks.cc>
Date:   Wed Nov 25 10:17:47 2015 +0100

    fix install_name_tool

commit d29d66bbd1c84442735463dee3e5c4d9ab468183
Merge: cd07dd7 79b1e2e
Author: arturo <arturo@openframeworks.cc>
Date:   Wed Nov 25 10:15:14 2015 +0100

    Merge branch 'Fmod/Update' of github.com:danoli3/openFrameworks into applestore

    Conflicts:
    	export/osx/libs/libfmodex.dylib
    	libs/fmodex/lib/osx/libfmodex.dylib

commit cd07dd7a1f72e8294d6312e5e266e04783816844
Author: arturo <arturo@openframeworks.cc>
Date:   Wed Nov 25 10:09:40 2015 +0100

    osx template: fix install_name_tool

commit e63c2b7735aa48add4041f71c9c442d3e5caf452
Author: arturo <arturo@openframeworks.cc>
Date:   Wed Nov 25 10:08:40 2015 +0100

    remove glut from osx makefiles

commit 7a22614d309c975a06c98d2f601080ef115dc52b
Merge: b0fc453 1546869
Author: arturo <arturo@openframeworks.cc>
Date:   Wed Nov 25 08:44:57 2015 +0100

    Merge branch 'bugfix-install_name_fmod' into applestore

commit b0fc453ab21094bbfcb20dc51b5d7fd63d255bb4
Merge: 88d66a7 40f24ea
Author: arturo <arturo@openframeworks.cc>
Date:   Wed Nov 25 08:41:48 2015 +0100

    Merge branch 'OSX/AppStoreFixes' of github.com:danoli3/openFrameworks into applestore

commit 79b1e2ee434e3abee5798ad911e42f35a4edd9e4
Author: Daniel Rosser <danoli3@gmail.com>
Date:   Wed Nov 25 09:46:12 2015 +1100

    Apothecary - Fmod - Formula - No set

commit 69e8c04ccacf59865b19064116cc675af3f5434e
Author: Christoph Buchner <bilderbuchi@phononoia.at>
Date:   Tue Nov 24 21:24:14 2015 +0100

    Add .gitignore template for project generator. Closes #2791

commit af7d5fe98b1e8ce72fd4bd2a0a6f7790c4fbc021
Author: Daniel Rosser <danoli3@gmail.com>
Date:   Wed Nov 25 07:00:02 2015 +1100

    Apothecary - FmodEx Formula - Set Install Directory

commit add94b38453a8efddae866fc1199a99bdf79583e
Author: Daniel Rosser <danoli3@gmail.com>
Date:   Wed Nov 25 05:35:45 2015 +1100

    Fixes chmod linux

commit 4a4ad0869c6c889ca68a43ae75c7bb55f96132d0
Author: Daniel Rosser <danoli3@gmail.com>
Date:   Wed Nov 25 05:33:04 2015 +1100

    FMOD update - Export Directory

commit 900d4d175217f3ef833b81c83033113ece24f605
Author: Daniel Rosser <danoli3@gmail.com>
Date:   Wed Nov 25 05:25:52 2015 +1100

    FMOD - License File

commit b20b259283a128f50897794503b61df9a65b3f3a
Author: Daniel Rosser <danoli3@gmail.com>
Date:   Wed Nov 25 05:25:37 2015 +1100

    Apothecary - FMOD update Formula

commit 043776de764da40421afaff0ad9110bdc9b12234
Author: Daniel Rosser <danoli3@gmail.com>
Date:   Wed Nov 25 04:55:51 2015 +1100

    Fix for latest FMOD - ofSoundStream and ofSoundPlayer together on OSX horrible noise
    Reference issue: https://github.com/openframeworks/openFrameworks/issues/3851

commit 40f24ea24a88bbecf9f44a4c325b5fa40ca2edf5
Author: Daniel Rosser <danoli3@gmail.com>
Date:   Wed Nov 25 04:36:13 2015 +1100

    OSX - Fixes Deployment issue

    - Sets Skip Install to YES
    Activating this setting when deployment locations are used causes the product to be built into an alternative location instead of the install location.

commit 89fbd2df7733e8c97a1ddc37e1fe5fbd1f0976a8
Author: Daniel Rosser <danoli3@gmail.com>
Date:   Wed Nov 25 04:33:51 2015 +1100

    OSX - Template Project fixes

    - Fixes FMOD location (into Frameworks)
    - Adds Code Signing Script post build (When code signing is set this will sign the fmodylib and any frameworks automatically)
    - Adds Copy Resources into App Package
    - Fixes Installation Direction bug (Needed to be /Applications)

commit d6fded3ad7633f72de88c67aa12f646cf1b13371
Merge: cef8fab 88d66a7
Author: arturo <arturo@openframeworks.cc>
Date:   Tue Nov 24 16:57:03 2015 +0000

    Merge pull request #4621 from arturoc/bugfix-slowtimers

    ofutils: get the clock instance on init instead of everytime.

commit 88d66a74a63f1337d6b6697a165b0e2d2fad5b1a
Author: arturo <arturo@openframeworks.cc>
Date:   Tue Nov 24 17:36:07 2015 +0100

    ofutils: get the clock instance on init instead of everytime. Closes #4595

commit 8e4f39f476a75c144f6610ee0c40a94a51996e6e
Author: Daniel Rosser <danoli3@gmail.com>
Date:   Wed Nov 25 03:28:31 2015 +1100

    Fmod Update to 4.44.59

commit cef8fab03d5ac62787c52713498b8042d8c2632a
Merge: 01d3bfc 1e815a7
Author: arturo <arturo@openframeworks.cc>
Date:   Tue Nov 24 15:44:07 2015 +0000

    Merge pull request #4618 from javl/javl-patch-commandline

    Update compilePG.sh

commit 1e815a72c6454503215b8db7f37f1feaa7b7567e
Author: javl <mail@jaspervanloenen.com>
Date:   Tue Nov 24 14:23:51 2015 +0100

    Update compilePG.sh

    Asks a user clearly if he/she wants to install the commandline project generator and if you want to update your `./profile` file. Pressing return to skip the install does not work if you're already root in this console window (for instance, because you've ran `sudo ./install_dependencies.sh` just before). The script would run just the same.

    Tested on Debian Jessie.

commit 15468697fdac6f4ba8dcb74cb48dd39642a25778
Author: arturo <arturo@openframeworks.cc>
Date:   Mon Nov 23 20:36:54 2015 +0100

    set path id to libfmodex.dylib to avoid having to call install_name_tool. Closes #4479

commit 01d3bfc61807f80bd97c953ece24cb5587e44a50
Merge: a52314a 8ea6915
Author: arturo <arturo@openframeworks.cc>
Date:   Mon Nov 23 18:08:32 2015 +0000

    Merge pull request #4565 from genekogan/master

    added note about sharing context between windows

commit a52314a0760cf35faa0c8c17c547c57f82ba779c
Author: arturo castro <arturo@openframeworks.cc>
Date:   Mon Nov 23 19:06:39 2015 +0100

    apothecary poco: revert bump in version number, was breaking linux

commit 3f93ec22183c250a482ae90c318eb225621af8cd
Author: arturo castro <arturo@openframeworks.cc>
Date:   Mon Nov 23 19:05:53 2015 +0100

    install_dependencies: after compiling poco chown to user

commit 1f85813d126ff7e46cc56f7063fab52cf070d045
Merge: 3a9fc2f 29a1fe9
Author: arturo <arturo@openframeworks.cc>
Date:   Mon Nov 23 16:40:41 2015 +0000

    Merge pull request #4614 from arturoc/bugfix-install_dependencies

    fixes for ubuntu's install dependencies

commit 3a9fc2ff49ec9cfc9c845af8a7eb1cf4bf502af9
Merge: 1882a92 c09b530
Author: Theodore Watson <theo@openframeworks.cc>
Date:   Mon Nov 23 11:34:20 2015 -0500

    Merge pull request #4613 from openframeworks/bugfix-assimpwireframe

    better fix for drawing wireframes on non GLES addresses #4553

commit 29a1fe95073ced6a79067d74f1cec2104814690b
Author: arturo castro <arturo@openframeworks.cc>
Date:   Mon Nov 23 16:53:08 2015 +0100

    install_dependencies: add curl so apothecary can run

commit c09b530c365c6eddd888b73b56212afe4c5f6328
Author: ofTheo <theo@openframeworks.cc>
Date:   Mon Nov 23 10:49:44 2015 -0500

    better fix for drawing wireframes on non GLES addresses #4553

commit 4b3622d5f2b618d0b51290dddf8fe5213a0d8234
Author: arturo castro <arturo@openframeworks.cc>
Date:   Mon Nov 23 16:33:11 2015 +0100

    install_dependencies: use -y for silent apt-get

commit 5869c25983db2a4431754d53a48f82370ce2ecd7
Author: arturo castro <arturo@openframeworks.cc>
Date:   Mon Nov 23 16:00:31 2015 +0100

    install_dependencies: manually install libjack to fix problems with rtuadio install

commit 6cbfff0865b96d7d2600f977736249cec8f03a58
Author: arturo castro <arturo@openframeworks.cc>
Date:   Mon Nov 23 13:17:55 2015 +0100

    fixes for install dependencies script

commit 6691de8b6fd719ee247e03d2d0d2bebac7c0daa2
Author: ISHII 2bit <ishii@buffer-renaiss.com>
Date:   Mon Nov 23 13:44:25 2015 +0900

    fix std & const &

commit 3d2a697dd434f06cf95a8715fce86b3186c2c38c
Merge: dd42521 1882a92
Author: ISHII 2bit <ishii@buffer-renaiss.com>
Date:   Mon Nov 23 13:33:48 2015 +0900

    Merge branch 'master' into PR/ofxOsc_tidying_up

commit dd4252190fb2fa192d14a457093458fd23fab9ca
Author: ISHII 2bit <ishii@buffer-renaiss.com>
Date:   Mon Nov 16 15:36:59 2015 +0900

    const and std:: correction

commit 1882a9288bca1762ad0e6a31ee4edb390c642cc2
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sun Nov 22 18:12:48 2015 +0100

    ofFileUtils: relative path calulation now removes extra . in paths. Closes #4564

commit 5001f9f56e39c0a07037ea6aa995fbf946e295a4
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sun Nov 22 17:18:27 2015 +0100

    ofToDataPath: add trailing slash to data path. Closes #4563

commit ea0f2f22c59e15bdd6dec81e6a552b53396f0de7
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sun Nov 22 16:17:49 2015 +0100

    ofBaseTypes: implement default draw(x,y.w.h). Closes #772

commit 0683ccf1c7241806f1d5ef6a6cc3c142c31814d1
Merge: b3e83c7 e45fce7
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sun Nov 22 16:05:07 2015 +0100

    Merge branch 'master' of github.com:openframeworks/openFrameworks

commit b3e83c7fc35d1fc9c897ff3fddc4dc1f6cda54b1
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sun Nov 22 16:04:21 2015 +0100

    ofNode: fix resetTransform to also reset scale. Closes #851

commit e45fce76fd5c48b5a0ec8d3074619560c52916d4
Merge: 0c4de92 f9be555
Author: Daniel Rosser <danoli3@gmail.com>
Date:   Sun Nov 22 22:21:52 2015 +1100

    Merge pull request #4608 from r9y9/opencv-eigen-off

    Apothecary: add -DWITH_EIGEN=OFF to opencv formula for osx

commit 0c4de92fe4d2732ad4c934c4aeaa857af5951628
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sat Nov 21 19:00:10 2015 +0100

    ofImage: fix swapRG for float and short images. Closes #4609

commit d463da95f2c146f98f784a23ab49c639e6cbc0d9
Merge: 7e3c118 bbf7fc7
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sat Nov 21 12:54:23 2015 +0100

    Merge branch 'master' of github.com:openframeworks/openFrameworks

commit 7e3c118cad5ba34739af3b0ef8d19239cf6f3723
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sat Nov 21 12:49:17 2015 +0100

    ofUtils.cpp: check path isn't empty before trying to access back(). Closes #4598

commit ce12a6b2c1f0a1cbef632d5ffd486c800213abee
Author: arturo castro <arturo@openframeworks.cc>
Date:   Sat Nov 21 12:42:25 2015 +0100

    remove missing files from ofxMultiTouch

commit bbf7fc797b15584b68ec3eb71a810e4a1975ebb4
Merge: ccf45a3 fda3c7e
Author: arturo <arturo@openframeworks.cc>
Date:   Sat Nov 21 10:20:44 2015 +0000

    Merge pull request #4585 from 2bbb/PR/ofxOsc_getArgAsRgbaColor

    added missing implementation "getArgAsRgbaColor"

commit f9be555cd8acb4ed48c19f0933ffc79625c18110
Author: Ryuichi YAMAMOTO <zryuichi@gmail.com>
Date:   Sat Nov 21 13:50:57 2015 +0900

    Apothecary: add -DWITH_EIGEN=OFF to opencv formula for osx

    fixes #4578

commit ccf45a327ec377bbca0d5ebb48b3a8ef21d9d368
Merge: 97d1096 d2eec5a
Author: Daniel Rosser <danoli3@gmail.com>
Date:   Thu Nov 19 23:28:02 2015 +1100

    Merge pull request #4606 from danoli3/iOS/Fix-Example-native-ARC

    iOS Example fix for iOSNativeARCExample

commit d2eec5a8957e2a93133254d008583f481314d4f3
Author: Daniel Rosser <danoli3@gmail.com>
Date:   Thu Nov 19 23:22:47 2015 +1100

    iOS Example fix for iOSNativeARCExample
    - Fixes missing ofAppiOSWindow import

commit 97d1096e1596758cbf2b4d2d741ece20327b8e03
Merge: 2a8198b 6fc7c99
Author: Daniel Rosser <danoli3@gmail.com>
Date:   Thu Nov 19 17:42:21 2015 +1100

    Merge pull request #4605 from danoli3/Apothecary/OpenCVfix

    Apothecary - OpenCV formula Fix.

commit 6fc7c997f18171c1691ad517e5f11612559c16ab
Author: Daniel Rosser <danoli3@gmail.com>
Date:   Thu Nov 19 17:38:54 2015 +1100

    Apothecary - OpenCV formula Fix.

commit 2a8198b80847013907ceebd0c854f5b5795a1ac6
Author: Christoph Buchner <bilderbuchi@users.noreply.github.com>
Date:   Wed Nov 18 20:54:02 2015 +0100

    Disable docs test for now, as per @HalfdanJ's request

commit 8ab49e75fe8472ce9d4acdeb83831ee9f693778b
Merge: a29d9c8 82d0f88
Author: Daniel Rosser <danoli3@gmail.com>
Date:   Thu Nov 19 04:51:15 2015 +1100

    Merge pull request #4602 from danoli3/Apothecary/Fix-Poco-Linux

    Apothecary - Poco Formula fix for Linux Formula Types

commit 82d0f88a6ff35a1f4542657dd7a87dec76cb6262
Author: Daniel Rosser <danoli3@gmail.com>
Date:   Thu Nov 19 04:50:29 2015 +1100

    Apothecary - Poco Formula fix for Linux Formula Types

commit a29d9c85184f452c4dccac5288bcdcfcdd30c648
Merge: f235ac7 cf19cc2
Author: Theodore Watson <theo@openframeworks.cc>
Date:   Tue Nov 17 11:17:30 2015 -0500

    Merge pull request #4593 from traumedy/master

    Addresses 4 issues related to #4556:

commit cf19cc2d629e0f15468ff5bf963c30d71879cd2a
Author: Josh Buchbinder <joshb@obscuradigital.com>
D…
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
apothecary
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
1 participant
@danoli3