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

Develop #39

Open
wants to merge 88 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
88 commits
Select commit Hold shift + click to select a range
ad3f141
finally figured out midipacketlist problem... sweet.
charlieroberts Nov 10, 2011
1cebc06
autogui; fix for sysex
charlieroberts Dec 9, 2011
ea15e2a
init commit for refactoring. Slider refactored. oninit method added o…
charlieroberts Dec 20, 2011
e965724
refactored Knob and Button classes
charlieroberts Dec 21, 2011
6766b9e
refactored multibutton, corrected errors in button as well
charlieroberts Dec 23, 2011
a18f2e2
multitouch xy refactored
charlieroberts Dec 26, 2011
02bdb9a
removed lawnchair; refactored interfacemanager to use local storage
charlieroberts Dec 27, 2011
2653f4a
fix for setting values of Knob via OSC. changes to autogui and oscma…
charlieroberts Jan 13, 2012
e63b6a0
added AutoGUI.js. Working add / subtraction of widgets.
charlieroberts Jan 18, 2012
8bc94c1
fixed bug in OSCManager that would cause crash if OSC output was atte…
charlieroberts Jan 19, 2012
97a6ead
fixes for knob widget
charlieroberts Jan 19, 2012
31fc27d
refactored destination manager, now part of control object instead of…
charlieroberts Jan 27, 2012
c59890d
fixes so that osc polling thread is only created once, no matter how …
charlieroberts Jan 27, 2012
1958189
committing interfaceManager before I go too far down the rabbit hole...
charlieroberts Jan 28, 2012
90940b6
err... fixed slider so that it goes all the way down / up. moved majo…
charlieroberts Jan 28, 2012
cb5da11
first commit of refactored control. Lots of stuff doesn't work (gyro,…
charlieroberts Jan 29, 2012
2e08d98
merging
charlieroberts Jan 29, 2012
6fe01fd
changed readme and added some files
charlieroberts Jan 29, 2012
cfb1854
small change to readme
charlieroberts Jan 29, 2012
8dc2d28
small change to readme pt 2
charlieroberts Jan 29, 2012
3b2cd35
fixed MultiSlider and Accelerometer
charlieroberts Jan 29, 2012
687a3fe
important fix for sensors in Control.js. gyro + accelerometer interfa…
charlieroberts Jan 29, 2012
83bd39d
updated readme to reflect new working widgets
charlieroberts Jan 29, 2012
d88a726
really important bugfixes for OSCManager and loading of constants
charlieroberts Jan 29, 2012
cc1099d
super smooth slider movements via css 3d transforms! Eventually multi…
charlieroberts Jan 29, 2012
907b32a
super smooth multitouch xy, although I haven't ported the default int…
charlieroberts Jan 29, 2012
131eaf8
added multixy interface. turned on working interfaces in interface ma…
charlieroberts Jan 29, 2012
8debd3f
bug fixes for tracking multiple fingers in multitouchxy widget. plus …
charlieroberts Feb 1, 2012
5c671d8
fix for horizontal slider rendering
charlieroberts Feb 1, 2012
80d9663
destination manager now works perfectly. I think.
charlieroberts Feb 2, 2012
8f6cc4c
oscmanager.js: fix for adding widgets with labels on pages that are n…
charlieroberts Feb 2, 2012
497dfe8
control.js: important bug fix for loading widgets
charlieroberts Feb 2, 2012
9f79e89
adding Gyro plugin
charlieroberts Feb 2, 2012
c249dbe
various bug fixes; in particular for multitouchxy
charlieroberts Mar 9, 2012
0f1d732
added start of GUIAssist class
charlieroberts Mar 21, 2012
3d0bac1
removed bug where wrong interface would be launched after downloading…
charlieroberts Mar 27, 2012
16e9aa2
added modified version of patch to main branch submitted by https://g…
charlieroberts Mar 28, 2012
1458b1a
various bug fixes, game of life interface addition.
charlieroberts Apr 23, 2012
fd5d42b
fixed bug in Knob when not using ranges from 0 to 1
charlieroberts Apr 24, 2012
9f19cf0
added mixer interface, fixes for Knob and Slider widgets, loading con…
charlieroberts Apr 24, 2012
84daa30
added sequencer interface, small bug fixes for Slider
charlieroberts Apr 24, 2012
b831c6d
added monome interface, bug fix for sequencer interface
charlieroberts Apr 24, 2012
1586b02
added magnetometer class, various bug fixes
charlieroberts Apr 25, 2012
1ad8bff
lots of changes for in-app interface editing
charlieroberts Apr 27, 2012
4d458d8
adding support for magnetometer and speech, with a start on the video…
charlieroberts Apr 30, 2012
e11e4b4
adding files that got left out last commit
charlieroberts Apr 30, 2012
e0d6895
fixes for autogui and multislider
charlieroberts May 19, 2012
22f2f09
added a bunch of files after a screwed up commit. changed multislider…
charlieroberts May 19, 2012
45b251b
fixed bug where labels didn't appear on correct page after being dyna…
charlieroberts May 22, 2012
4b3f84d
added pressure sensing for multitouchxy. bug fixes for sequencer inte…
charlieroberts Jun 5, 2012
7f83365
added pressure to Button class
charlieroberts Jun 5, 2012
0e33940
added pressure to Slider class
charlieroberts Jun 5, 2012
6218d53
pressure for multibutton and multislider
charlieroberts Jun 5, 2012
737c082
fixed bugs with scrolling in interface manager
charlieroberts Jun 6, 2012
cb73ece
better error handling when downloading interface files
charlieroberts Jun 6, 2012
0d1f9c3
small improvements to destinations tab
charlieroberts Jun 7, 2012
bafa8da
pitch tracking working again
charlieroberts Jun 7, 2012
b37019d
fixed volume tracking. added convenience functions for making menu an…
charlieroberts Jun 7, 2012
1459d9c
interfaces load in Android, at least in ICS in the emulator
charlieroberts Jun 7, 2012
2ee5ddc
android: working in ICS 4.03 on asus transformer. Can add destination…
charlieroberts Jun 12, 2012
c076928
android: landscape interfaces work
charlieroberts Jun 13, 2012
d44b950
android: fix inside OSCLib to correctly handle strings of varying length
charlieroberts Jun 13, 2012
6d8657c
android: osc receive port can now be set from preferences, pushing de…
charlieroberts Jun 13, 2012
d1fc27d
android: finally got bonjour/zeroconf announcement working correctly.…
charlieroberts Jun 14, 2012
61a48b7
stashing...
charlieroberts Jul 2, 2012
76514f1
update phonegap jar path
billieblaze Jul 6, 2012
a07d9cd
Merge pull request #27 from billieblaze/develop
charlieroberts-rit Jul 6, 2012
bf584c6
widgets are encased in a container div to make them easier to move. a…
charlieroberts Jul 6, 2012
63ff5c6
Merge branch 'develop' of github.com:charlieroberts/Control into develop
charlieroberts Jul 6, 2012
020632a
progress on saving interfaces created on the device
charlieroberts Jul 10, 2012
6a878cb
more progress on editable interfaces... working on cleaner option menu
charlieroberts Jul 11, 2012
21129ad
fixes for loading interfaces under Android and some iOS fixes as well
charlieroberts Oct 17, 2012
501b694
ACCESS_WIFI_STATE permission added
charlieroberts Oct 17, 2012
8343e24
adding support for landscape using iOS 6
charlieroberts Jan 27, 2013
15b1867
basic support for video; compiles in mountain lion
charlieroberts Jan 27, 2013
1d84135
added a change to IOSGLView and RectBlobDetect - so that it actually
Jan 30, 2013
b4ad1d0
merge
charlieroberts Feb 7, 2013
4278c9b
changes to video.js
charlieroberts Feb 7, 2013
61392bf
changes to video.js
charlieroberts Feb 7, 2013
6674e12
fixed orientation issue and crashes due to out of bound pixels (which…
Feb 13, 2013
71c451c
fixing video.js interface file
charlieroberts-rit Feb 14, 2013
adb35ae
merge
charlieroberts Feb 14, 2013
9e991b4
calculate and print out top blob's centroid for sending via OSC
Feb 14, 2013
815ab2f
mege
charlieroberts Feb 14, 2013
865624f
merge
charlieroberts Feb 14, 2013
1dd8b0c
video now transmits OSC
charlieroberts Feb 14, 2013
9b596a2
Updated Forum link.
DrewRWx Oct 1, 2013
6c80f59
Merge pull request #36 from DrewRWx/patch-2
charlieroberts-rit Oct 2, 2013
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
38 changes: 38 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,41 @@
# Mac OS X Finder and whatnot
.DS_Store


# Sparkle distribution Private Key (Don't check me in!)
dsa_priv.pem


# XCode (and ancestors) per-user config (very noisy, and not relevant)
*.mode1
*.mode1v3
*.mode2v3
*.perspective
*.perspectivev3
*.pbxuser


# Generated files
VersionX-revision.h


# build products
build/
*.[oa]


# Other source repository archive directories (protects when importing)
.hg
.svn
CVS


# automatic backup files
*~.nib
*.swp
*.swo
*~
*(Autosaved).rtfd/
Backup[ ]of[ ]*.pages/
Backup[ ]of[ ]*.key/
Backup[ ]of[ ]*.numbers/
18 changes: 9 additions & 9 deletions Android/Control/.classpath
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry kind="lib" path="libs/phonegap.0.9.4.jar"/>
<classpathentry kind="lib" path="libs/jmdns.jar"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="output" path="bin"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry kind="lib" path="libs/jmdns.jar"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="lib" path="libs/phonegap-1.2.0.jar"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>
3 changes: 2 additions & 1 deletion Android/Control/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@
/>
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />

<application android:label="@string/app_name"
android:debuggable="false" android:icon="@drawable/icon72">
android:debuggable="false" android:icon="@drawable/icon72" >

<activity android:label="@string/app_name" android:configChanges="orientation|keyboardHidden"
android:name="Control" android:screenOrientation="portrait">
Expand Down
2 changes: 1 addition & 1 deletion Android/Control/build.properties → Android/Control/ant.properties
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This file is used to override default values used by the Ant build system.
#
#
# This file must be checked in Version Control Systems, as it is
# integral to the build system of your project.

Expand Down
2 changes: 1 addition & 1 deletion Android/Control/assets/www/css/iscroll.css
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ h1 { text-align:center; font-size:1em; display:inline; position:absolute; left:0
line-height:45px;
background-image:-webkit-gradient(linear, 0 0, 0 100%, color-stop(0, #333333), color-stop(0.05, #333333), color-stop(1, #000000));
padding:0;
color:#eee;
color:#eee;
font-size:20px;
/*text-align:center;*/
margin:0;
Expand Down
48 changes: 24 additions & 24 deletions Android/Control/assets/www/css/jquery.mobile-1.0a3.css
Original file line number Diff line number Diff line change
Expand Up @@ -176,13 +176,13 @@
color: #333333;
text-shadow: 0 1px 0 #fff;
font-weight: normal;
/* background-image: -moz-linear-gradient(top,
#e6e6e6,
#cccccc);
background-image: -webkit-gradient(linear,left top,left bottom,
color-stop(0, #e6e6e6),
color-stop(1, #cccccc));
-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#e6e6e6', EndColorStr='#cccccc')";*/
background-image: -moz-linear-gradient(top,
#e6e6e6,
#cccccc);
background-image: -webkit-gradient(linear,left top,left bottom,
color-stop(0, #e6e6e6),
color-stop(1, #cccccc));
-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#e6e6e6', EndColorStr='#cccccc')";
}
.ui-body-b,
.ui-body-b input,
Expand Down Expand Up @@ -287,14 +287,14 @@
border: 1px solid #B3B3B3;
color: #333333;
text-shadow: 0 1px 0 #fff;
background: #000;
/* background-image: -moz-linear-gradient(top,
#eeeeee,
#dddddd);
background-image: -webkit-gradient(linear,left top,left bottom,
color-stop(0, #eeeeee),
color-stop(1, #dddddd));
-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#eeeeee', EndColorStr='#dddddd')";*/
background: #f0f0f0;
background-image: -moz-linear-gradient(top,
#eeeeee,
#dddddd);
background-image: -webkit-gradient(linear,left top,left bottom,
color-stop(0, #eeeeee),
color-stop(1, #dddddd));
-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#eeeeee', EndColorStr='#dddddd')";
}
.ui-body-c,
.ui-body-c input,
Expand Down Expand Up @@ -407,7 +407,7 @@
border: 1px solid #ccc;
color: #333333;
text-shadow: 0 1px 0 #fff;
background: #000;
background: #ffffff;
}
.ui-body-d,
.ui-body-d input,
Expand Down Expand Up @@ -522,14 +522,14 @@
border: 1px solid #F7C942;
color: #333333;
text-shadow: 0 1px 0 #fff;
background: #000;
/* background-image: -moz-linear-gradient(top,
#fff,
#faeb9e);
background-image: -webkit-gradient(linear,left top,left bottom,
color-stop(0, #fff),
color-stop(1, #faeb9e));
-msfilter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#ffffff', EndColorStr='#faeb9e')";*/
background: #faeb9e;
background-image: -moz-linear-gradient(top,
#fff,
#faeb9e);
background-image: -webkit-gradient(linear,left top,left bottom,
color-stop(0, #fff),
color-stop(1, #faeb9e));
-msfilter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#ffffff', EndColorStr='#faeb9e')";
}
.ui-body-e,
.ui-body-e input,
Expand Down
Loading