Merge branch 'feature/sliders' into develop

2016-10-31 15:36:12 +01:00
parent bff31d0829 0b2fc89ffb
commit 68579a0265
259 changed files with 228 additions and 21281 deletions
--- a/static/rigging/1x.txt~
+++ b/static/rigging/1x.txt~
@@ -1,39 +0,0 @@
-(irigging
-rigging
-p0
-(dp1
-S'catchangle'
-p2
-F-0.93
-sS'lscull'
-p3
-F2.655
-sS'span'
-p4
-F1.6
-sS'Nrowers'
-p5
-I1
-sS'mb'
-p6
-I14
-sS'roworscull'
-p7
-S'scull'
-p8
-sS'lin'
-p9
-F0.9
-sS'_rigging__spread'
-p10
-F0.88
-sS'bladelength'
-p11
-F0.46
-sS'dragform'
-p12
-I1
-sS'_rigging__bladearea'
-p13
-F0.0822
-sb.
--- a/static/rigging/2-.txt~
+++ b/static/rigging/2-.txt~
@@ -1,39 +0,0 @@
-(irigging
-rigging
-p0
-(dp1
-S'catchangle'
-p2
-F-0.93
-sS'lscull'
-p3
-F3.205
-sS'span'
-p4
-F1.6
-sS'Nrowers'
-p5
-I2
-sS'mb'
-p6
-I27
-sS'roworscull'
-p7
-S'row'
-p8
-sS'lin'
-p9
-F1.14
-sS'_rigging__spread'
-p10
-F0.88
-sS'bladelength'
-p11
-F0.545
-sS'dragform'
-p12
-F1.05
-sS'_rigging__bladearea'
-p13
-F0.1174
-sb.
--- a/static/rigging/2x.txt~
+++ b/static/rigging/2x.txt~
@@ -1,39 +0,0 @@
-(irigging
-rigging
-p0
-(dp1
-S'catchangle'
-p2
-F-0.93
-sS'lscull'
-p3
-F2.655
-sS'span'
-p4
-F1.6
-sS'Nrowers'
-p5
-I2
-sS'mb'
-p6
-I27
-sS'roworscull'
-p7
-S'scull'
-p8
-sS'lin'
-p9
-F0.9
-sS'_rigging__spread'
-p10
-F0.88
-sS'bladelength'
-p11
-F0.46
-sS'dragform'
-p12
-F1.05
-sS'_rigging__bladearea'
-p13
-F0.0822
-sb.
--- a/static/rigging/4-.txt~
+++ b/static/rigging/4-.txt~
@@ -1,39 +0,0 @@
-(irigging
-rigging
-p0
-(dp1
-S'catchangle'
-p2
-F-0.93
-sS'lscull'
-p3
-F3.205
-sS'span'
-p4
-F1.6
-sS'Nrowers'
-p5
-I4
-sS'mb'
-p6
-I50
-sS'roworscull'
-p7
-S'row'
-p8
-sS'lin'
-p9
-F1.14
-sS'_rigging__spread'
-p10
-F0.88
-sS'bladelength'
-p11
-F0.545
-sS'dragform'
-p12
-I1
-sS'_rigging__bladearea'
-p13
-F0.1174
-sb.
--- a/static/rigging/4x.txt~
+++ b/static/rigging/4x.txt~
@@ -1,39 +0,0 @@
-(irigging
-rigging
-p0
-(dp1
-S'catchangle'
-p2
-F-0.93
-sS'lscull'
-p3
-F2.655
-sS'span'
-p4
-F1.6
-sS'Nrowers'
-p5
-I4
-sS'mb'
-p6
-F52.0
-sS'roworscull'
-p7
-S'scull'
-p8
-sS'lin'
-p9
-F0.9
-sS'_rigging__spread'
-p10
-F0.88
-sS'bladelength'
-p11
-F0.46
-sS'dragform'
-p12
-F1.11
-sS'_rigging__bladearea'
-p13
-F0.0822
-sb.
--- a/static/rigging/8+.txt~
+++ b/static/rigging/8+.txt~
@@ -1,39 +0,0 @@
-(irigging
-rigging
-p0
-(dp1
-S'catchangle'
-p2
-F-0.93
-sS'lscull'
-p3
-F3.205
-sS'span'
-p4
-F1.6
-sS'Nrowers'
-p5
-I8
-sS'mb'
-p6
-I151
-sS'roworscull'
-p7
-S'row'
-p8
-sS'lin'
-p9
-F1.14
-sS'_rigging__spread'
-p10
-F0.88
-sS'bladelength'
-p11
-F0.545
-sS'dragform'
-p12
-I1
-sS'_rigging__bladearea'
-p13
-F0.1174
-sb.