diff options
| author | Nivesh Rajbhandari | 2012-03-13 13:05:16 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-03-13 13:05:16 -0700 |
| commit | e19376c54eedd1f1c457ba405b2f110be376a559 (patch) | |
| tree | d48c090f71ed2cd6bd6ce38ff68c36ab69299985 /js | |
| parent | 970c2e63aa8ec3f70df2bf073cedb9e3b7617755 (diff) | |
| parent | f56b8cf4d3316d250c0f0045fb78f0dbd5c56e94 (diff) | |
| download | ninja-e19376c54eedd1f1c457ba405b2f110be376a559.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
Diffstat (limited to 'js')
98 files changed, 2320 insertions, 1450 deletions
diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.html b/js/components/tools-properties/brush-properties.reel/brush-properties.html index 38f7f856..608111bd 100755 --- a/js/components/tools-properties/brush-properties.reel/brush-properties.html +++ b/js/components/tools-properties/brush-properties.reel/brush-properties.html | |||
| @@ -11,12 +11,55 @@ | |||
| 11 | 11 | ||
| 12 | <script type="text/montage-serialization"> | 12 | <script type="text/montage-serialization"> |
| 13 | { | 13 | { |
| 14 | "strokeSizeHT": { | ||
| 15 | "module": "js/components/hottextunit.reel", | ||
| 16 | "name": "HotTextUnit", | ||
| 17 | "properties": { | ||
| 18 | "element": {"#": "strokeSize"}, | ||
| 19 | "minValue": 1, | ||
| 20 | "maxValue": 100, | ||
| 21 | "value": 1, | ||
| 22 | "decimalPlace": 10, | ||
| 23 | "acceptableUnits" : ["px", "pt"] | ||
| 24 | } | ||
| 25 | }, | ||
| 26 | |||
| 27 | "strokeHardnessHT": { | ||
| 28 | "module": "js/components/hottextunit.reel", | ||
| 29 | "name": "HotTextUnit", | ||
| 30 | "properties": { | ||
| 31 | "element": {"#": "strokeHardness"}, | ||
| 32 | "minValue": 0, | ||
| 33 | "maxValue": 100, | ||
| 34 | "value": 100, | ||
| 35 | "decimalPlace": 10, | ||
| 36 | "acceptableUnits" : ["px", "pt"] | ||
| 37 | } | ||
| 38 | }, | ||
| 39 | |||
| 40 | "strokeAngleHT": { | ||
| 41 | "module": "js/components/hottextunit.reel", | ||
| 42 | "name": "HotTextUnit", | ||
| 43 | "properties": { | ||
| 44 | "element": {"#": "strokeAngle"}, | ||
| 45 | "minValue": -90, | ||
| 46 | "maxValue": 90, | ||
| 47 | "value": 0, | ||
| 48 | "decimalPlace": 10, | ||
| 49 | "acceptableUnits" : ["px", "pt"] | ||
| 50 | } | ||
| 51 | }, | ||
| 14 | 52 | ||
| 15 | "owner": { | ||