diff options
author | John Mayhew | 2012-05-07 14:30:47 -0700 |
---|---|---|
committer | John Mayhew | 2012-05-07 14:30:47 -0700 |
commit | 29ad6355ef60cfb3b3fc7f780504f3ed30845883 (patch) | |
tree | bbe2dcd46c98db8138ad0a8f0263ef33324d7669 /js/data | |
parent | 1a759361b82127f9d5c1428dc889fffdf2daaf86 (diff) | |
download | ninja-29ad6355ef60cfb3b3fc7f780504f3ed30845883.tar.gz |
More implementation of moving color chips to the individual subtools.
Removed the tool color bar
Added new icons for inkbottle
Removed Pencil tool
Removed Inkbottle tool
Added chips to the pen, brush and tag tools
Aligned controls in several subtools
Diffstat (limited to 'js/data')
-rwxr-xr-x | js/data/tools-data.js | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/js/data/tools-data.js b/js/data/tools-data.js index 4d009530..ac6fe6e5 100755 --- a/js/data/tools-data.js +++ b/js/data/tools-data.js | |||
@@ -125,17 +125,6 @@ exports.ToolsData = Montage.create(Montage, { | |||
125 | "selected": false | 125 | "selected": false |
126 | }, | 126 | }, |
127 | { | 127 | { |
128 | "id": "PencilTool", | ||
129 | "properties": "pencilProperties", | ||
130 | "spriteSheet": true, | ||
131 | "action": "PencilTool", | ||
132 | "toolTip": "Pencil Tool", | ||
133 | "cursor": "auto", | ||
134 | "lastInGroup": false, | ||
135 | "container": false, | ||
136 | "selected": false | ||
137 | }, | ||
138 | { | ||
139 | "id": "BrushTool", | 128 | "id": "BrushTool", |
140 | "properties": "brushProperties", | 129 | "properties": "brushProperties", |
141 | "spriteSheet": true, | 130 | "spriteSheet": true, |
@@ -163,22 +152,11 @@ exports.ToolsData = Montage.create(Montage, { | |||
163 | "spriteSheet": true, | 152 | "spriteSheet": true, |
164 | "action": "InkBottleTool", | 153 | "action": "InkBottleTool", |
165 | "toolTip": "Ink Bottle Tool (K)", | 154 | "toolTip": "Ink Bottle Tool (K)", |
166 | "cursor": "url('images/tools/inkbottle_down.png'), default", | 155 | "cursor": "url('images/tools/inkbottle_cursor.png'), default", |
167 | "lastInGroup": true, | 156 | "lastInGroup": true, |
168 | "container": false, | 157 | "container": false, |
169 | "selected": false | 158 | "selected": false |
170 | }, | 159 | }, |
171 | { | ||
172 | "id": "EyedropperTool", | ||
173 | "properties": "eyedropperProperties", | ||
174 | "spriteSheet": true, | ||
175 | "action": "EyedropperTool", | ||
176 | "toolTip": "Eyedropper Tool (I)", | ||
177 | "cursor": "url('images/tools/eyedropper_down.png') 6 20, default", | ||
178 | "lastInGroup": false, | ||
179 | "container": false, | ||
180 | "selected": false | ||
181 | }, | ||
182 | // { | 160 | // { |
183 | // "id": "EraserTool", | 161 | // "id": "EraserTool", |
184 | // "properties": "eraserProperties", | 162 | // "properties": "eraserProperties", |