aboutsummaryrefslogtreecommitdiff
path: root/js/data/tools-data.js
diff options
context:
space:
mode:
authorPushkar Joshi2012-02-07 07:21:27 -0800
committerPushkar Joshi2012-02-07 07:21:27 -0800
commit4bbe42e6d01fd0f81d13357a75b40eae9925dda3 (patch)
tree57f49ebfa5d3fcef28753b34015209edda6e620a /js/data/tools-data.js
parente7aa17a9b472640355e95c54841399f6203050d4 (diff)
parent8950b342d1eda8bfa195372e1c17363a409651cd (diff)
downloadninja-4bbe42e6d01fd0f81d13357a75b40eae9925dda3.tar.gz
Merge branch 'master' into pentool
Diffstat (limited to 'js/data/tools-data.js')
-rw-r--r--js/data/tools-data.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/js/data/tools-data.js b/js/data/tools-data.js
index 8ea84574..de965dbc 100644
--- a/js/data/tools-data.js
+++ b/js/data/tools-data.js
@@ -37,7 +37,7 @@ exports.ToolsData = Montage.create(Montage, {
37 "properties": "rotate3DProperties", 37 "properties": "rotate3DProperties",
38 "spriteSheet": true, 38 "spriteSheet": true,
39 "action": "Rotate3DTool", 39 "action": "Rotate3DTool",
40 "toolTip": "3D Rotate Object Tool", 40 "toolTip": "3D Rotate Object Tool (W)",
41 "cursor": "auto", 41 "cursor": "auto",
42 "lastInGroup": false, 42 "lastInGroup": false,
43 "container": false, 43 "container": false,
@@ -48,7 +48,7 @@ exports.ToolsData = Montage.create(Montage, {
48 "properties": "translate3DProperties", 48 "properties": "translate3DProperties",
49 "spriteSheet": true, 49 "spriteSheet": true,
50 "action": "Translate3DTool", 50 "action": "Translate3DTool",
51 "toolTip": "3D Translate Object Tool", 51 "toolTip": "3D Translate Object Tool (G)",
52 "cursor": "auto", 52 "cursor": "auto",
53 "lastInGroup": true, 53 "lastInGroup": true,
54 "container": false, 54 "container": false,
@@ -206,7 +206,7 @@ exports.ToolsData = Montage.create(Montage, {
206 "properties": "panProperties", 206 "properties": "panProperties",
207 "spriteSheet": true, 207 "spriteSheet": true,
208 "action": "PanTool", 208 "action": "PanTool",
209 "toolTip": "Pan Tool", 209 "toolTip": "Hand Tool (H)",
210 "cursor": "url('images/tools/hand_down.png'), default", 210 "cursor": "url('images/tools/hand_down.png'), default",
211 "lastInGroup": false, 211 "lastInGroup": false,
212 "container": false, 212 "container": false,