Use develop branch of ofxTextInputField

YCAMInterlab · Nov 4, 2013 · fe68cf3 · fe68cf3
1 parent 97bcd98
commit fe68cf3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -148,6 +148,7 @@ to download the timeline open up the terminal and type
     $./clone_addons.sh
 
 This will download the necessary addons, but won't overwrite any changes if you already have some of them installed
+If you're using linux, please make sure you checkout the develop branch of ofxTextInputField
 
 ### Create a new ofxTimeline project
 

diff --git a/clone_addons.sh b/clone_addons.sh
@@ -16,6 +16,8 @@ ${PREFIX}obviousjim/ofxTween.git
 
 ${PREFIX}obviousjim/ofxMSATimer.git
 
-${PREFIX}Flightphase/ofxTextInputField.git
+${PREFIX}Flightphase/ofxTextInputField.git -b develop
+
+echo "If you're using linux, please make sure you checkout the develop branch of ofxTextInputField"
 
 ${PREFIX}Flightphase/ofxRange.git
diff --git a/example-videoRenderer/bin/data/timeline0_Page_One_trackPositions.xml b/example-videoRenderer/bin/data/timeline0_Page_One_trackPositions.xml
@@ -2,31 +2,31 @@
     <element name="Video">
         <x>0.000000000</x>
         <y>52.000000000</y>
-        <width>1075.000000000</width>
+        <width>1024.000000000</width>
         <height>40.000000000</height>
     </element>
     <element name="brightness">
         <x>0.000000000</x>
         <y>116.000000000</y>
-        <width>1075.000000000</width>
+        <width>1024.000000000</width>
         <height>40.000000000</height>
     </element>
     <element name="contrast">
         <x>0.000000000</x>
         <y>180.000000000</y>
-        <width>1075.000000000</width>
+        <width>1024.000000000</width>
         <height>40.000000000</height>
     </element>
     <element name="invert">
         <x>0.000000000</x>
         <y>307.000000000</y>
-        <width>1075.000000000</width>
+        <width>1024.000000000</width>
         <height>40.000000000</height>
     </element>
     <element name="saturation">
         <x>0.000000000</x>
         <y>244.000000000</y>
-        <width>1075.000000000</width>
+        <width>1024.000000000</width>
         <height>39.000000000</height>
     </element>
 </positions>
diff --git a/example-videoRenderer/bin/data/timeline0_zoomer.xml b/example-videoRenderer/bin/data/timeline0_zoomer.xml
@@ -1,4 +1,4 @@
-<zoom>
-    <min>0</min>
-    <max>1</max>
-</zoom>
+<zoom>
+    <min>0.000000000</min>
+    <max>1.000000000</max>
+</zoom>