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

Refactor ofxGui with extended features and controls #31

Open
wants to merge 1,710 commits into
base: refactor-gui
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1710 commits
Select commit Hold shift + click to select a range
ad68e77
Merge pull request #4674 from danoli3/Android/Fix-androidSwipeExample
danoli3 Dec 15, 2015
b91da00
Merge remote-tracking branch 'arturoc/feature-voidParameter' into ref…
frauzufall Dec 17, 2015
d6d1b24
simplified setVolume
i-n-g-o Dec 17, 2015
66a0629
Merge pull request #4669 from i-n-g-o/ofAVFoundationVideoPlayer_simpl…
arturoc Dec 17, 2015
458d2f6
Merge pull request #4681 from i-n-g-o/iOS_AVFoundationPlayer_simplify…
danoli3 Dec 18, 2015
9333412
ofBufferObject: fix pack/unpack targets
arturoc Dec 19, 2015
7981fe4
Merge branch 'master' of github.com:openframeworks/openFrameworks
arturoc Dec 19, 2015
fdb7a38
adds set function for void parameters
frauzufall Dec 19, 2015
98604ad
Merge branch 'feature-voidParameter-fix' into refactor-gui-extended
frauzufall Dec 19, 2015
48e5767
Update create_package.sh for pg electron folder name change
mattfelsen Dec 21, 2015
db663f1
Merge pull request #4685 from mattfelsen/pg-rename
arturoc Dec 22, 2015
0331d8c
Const correction.
bakercp Dec 22, 2015
b1239cd
Merge pull request #4687 from bakercp/ofParameterGroup-const-fix
arturoc Dec 22, 2015
d5c7965
synced with master & resolved merge conflicts
Dec 24, 2015
65e0efc
redo some style fixes
Dec 24, 2015
2052051
set volume even if we are not ready
i-n-g-o Dec 24, 2015
adc12b6
hotfix->ofSoundBuffer::getChannel(ofSoundBuffer & targetBuffer, std::…
roymacdonald Dec 25, 2015
5623af9
Merge branch 'master' of https://github.com/openframeworks/openFramew…
jvcleave Dec 27, 2015
d95b158
Hotfix: ofSoundBuffer::getChannel
roymacdonald Dec 28, 2015
5ba0285
Merge pull request #4695 from roymacdonald/hotfix_ofSoundBuffer_getCh…
arturoc Dec 28, 2015
1e3db9a
Merge pull request #4690 from i-n-g-o/ofAVFoundationVideoPlayer_accep…
arturoc Dec 28, 2015
9dabba7
bugfix for 90 degree orientation not working for fullscreen and small…
ofTheo Dec 28, 2015
93ba21f
Merge pull request #4490 from NickHardeman/bugfix-glfw-fullscreen-multi
ofTheo Dec 28, 2015
ac80dc0
fixes issue where the window size is half as big on retina machines o…
ofTheo Dec 28, 2015
9a99336
Merge pull request #4701 from openframeworks/bugfix-retina-setupsize
ofTheo Dec 28, 2015
84f6a22
bugfix for being able to set the multidisplay fullscreen with the leg…
ofTheo Dec 28, 2015
5c91e49
app runner changes
ofTheo Dec 28, 2015
b8ea95d
moved the include to the cpp.
ofTheo Dec 28, 2015
7c66f04
fix for windows
ofTheo Dec 28, 2015
c9e6c0d
bugfix for shrinking window on ofToggleFullscreen closes #4696
ofTheo Dec 28, 2015
45838e0
bugfix for multi monitor fullscreen not accounting for pixel density.…
ofTheo Dec 28, 2015
a4df842
ifdef for glfw
ofTheo Dec 28, 2015
23f450d
ofBufferObject: better logic for binding/unbinding when mapping
arturoc Dec 29, 2015
1e14fbf
Merge branch 'master' of github.com:openframeworks/openFrameworks
arturoc Dec 29, 2015
8a6e0df
ofWindowSettings: add title to window settings
arturoc Dec 29, 2015
989400a
Merge branch 'bugfix-set-multifullscreen' of github.com:openframework…
arturoc Dec 29, 2015
54109a0
GLFW special ofSetupOpenGL: better comments and include
arturoc Dec 29, 2015
773595a
Merge pull request #4697 from openframeworks/bugfix-fullscreenrot
arturoc Dec 29, 2015
0e40dcf
linux arm7: switch back rpi2 to specific target and generic to default
arturoc Dec 29, 2015
8827319
rpi2 specific makefile config
arturoc Dec 29, 2015
c6d5be3
DS VideoPlayer: add support for all different RGB formats
arturoc Dec 30, 2015
34ff489
Merge pull request #4704 from arturoc/bugfix-rpi2-armv6
arturoc Dec 30, 2015
695e86a
Merge pull request #4707 from arturoc/fix-dsplayerformat
arturoc Dec 30, 2015
285e3f8
Merge pull request #4140 from tpltnt/bugfix-ofXml
bakercp Dec 30, 2015
a32dd6e
ofParameter<void> creates ofxButton, updated examples accordingly; sm…
frauzufall Jan 1, 2016
4e6525c
small fixes for void parameter
frauzufall Jan 1, 2016
e631570
Merge branch 'feature-voidParameter-fix' into refactor-gui-extended
frauzufall Jan 1, 2016
d456842
fix to avoid reference to ambiguous function when calling ofxButton::…
frauzufall Jan 1, 2016
8675367
fixes intendation
frauzufall Jan 1, 2016
d6b305c
Merge pull request #33 from frauzufall/feature-voidParameter-fix
arturoc Jan 2, 2016
3a341e4
Merge branch 'master' of https://github.com/openframeworks/openFramew…
jvcleave Jan 4, 2016
7a2bb01
RPI makefile fix for arm7
jvcleave Jan 4, 2016
c129b74
detect Raspbian in config.shared.mk
jvcleave Jan 4, 2016
3f4b6d7
actually detect Raspbian in config.shared.mk
jvcleave Jan 4, 2016
8d7ad9d
Update ofAppRunner.cpp
jvcleave Jan 4, 2016
17cb2ca
Make buildAllRPIExamples.sh work from any directory
Jan 4, 2016
df563cc
Merge pull request #1 from jedahan/rpi-build-examples-from-any-dir
jvcleave Jan 4, 2016
6b593ee
Fallback to /dev/input/event* for uinput mouse and keyboard
Jan 5, 2016
f941aa7
make defaultSetting
2bbb Jan 5, 2016
ae629a9
merge newest master 2016/01/05
2bbb Jan 5, 2016
2fc50bf
optimise ofPixels::setImageType()
whg Jan 5, 2016
26692fe
Merge pull request #4714 from whg/master
arturoc Jan 5, 2016
e6672ac
rename
2bbb Jan 5, 2016
fdd2cca
camelize same as others
2bbb Jan 5, 2016
f1bc081
add std
2bbb Jan 5, 2016
c1c5566
merge master
2bbb Jan 6, 2016
c7ae180
Merge branch 'master' into PR/add_ofImage_jpeg_loading_option
2bbb Jan 6, 2016
10b8a67
Fixes for DS player
arturoc Jan 6, 2016
4938272
DS player was getting iterators before potential reallocate
arturoc Jan 6, 2016
c24db36
copied src files from the ofxInputField addon
fx-lange Jan 7, 2016
50345e8
adjust copy constructor and setup to Config approach
fx-lange Jan 7, 2016
16fc5c5
return ofxInputField as reference
fx-lange Jan 7, 2016
a2966e2
fix indentation
fx-lange Jan 8, 2016
6cc46ef
added input fields to the advanced gui example
fx-lange Jan 8, 2016
b956fd5
renamed typedefs for float and int
fx-lange Jan 8, 2016
bc78e9e
Removes need for CROSS_COMPILING=1 to be passed in
jvcleave Jan 9, 2016
f2dca91
ofSerial: ttyACM is default on linux not only raspberry
arturoc Jan 12, 2016
abeb549
Merge branch 'master' of github.com:openframeworks/openFrameworks
arturoc Jan 12, 2016
33bd2dd
bugfix for low sound volume on ofDirectShowPlayer. closes #3818
ofTheo Jan 12, 2016
b6b1f41
bugfix for AVF video player not drawing if ARB textures are enabled. …
ofTheo Jan 12, 2016
4e8f18a
Merge pull request #4711 from jvcleave/fix-rpi-for-arm7
arturoc Jan 13, 2016
c23b1d1
apothecary tess2: fix linux
arturoc Jan 13, 2016
97c6571
ofParameter: set real numbers min/max to 0..1 by default. Closes #4717
arturoc Jan 13, 2016
f86c339
Merge branch 'master' of github.com:openframeworks/openFrameworks
arturoc Jan 13, 2016
76acc5d
Merge pull request #4725 from openframeworks/bugfix-avfarb
ofTheo Jan 13, 2016
cf9081a
Merge pull request #3976 from 2bbb/PR/fix_ofQuaternion_ostream_op
arturoc Jan 14, 2016
201bbcd
move implementation from .h to cpp
2bbb Jan 14, 2016
a36f8c0
Merge pull request #4729 from 2bbb/PR/fix_ofQuaternion_ostream_op
arturoc Jan 14, 2016
cd24b7c
comments added
fx-lange Jan 14, 2016
d099518
return correct bounding boxes for empty strings
fx-lange Jan 14, 2016
f105082
Merge pull request #4731 from ixds/fix-boundingbox
arturoc Jan 14, 2016
ac39e93
fix for #4732
armadillu Jan 14, 2016
0c8fcf4
fix shader assignment constructor
tgfrerer Jan 15, 2016
e0b23a5
Support darwin platform in apothecary android builds
HalfdanJ Jan 15, 2016
971fb5f
Merge pull request #4733 from armadillu/feature/hasMipMap
arturoc Jan 15, 2016
a3fbcbd
Merge pull request #4736 from HalfdanJ/apothecary_android_darwin
arturoc Jan 15, 2016
90f3582
Merge pull request #4735 from tgfrerer/fix_shader_assignment_constructor
arturoc Jan 15, 2016
fb6eddd
bugfix now correctly shows when a video is loaded for AVF based playe…
ofTheo Jan 15, 2016
3cb5cea
[AVFoundationPlayer] Avoid unnecesarry unload when _player is nil
r9y9 Jan 18, 2016
c4aa91a
[ofAVFoundationVideoPlayer] Add missing set nil
r9y9 Jan 20, 2016
764f0e0
[ofAVFoundationVideoPlayer] use autorelease instead of release
r9y9 Jan 20, 2016
fdea368
[ofAVFoundationVideoPlayer] release delegate for AVPlayerItemVideoOutput
r9y9 Jan 20, 2016
e84389c
allocates pixels on sync load.
ofTheo Jan 20, 2016
df8790b
[ofAVFoundationVideoPlayer] cleanup for unimplemnted delegate
r9y9 Jan 20, 2016
5af81ba
Merge pull request #4739 from r9y9/fix-avfoundation-video-player-crash
arturoc Jan 21, 2016
aa3abdb
create_package: fix windows package creation
arturoc Jan 21, 2016
54a0614
Merge branch 'master' of github.com:openframeworks/openFrameworks
arturoc Jan 21, 2016
0ee920a
create_package: fix linux arm packages
arturoc Jan 21, 2016
018dabf
remove check for texture - going to do as seperate PR
ofTheo Jan 21, 2016
3a2bfff
Merge pull request #4737 from openframeworks/bugfix-avf-load
ofTheo Jan 21, 2016
6a7f952
small fix - checks if texture is allocated before binding. also impro…
ofTheo Jan 21, 2016
b467ce6
checks not needed as are in isInitialized()
ofTheo Jan 21, 2016
04e2975
Merge pull request #4744 from openframeworks/bugfix-avf-errormsg
ofTheo Jan 21, 2016
c2d004f
fix head.template for new site
arturoc Jan 21, 2016
c814ece
Merge branch 'master' of http://github.com/openframeworks/openFrameworks
arturoc Jan 21, 2016
f1e4e43
implemented universal scaling for ofScale()
Jan 23, 2016
149e04a
Update buildAllRPIExamples.sh
jvcleave Jan 23, 2016
1ca96c4
Remove "file not found error" when running on MSYS2
oxillo Jan 24, 2016
74ca123
MSYS2 : Copy necessary DLL to project bin directory
oxillo Jan 24, 2016
f07caa7
Update MSYS2 documentation
oxillo Jan 24, 2016
c63042f
Removed PATH setting paragraph
oxillo Jan 24, 2016
583efa8
Added missing Dlls
oxillo Jan 24, 2016
03fde8c
catching invalid arguments to ofVec2f::average(), see #1555
Jan 24, 2016
006df74
added description to exception
Jan 24, 2016
ecd626d
int -> std::size_t for array size parameter
Jan 24, 2016
fe9be50
added image
thomasgeissl Jan 24, 2016
494b2dc
Merge pull request #4751 from thomasgeissl/fix-oscSenderExample
arturoc Jan 25, 2016
1ce0042
Merge pull request #4750 from tpltnt/bugfix-issue-1555
arturoc Jan 25, 2016
d5d1fce
ofTexture: avoid recursive calls from loadData to allocate
arturoc Jan 25, 2016
90be4e1
Merge branch 'master' of github.com:openframeworks/openFrameworks
arturoc Jan 25, 2016
ed0a6bc
Revert "Added missing Dlls"
oxillo Jan 25, 2016
762117f
Add Missing Dlls
oxillo Jan 25, 2016
e7fd620
bugfix - restores retina window size to 0.9.0 behavior
ofTheo Jan 27, 2016
6f09d5b
Merge pull request #4752 from openframeworks/bugfix-retina
ofTheo Jan 27, 2016
945c5ce
bugfix for OS X. stops window moving on ofSetWindowShape closes #4753
ofTheo Jan 27, 2016
3b934a9
fix unit tests template
arturoc Jan 27, 2016
e3634c1
openFrameworks.qbs: fix project settings for latest qtcreator
arturoc Jan 27, 2016
e8dec41
ofApp.qbs: add src recursively to search paths
arturoc Jan 27, 2016
9ea37a3
qbs helpers: better algorithm to find libraries recursively
arturoc Jan 27, 2016
418aa5c
osx makefiles: ignore unused video implementations
arturoc Jan 27, 2016
51d8537
ofConstants: fix linux gl includes
arturoc Jan 27, 2016
65ab6df
ofTTF: default parameter for dpi to it's correct value instead of 0
arturoc Jan 27, 2016
ac0aeeb
ofGLUtils: fix supported extensions function
arturoc Jan 27, 2016
430a397
ofMainLoop: make pollEvents public so it can be polled manually
arturoc Jan 27, 2016
cca86f1
ofNode: fix crash on unregistering when parent is gone already
arturoc Jan 27, 2016
b6e43d7
Merge branch 'master' of github.com:openframeworks/openFrameworks
arturoc Jan 27, 2016
7c5a8fd
Merge pull request #4754 from openframeworks/bugfix-osx-windowpos
ofTheo Jan 27, 2016
694e5ea
Add COPY_DLL make option
oxillo Jan 29, 2016
dc8e489
Document COPY_DLL option
oxillo Jan 29, 2016
a06bc23
Merge remote-tracking branch 'refs/remotes/openframeworks/master' int…
oxillo Jan 29, 2016
32805be
ofGLUtils: fix supported extensions for opengles
arturoc Jan 29, 2016
ffe2c27
Merge branch 'master' of github.com:openframeworks/openFrameworks
arturoc Jan 29, 2016
aafb82b
ofDSVideoPlayer: use a c function as sample deleter. Closes #4748
arturoc Jan 30, 2016
d874746
Merge branch 'noRPIROOT' of github.com:oxillo/openFrameworks
arturoc Jan 30, 2016
7a0851b
make copy_dlls target optional and instead add path through the insta…
arturoc Jan 30, 2016
ac6d291
Remove duplicate libwinpthread
oxillo Jan 30, 2016
2aafeb4
Do not rely on a specific version of libwebp
oxillo Jan 30, 2016
4b990c7
Do not rely on a specific version of OpenCv
oxillo Jan 30, 2016
db0cd45
Merge pull request #4761 from oxillo/improve_copy_dlls
arturoc Jan 30, 2016
987cc1a
create_package: fix makefile copying for linux arm
arturoc Jan 31, 2016
1145699
release script overwrite folder if exists
arturoc Jan 31, 2016
e1df6e0
add any folder with name prefix apps to gitignore
fred-dev Feb 1, 2016
a02b4dd
Add rotation and translation sensitivity setters
charlesveasey Feb 1, 2016
cd951d4
ofEasyCam: update comments to break at <= 80 chars
charlesveasey Feb 1, 2016
b25179d
ofEasyCam: Fix tabs
charlesveasey Feb 1, 2016
0f00ac6
ofEasyCam: Remove unneeded comment
charlesveasey Feb 1, 2016
847ecfc
Merge pull request #4338 from 2bbb/PR/add_ofImage_jpeg_loading_option
arturoc Feb 2, 2016
142a8d1
Merge pull request #4590 from HalfdanJ/android_programmable_render_OES
arturoc Feb 2, 2016
41eea98
Merge pull request #4653 from arturoc/feature-appveyortestreports
arturoc Feb 2, 2016
9431eb6
Merge pull request #4661 from arturoc/feature-bufferReserveNoMemCpy
arturoc Feb 2, 2016
bc30df6
Merge pull request #4664 from tgfrerer/feature-ofMesh-better-ply-parsing
arturoc Feb 2, 2016
0211c88
Merge pull request #4747 from tpltnt/feature-issue-4668
arturoc Feb 2, 2016
094c0da
Merge pull request #4765 from charlesveasey/easycam-feature
arturoc Feb 2, 2016
d4bba6c
fix ignore for subfolders
fred-dev Feb 2, 2016
8a4fffc
back to check
fred-dev Feb 2, 2016
0b6c8b0
check subfolder to get back to
fred-dev Feb 2, 2016
7684137
round again
fred-dev Feb 2, 2016
a8fa385
Git ignore folders and contents with apps prefix in root only
fred-dev Feb 2, 2016
09536a6
Merge branch 'feature-ttfUTF8' of github.com:arturoc/openFrameworks
arturoc Feb 2, 2016
205b383
Merge pull request #4764 from fred-dev/master
arturoc Feb 2, 2016
972d745
Merge branch 'feature-voidParameter'
arturoc Feb 2, 2016
57e8359
Merge branch 'master' of github.com:openframeworks/openFrameworks
arturoc Feb 2, 2016
189ff3a
Merge pull request #4393 from arturoc/feature-voidParameter
arturoc Feb 2, 2016
7a6b232
ofVec2f: fix warning
arturoc Feb 2, 2016
040517e
ofAppendUTF8: uint32 parameter instead of int
arturoc Feb 2, 2016
965fc80
Merge branch 'master' into refactor-stdthread
arturoc Feb 2, 2016
c43904a
remove orig file from repo
arturoc Feb 2, 2016
0c403a6
Merge branch 'RTAudio-Fix' of github.com:DomAmato/openFrameworks into…
arturoc Feb 2, 2016
b0d2faf
ofThread: fix issue with merged branch
arturoc Feb 2, 2016
ca62fcf
ofxThreadedImageLoader: fixes for std::thread
arturoc Feb 2, 2016
f5a562b
ofxThreadedImageLoader: fixes for std::thread
arturoc Feb 2, 2016
a3b26e9
Merge branch 'master' into refactor-rtaudioAPI
arturoc Feb 2, 2016
732372f
ofxThreadedImageLoader: fix problem with new ofThread impl
arturoc Feb 2, 2016
b5f3b66
Merge pull request #2990 from jedahan/raspberrypi-uinput
arturoc Feb 2, 2016
37cf560
Added a method to copy a fbo to a pbo using glReadPixels.
smallfly Feb 2, 2016
c21774b
Merge pull request #4767 from smallfly/feature-fbo_to_bufferobject
arturoc Feb 3, 2016
1a53854
simplified structure for ofSoundStreamSettings
arturoc Feb 3, 2016
f00a2f3
Merge branch 'master' into refactor-rtaudioAPI
arturoc Feb 3, 2016
bf125af
Merge branch 'master' of github.com:openframeworks/openFrameworks int…
arturoc Feb 3, 2016
762a863
add https://github.com/nlohmann/json as default OF json
arturoc Feb 3, 2016
de48994
json->ofJson
arturoc Feb 3, 2016
4b42f1f
ofSoundStream: fix fmod buffer setting
arturoc Feb 3, 2016
7437df0
rtaudio stream: fix problem with old linux versions
arturoc Feb 3, 2016
8721bf0
ofSerial: fixes for firmata servos in linux + better type handling
arturoc Feb 3, 2016
573014a
Merge branch 'master' into feature-json
arturoc Feb 3, 2016
5dbe254
ofxAndroidSoundStream: fixes for new api
arturoc Feb 3, 2016
f5de70a
Merge pull request #4772 from arturoc/bugfix-firmataservo
arturoc Feb 3, 2016
601a8df
android: ignore rtaudio cpp
arturoc Feb 3, 2016
7ec0cfa
rtaudio: forward declaration for rtaudio
arturoc Feb 3, 2016
caf191e
Merge branch 'master' of github.com:openframeworks/openFrameworks
arturoc Feb 3, 2016
347861a
add json to project files
arturoc Feb 3, 2016
4a1288f
fix ofxandroidsoundstream
arturoc Feb 3, 2016
52c8f5b
osx tests: try network examples several times to avoid false positive…
arturoc Feb 3, 2016
5dccbbb
ofxAndroidSoundStream: fix impl for new api
arturoc Feb 3, 2016
5243459
ofEvent now supports adding std::function as a listener, that allows
arturoc Feb 4, 2016
5d2a412
templated ofTo that converts string to anything that implements >>
arturoc Feb 4, 2016
c0b8af7
ofUtils: ofTo* using ofTo<>
arturoc Feb 4, 2016
51067ad
ofEvent: fixes vs?
arturoc Feb 4, 2016
3c6c0d6
ofEvent: fix templated types for vs
arturoc Feb 4, 2016
09e3523
events tests vs project files
arturoc Feb 4, 2016
6a6e598
Merge pull request #4775 from arturoc/feature-ofto
arturoc Feb 4, 2016
5c8e5ce
fix warning in ofTrueTypeFont
tgfrerer Feb 4, 2016
441c687
ofMesh: fix some warnings
arturoc Feb 4, 2016
47d33cc
events tests: fix project files
arturoc Feb 4, 2016
95ba85e
Merge pull request #4776 from tgfrerer/fix-ttf-warning
arturoc Feb 4, 2016
05b2228
events test: add unit tests addon
arturoc Feb 4, 2016
f7ae24a
add check_function to help vs disambiguate std::function signatures
arturoc Feb 4, 2016
cc71aae
ofEvent: fix for gcc & clang
arturoc Feb 4, 2016
a19e2b1
ofEvent: use ifdef instead of if to test visual studio
arturoc Feb 4, 2016
07c45eb
tests: run under gdb in osx and linux to catch possible segfaults
arturoc Feb 4, 2016
254a4e1
install_dependencies ubuntu: install gdb
arturoc Feb 4, 2016
9f7c3c1
runtests osx: use lldb instead of gdb
arturoc Feb 4, 2016
6d65b3f
osx tests: try to trap segfaults and cat logs
arturoc Feb 4, 2016
7d17a3c
trying to fix running tests under gdb for linux and osx
arturoc Feb 5, 2016
5abde82
test: exec permissions for osx install script
arturoc Feb 5, 2016
5a69719
tests: install osx: update brew before trying to install
arturoc Feb 5, 2016
9a4a614
linux tests: remove ls from output
arturoc Feb 5, 2016
aea5ef5
osx tests: run gdb as root to avoid heving to sign it
arturoc Feb 5, 2016
b04b3c6
Merge pull request #4777 from arturoc/feature-testsgdb
arturoc Feb 5, 2016
1d2c264
Merge branch 'master' into feature-lambdaevents
arturoc Feb 5, 2016
fbcd71c
Merge pull request #4774 from arturoc/feature-lambdaevents
arturoc Feb 5, 2016
6cae900
fix templated functions impl in cpp
arturoc Feb 5, 2016
a83efdd
add newListener method to ofParameter
tgfrerer Feb 5, 2016
57c4d9a
Merge pull request #4784 from tgfrerer/feature-ofParam-newListener
arturoc Feb 5, 2016
4d51fa7
set default dpi back to 0
arturoc Feb 5, 2016
0a7da2d
Merge branch 'master' of github.com:openframeworks/openFrameworks
arturoc Feb 5, 2016
b0a1861
Merge pull request #1 from fx-lange/gui-input-field
frauzufall Feb 6, 2016
764ea0f
Merge remote-tracking branch 'upstream/master' into refactor-gui-exte…
frauzufall Feb 6, 2016
8b9070d
Merge remote-tracking branch 'arturoc/feature-json' into refactor-gui…
frauzufall Feb 6, 2016
46e19cc
small fixes in setup and constructors to use referenced parameters
frauzufall Feb 9, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
19 changes: 19 additions & 0 deletions .appveyor.yml
@@ -0,0 +1,19 @@
version: 1.0.{build}
os: Visual Studio 2015 RC
configuration: Debug
platform:
- x86
- x64
shallow_clone: true
clone_depth: 10
environment:
PATH: C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH%
build:
project: libs/openFrameworksCompiled/project/vs/openframeworksLib.vcxproj
parallel: true
verbosity: minimal
test_script:
- cmd: >-
cd scripts/ci/vs

run_tests.bat
2 changes: 2 additions & 0 deletions .gitattributes
Expand Up @@ -11,6 +11,8 @@
# Declare files that will always have CRLF line endings on checkout.
*.sln text eol=crlf
*.vcxproj* text eol=crlf
.appveyor.yml text eol=crlf
*.bat text eol=crlf

# Denote all files that are truly binary and should not be modified.
*.png binary
Expand Down
21 changes: 21 additions & 0 deletions .gitignore
Expand Up @@ -31,6 +31,12 @@ apps/*
*.o
examples/**/[Dd]ebug*/
examples/**/[Rr]elease*/
examples/**/gcc-debug/
examples/**/gcc-release/
tests/**/[Dd]ebug*/
tests/**/[Rr]elease*/
tests/**/gcc-debug/
tests/**/gcc-release/
*.mode*
*.app/
*.pyc
Expand Down Expand Up @@ -72,6 +78,19 @@ ipch/
local.properties
.externalToolBuilders

# Android Studio
.idea
.gradle
gradle
gradlew
gradlew.bat

# QtCreator
*.qbs.user
*.pro.user
*.pri


#########################
# operating system
#########################
Expand Down Expand Up @@ -107,3 +126,5 @@ Desktop.ini
#########################

.mailmap
/apps*/

2 changes: 1 addition & 1 deletion .gitmodules
@@ -1,3 +1,3 @@
[submodule "apps/projectGenerator/projectGeneratorSimple"]
[submodule "apps/projectGenerator"]
path = apps/projectGenerator
url = https://github.com/openframeworks/projectGenerator.git
20 changes: 0 additions & 20 deletions .travis.linux.yml

This file was deleted.

97 changes: 67 additions & 30 deletions .travis.yml
@@ -1,35 +1,72 @@

language: objective-c
compiler: clang
node_js: '0.10'
env:
global:
- secure: kjz286d6rs2VHpv4WnxAOYXcdTIaTaABZ0SNXf27r5H+NDu5qx8ZSeCmj/9op/sDjTtpkLKhi2a0njUCWwak28RAWP3dNkT92MkUPVKBkevznSxWeqwLHoUos3AJnhPMB+cwrWvmRC+Ljt5K1q8SxQsS/HXM9pzKL3DG3qxM+eo=
matrix:
- NAME="osx" \
SCRIPT_PATH="scripts/$NAME" \
SCRIPT="$SCRIPT_PATH/testTemplate.sh"
- NAME="ios" \
SCRIPT_PATH="scripts/$NAME" \
SCRIPT="$SCRIPT_PATH/testTemplate.sh"
- NAME="android-armv7" \
SCRIPT_PATH="scripts/android" \
OF_ROOT="$PWD" \
SCRIPT="$SCRIPT_PATH/testTemplate.sh armv7"
- NAME="android-x86" \
SCRIPT_PATH="scripts/android" \
OF_ROOT="$PWD" \
SCRIPT="$SCRIPT_PATH/testTemplate.sh x86"
- NAME="docs" \
SCRIPT_PATH="scripts/dev" \
SCRIPT="$SCRIPT_PATH/documentation.sh"
before_install:
"if [ \"$NAME\" == \"docs\" ]; then scripts/dev/documentation.sh before_install; fi"
language: c++
compiler: gcc
sudo: true
matrix:
include:
# fully specify builds, include can't dynamically expand matrix entries
# relative order of sudo and env is important so that addons: is recognized
- os: linux
dist: trusty
sudo: required
env: TARGET="linux"
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- gcc-4.9
- g++-4.9
- gdb
- os: osx
compiler: clang
env: TARGET="osx"
- os: osx
compiler: clang
env: TARGET="ios"
- os: linux
sudo: false
env: TARGET="android" OPT="armv7"
cache:
directories:
- ~/android-ndk-r10e
- os: linux
sudo: false
env: TARGET="android" OPT="x86"
cache:
directories:
- ~/android-ndk-r10e
# disable docs test for now
#- os: linux
# sudo: false
# env:
# - TARGET="docs"
# - secure: kjz286d6rs2VHpv4WnxAOYXcdTIaTaABZ0SNXf27r5H+NDu5qx8ZSeCmj/9op/sDjTtpkLKhi2a0njUCWwak28RAWP3dNkT92MkUPVKBkevznSxWeqwLHoUos3AJnhPMB+cwrWvmRC+Ljt5K1q8SxQsS/HXM9pzKL3DG3qxM+eo=
# addons:
# apt:
# packages:
# - python-software-properties
# - doxygen
# - ncftp
# Exclude the default build that would otherwise be generated
# see https://github.com/travis-ci/travis-ci/issues/1228
exclude:
- compiler: gcc
#allow_failures:
# # temporary until we find out how to prevent (spurious) build failures
# - env:
# - TARGET="docs"
# - secure: kjz286d6rs2VHpv4WnxAOYXcdTIaTaABZ0SNXf27r5H+NDu5qx8ZSeCmj/9op/sDjTtpkLKhi2a0njUCWwak28RAWP3dNkT92MkUPVKBkevznSxWeqwLHoUos3AJnhPMB+cwrWvmRC+Ljt5K1q8SxQsS/HXM9pzKL3DG3qxM+eo=
install:
"if [ \"$NAME\" == \"android-armv7\" ] || [ \"$NAME\" == \"android-x86\" ]; then scripts/android/install_tests_env.sh; fi"
- if [ "$TARGET" == "android" ] || [ "$TARGET" == "linux" ] || [ "$TARGET" == "docs" ] || [ "$TARGET" == "osx" ]; then
scripts/ci/$TARGET/install.sh;
fi
script:
"$SCRIPT"
- scripts/ci/$TARGET/build.sh $OPT
- if [ "$TARGET" == "osx" ] || [ "$TARGET" == "linux" ]; then
scripts/ci/$TARGET/run_tests.sh;
fi
after_success:
"if [ \"$NAME\" == \"docs\" ]; then scripts/dev/documentation.sh after_success; fi"
# this will only run fully on a commit, not a PR, due to secure above
if [ "$TARGET" == "docs" ]; then scripts/ci/$TARGET/after_success.sh; fi
git:
depth: 10