aboutsummaryrefslogtreecommitdiff
path: root/images
diff options
context:
space:
mode:
authorPushkar Joshi2012-02-24 12:08:49 -0800
committerPushkar Joshi2012-02-24 12:08:49 -0800
commit03ca7a5ed13c25faaa9100bb666e062fd15335e6 (patch)
treec51112223ceb9121cd595a60335eb2795215590f /images
parentfcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff)
parent053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff)
downloadninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz
Merge branch 'pentool' into brushtool
Conflicts: imports/codemirror/mode/scheme/scheme.js js/tools/BrushTool.js
Diffstat (limited to 'images')
-rwxr-xr-x[-rw-r--r--]images/SpriteSheets/NinjaSpriteSheet.pngbin12780 -> 12780 bytes
-rwxr-xr-x[-rw-r--r--]images/SpriteSheets/NinjaSpriteSheet.txt0
-rwxr-xr-x[-rw-r--r--]images/SpriteSheets/NinjaSpriteSheet2.pngbin19651 -> 19651 bytes
-rwxr-xr-x[-rw-r--r--]images/SpriteSheets/NinjaSpriteSheet2.psdbin199849 -> 199849 bytes
-rwxr-xr-x[-rw-r--r--]images/SpriteSheets/NinjaSpriteSheet2_5.pngbin17381 -> 17381 bytes
-rwxr-xr-x[-rw-r--r--]images/colorpanel/transparent.pngbin984 -> 984 bytes
-rwxr-xr-x[-rw-r--r--]images/cursors/Crosshair.pngbin345 -> 345 bytes
-rwxr-xr-x[-rw-r--r--]images/cursors/Translate_X.pngbin2897 -> 2897 bytes
-rwxr-xr-x[-rw-r--r--]images/cursors/Translate_Y.pngbin2890 -> 2890 bytes
-rwxr-xr-x[-rw-r--r--]images/cursors/Translate_Z.pngbin2894 -> 2894 bytes
-rwxr-xr-x[-rw-r--r--]images/cursors/fill.pngbin3583 -> 3583 bytes
-rwxr-xr-x[-rw-r--r--]images/cursors/ink.pngbin3352 -> 3352 bytes
-rwxr-xr-x[-rw-r--r--]images/cursors/ink_no.pngbin1688 -> 1688 bytes
-rwxr-xr-x[-rw-r--r--]images/cursors/nofill.pngbin3672 -> 3672 bytes
-rwxr-xr-x[-rw-r--r--]images/cursors/zoom.pngbin418 -> 418 bytes
-rwxr-xr-x[-rw-r--r--]images/cursors/zoom_minus.pngbin423 -> 423 bytes
-rwxr-xr-x[-rw-r--r--]images/documentsTab/close_button.gifbin139 -> 139 bytes
-rwxr-xr-x[-rw-r--r--]images/dropdown-bg.pngbin1130 -> 1130 bytes
-rwxr-xr-x[-rw-r--r--]images/favicon.pngbin564 -> 564 bytes
-rwxr-xr-x[-rw-r--r--]images/menu/arrow.pngbin2881 -> 2881 bytes
-rwxr-xr-x[-rw-r--r--]images/menu/checkmark.pngbin1083 -> 1083 bytes
-rwxr-xr-x[-rw-r--r--]images/optionsbar/checkmark.pngbin2999 -> 2999 bytes
-rwxr-xr-x[-rw-r--r--]images/optionsbar/edit_mode.pngbin3513 -> 3513 bytes
-rwxr-xr-x[-rw-r--r--]images/optionsbar/link.pngbin1295 -> 1295 bytes
-rwxr-xr-x[-rw-r--r--]images/optionsbar/live_mode.pngbin3455 -> 3455 bytes
-rwxr-xr-x[-rw-r--r--]images/optionsbar/options_selection.pngbin4004 -> 4004 bytes
-rwxr-xr-x[-rw-r--r--]images/optionsbar/rectangle/cornerRadius.pngbin2955 -> 2955 bytes
-rwxr-xr-x[-rw-r--r--]images/optionsbar/selection/AlignBottom.pngbin2852 -> 2852 bytes
-rwxr-xr-x[-rw-r--r--]images/optionsbar/selection/alignHcenter.pngbin2859 -> 2859 bytes
-rwxr-xr-x[-rw-r--r--]images/optionsbar/selection/alignLeft.pngbin2847 -> 2847 bytes
-rwxr-xr-x[-rw-r--r--]images/optionsbar/selection/alignRight.pngbin2851 -> 2851 bytes
-rwxr-xr-x[-rw-r--r--]images/optionsbar/selection/alignTop.pngbin2856 -> 2856 bytes
-rwxr-xr-x[-rw-r--r--]images/optionsbar/selection/alignVcenter.pngbin2864 -> 2864 bytes
-rwxr-xr-x[-rw-r--r--]images/optionsbar/selection/distCenter.pngbin2868 -> 2868 bytes
-rwxr-xr-x[-rw-r--r--]images/optionsbar/selection/distLeft.pngbin2856 -> 2856 bytes
-rwxr-xr-x[-rw-r--r--]images/optionsbar/selection/distRight.pngbin2851 -> 2851 bytes
-rwxr-xr-x[-rw-r--r--]images/optionsbar/selection/distTop.pngbin2856 -> 2856 bytes
-rwxr-xr-x[-rw-r--r--]images/optionsbar/selection/distVcenter.pngbin2868 -> 2868 bytes
-rwxr-xr-x[-rw-r--r--]images/optionsbar/unlinked.pngbin1581 -> 1581 bytes
-rwxr-xr-x[-rw-r--r--]images/optionsbar/zoom/zoom_minus.pngbin3117 -> 3117 bytes
-rwxr-xr-x[-rw-r--r--]images/optionsbar/zoom/zoom_plus.pngbin3128 -> 3128 bytes
-rwxr-xr-x[-rw-r--r--]images/panels/closeIcon.pngbin3052 -> 3052 bytes
-rwxr-xr-x[-rw-r--r--]images/panels/lock_icon.pngbin3452 -> 3452 bytes
-rwxr-xr-x[-rw-r--r--]images/panels/panelDisclosureIcon.pngbin3028 -> 3028 bytes
-rwxr-xr-x[-rw-r--r--]images/panels/plusIcon.pngbin3057 -> 3057 bytes
-rwxr-xr-x[-rw-r--r--]images/panels/project-panel/icon-button-audio.pngbin3569 -> 3569 bytes
-rwxr-xr-x[-rw-r--r--]images/panels/project-panel/icon-button-close.pngbin1088 -> 1088 bytes
-rwxr-xr-x[-rw-r--r--]images/panels/project-panel/icon-button-component.pngbin3716 -> 3716 bytes
-rwxr-xr-x[-rw-r--r--]images/panels/project-panel/icon-button-delete.pngbin1154 -> 1154 bytes
-rwxr-xr-x[-rw-r--r--]images/panels/project-panel/icon-button-flash.pngbin3376 -> 3376 bytes
-rwxr-xr-x[-rw-r--r--]images/panels/project-panel/icon-button-image.pngbin3550 -> 3550 bytes
-rwxr-xr-x[-rw-r--r--]images/panels/project-panel/icon-button-plus.pngbin1133 -> 1133 bytes
-rwxr-xr-x[-rw-r--r--]images/panels/project-panel/icon-button-project.pngbin4043 -> 4043 bytes
-rwxr-xr-x[-rw-r--r--]images/panels/project-panel/icon-button-script.pngbin3540 -> 3540 bytes
-rwxr-xr-x[-rw-r--r--]images/panels/project-panel/icon-button-search.pngbin1240 -> 1240 bytes
-rwxr-xr-x[-rw-r--r--]images/panels/project-panel/icon-button-selected.pngbin2991 -> 2991 bytes
-rwxr-xr-x[-rw-r--r--]images/panels/project-panel/icon-button-showall.pngbin3863 -> 3863 bytes
-rwxr-xr-x[-rw-r--r--]images/panels/project-panel/icon-button-tag.pngbin3498 -> 3498 bytes
-rwxr-xr-x[-rw-r--r--]images/panels/project-panel/icon-button-video.pngbin4097 -> 4097 bytes
-rwxr-xr-x[-rw-r--r--]images/panels/project-panel/icon-file-audio.pngbin1301 -> 1301 bytes
-rwxr-xr-x[-rw-r--r--]images/panels/project-panel/icon-file-flash.pngbin1262 -> 1262 bytes
-rwxr-xr-x[-rw-r--r--]images/panels/project-panel/icon-file-folderclosed.pngbin1300 -> 1300 bytes
-rwxr-xr-x[-rw-r--r--]images/panels/project-panel/icon-file-folderopen.pngbin1252 -> 1252 bytes
-rwxr-xr-x[-rw-r--r--]images/panels/project-panel/icon-file-image.pngbin1325 -> 1325 bytes
-rwxr-xr-x[-rw-r--r--]images/panels/project-panel/icon-file-misc.pngbin1397 -> 1397 bytes
-rwxr-xr-x[-rw-r--r--]images/panels/project-panel/icon-file-script.pngbin1286 -> 1286 bytes
-rwxr-xr-x[-rw-r--r--]images/panels/project-panel/icon-file-video.pngbin1420 -> 1420 bytes
-rwxr-xr-x[-rw-r--r--]images/panels/project-panel/icon-sort-arrow.pngbin2861 -> 2861 bytes
-rwxr-xr-x[-rw-r--r--]images/picker/css_file.pngbin3184 -> 3184 bytes
-rwxr-xr-x[-rw-r--r--]images/picker/doc_file.pngbin11398 -> 11398 bytes
-rwxr-xr-x[-rw-r--r--]images/picker/executable.pngbin7449 -> 7449 bytes
-rwxr-xr-x[-rw-r--r--]images/picker/file.pngbin27869 -> 27869 bytes
-rwxr-xr-x[-rw-r--r--]images/picker/folder.pngbin276680 -> 276680 bytes
-rwxr-xr-x[-rw-r--r--]images/picker/html_file.pngbin3677 -> 3677 bytes
-rwxr-xr-x[-rw-r--r--]images/picker/jpeg_file.pngbin3249 -> 3249 bytes
-rwxr-xr-x[-rw-r--r--]images/picker/js_file.pngbin3080 -> 3080 bytes
-rwxr-xr-x[-rw-r--r--]images/picker/pdf_file.pngbin2331 -> 2331 bytes
-rwxr-xr-x[-rw-r--r--]images/picker/php_file.pngbin5182 -> 5182 bytes
-rwxr-xr-x[-rw-r--r--]images/picker/png_file.pngbin23160 -> 23160 bytes
-rwxr-xr-x[-rw-r--r--]images/picker/rtf_file.pngbin7348 -> 7348 bytes
-rwxr-xr-x[-rw-r--r--]images/picker/txt_file.pngbin13898 -> 13898 bytes
-rwxr-xr-x[-rw-r--r--]images/picker/xml_file.pngbin7377 -> 7377 bytes
-rwxr-xr-x[-rw-r--r--]images/picker/zip_file.pngbin13316 -> 13316 bytes
-rwxr-xr-x[-rw-r--r--]images/scrollbars/scrollbar_resizer.pngbin274 -> 274 bytes
-rwxr-xr-x[-rw-r--r--]images/splitter/splitterIconDown.pngbin2809 -> 2809 bytes
-rwxr-xr-x[-rw-r--r--]images/splitter/splitterIconLeft.pngbin2840 -> 2840 bytes
-rwxr-xr-x[-rw-r--r--]images/splitter/splitterIconRight.pngbin2829 -> 2829 bytes
-rwxr-xr-x[-rw-r--r--]images/splitter/splitterIconUp.pngbin2820 -> 2820 bytes
-rwxr-xr-x[-rw-r--r--]images/temp/ruler-left.pngbin1638 -> 1638 bytes
-rwxr-xr-x[-rw-r--r--]images/temp/ruler-top.pngbin1685 -> 1685 bytes
-rwxr-xr-x[-rw-r--r--]images/timeline/eye.pngbin1331 -> 1331 bytes
-rwxr-xr-x[-rw-r--r--]images/timeline/lock_closed.pngbin1208 -> 1208 bytes
-rwxr-xr-x[-rw-r--r--]images/timeline/lock_open.pngbin1186 -> 1186 bytes
-rwxr-xr-x[-rw-r--r--]images/timeline/pause.pngbin1076 -> 1076 bytes
-rwxr-xr-x[-rw-r--r--]images/timeline/play.pngbin1190 -> 1190 bytes
-rwxr-xr-x[-rw-r--r--]images/timeline/play_next.pngbin1185 -> 1185 bytes
-rwxr-xr-x[-rw-r--r--]images/timeline/play_prev.pngbin1199 -> 1199 bytes
-rwxr-xr-x[-rw-r--r--]images/timeline/plus.pngbin1133 -> 1133 bytes
-rwxr-xr-x[-rw-r--r--]images/timeline/resize_handle.pngbin2874 -> 2874 bytes
-rwxr-xr-x[-rw-r--r--]images/timeline/resize_handle_over.pngbin2873 -> 2873 bytes
-rwxr-xr-x[-rw-r--r--]images/timeline/timeline.pngbin48543 -> 48543 bytes
-rwxr-xr-x[-rw-r--r--]images/timeline/trash.pngbin1154 -> 1154 bytes
-rwxr-xr-x[-rw-r--r--]images/tools/3D_rotate_obj_down.pngbin3204 -> 3204 bytes
-rwxr-xr-x[-rw-r--r--]images/tools/3D_rotate_obj_up.pngbin3189 -> 3189 bytes
-rwxr-xr-x[-rw-r--r--]images/tools/3D_rotate_stage_down.pngbin3043 -> 3043 bytes
-rwxr-xr-x[-rw-r--r--]images/tools/3D_rotate_stage_up.pngbin3036 -> 3036 bytes
-rwxr-xr-x[-rw-r--r--]images/tools/3D_translate_object_down.pngbin511 -> 511 bytes
-rwxr-xr-x[-rw-r--r--]images/tools/3D_translate_object_up.pngbin534 -> 534 bytes
-rwxr-xr-x[-rw-r--r--]images/tools/3D_translate_stage_down.pngbin359 -> 359 bytes
-rwxr-xr-x[-rw-r--r--]images/tools/3D_translate_stage_up.pngbin397 -> 397 bytes
-rw-r--r--images/tools/Tool-3DRotate.pngbin0 -> 1484 bytes
-rw-r--r--images/tools/Tool-3DRotateStage.pngbin0 -> 1477 bytes
-rw-r--r--images/tools/Tool-3DTranslate.pngbin0 -> 1474 bytes
-rw-r--r--images/tools/Tool-3DTranslateStage.pngbin0 -> 1454 bytes
-rw-r--r--images/tools/Tool-Erase.pngbin0 -> 1421 bytes
-rw-r--r--images/tools/Tool-EyeDropper.pngbin0 -> 1317 bytes
-rw-r--r--images/tools/Tool-Fill.pngbin0 -> 1394 bytes
-rw-r--r--images/tools/Tool-FillColor.pngbin0 -> 1111 bytes
-rw-r--r--images/tools/Tool-Line.pngbin0 -> 1117 bytes
-rw-r--r--images/tools/Tool-Oval.pngbin0 -> 1312 bytes
-rw-r--r--images/tools/Tool-PaintBrush.pngbin0 -> 1293 bytes
-rw-r--r--images/tools/Tool-Pan.pngbin0 -> 1473 bytes
-rw-r--r--images/tools/Tool-Pen.pngbin0 -> 1298 bytes
-rw-r--r--images/tools/Tool-Pencil.pngbin0 -> 1230 bytes
-rw-r--r--images/tools/Tool-Rectangle.pngbin0 -> 1179 bytes
-rw-r--r--images/tools/Tool-Selection.pngbin0 -> 1289 bytes
-rw-r--r--images/tools/Tool-Shape-14x14-Link.pngbin0 -> 1248 bytes
-rw-r--r--images/tools/Tool-Shape-14x14-Oval.pngbin0 -> 1227 bytes
-rw-r--r--images/tools/Tool-Shape-14x14-RoundedEdge-BotLeft.pngbin0 -> 1193 bytes
-rw-r--r--images/tools/Tool-Shape-14x14-RoundedEdge-BotRight.pngbin0 -> 1195 bytes
-rw-r--r--images/tools/Tool-Shape-14x14-RoundedEdge-UpLeft.pngbin0 -> 1187 bytes
-rw-r--r--images/tools/Tool-Shape-14x14-RoundedEdge-UpRight.pngbin0 -> 1200 bytes
-rw-r--r--images/tools/Tool-Shape-14x14-Square.pngbin0 -> 1034 bytes
-rw-r--r--images/tools/Tool-Shape-14x14-Unlink.pngbin0 -> 1193 bytes
-rw-r--r--images/tools/Tool-Shape-20x20-Link.pngbin0 -> 1345 bytes
-rw-r--r--images/tools/Tool-Shape-20x20-Unlink.pngbin0 -> 1307 bytes
-rw-r--r--images/tools/Tool-Square.pngbin0 -> 1033 bytes
-rw-r--r--images/tools/Tool-Stroke.pngbin0 -> 1117 bytes
-rw-r--r--images/tools/Tool-Subselect.pngbin0 -> 1227 bytes
-rw-r--r--images/tools/Tool-Tag.pngbin0 -> 1214 bytes
-rw-r--r--images/tools/Tool-Text-16x16-AlignCenter.pngbin0 -> 1045 bytes
-rw-r--r--images/tools/Tool-Text-16x16-AlignLeft.pngbin0 -> 1032 bytes
-rw-r--r--images/tools/Tool-Text-16x16-AlignRight.pngbin0 -> 1033 bytes
-rw-r--r--images/tools/Tool-Text-16x16-Bold.pngbin0 -> 1187 bytes
-rw-r--r--images/tools/Tool-Text-16x16-BulletedList.pngbin0 -> 1060 bytes
-rw-r--r--images/tools/Tool-Text-16x16-Font.pngbin0 -> 1191 bytes
-rw-r--r--images/tools/Tool-Text-16x16-FontColor.pngbin0 -> 1188 bytes
-rw-r--r--images/tools/Tool-Text-16x16-FontSize.pngbin0 -> 1247 bytes
-rw-r--r--images/tools/Tool-Text-16x16-Italics.pngbin0 -> 1130 bytes
-rw-r--r--images/tools/Tool-Text-16x16-NumberedList.pngbin0 -> 1144 bytes
-rw-r--r--images/tools/Tool-Text-16x16-StrikeThrough.pngbin0 -> 1174 bytes
-rw-r--r--images/tools/Tool-Text-16x16-URLLink.pngbin0 -> 1266 bytes
-rw-r--r--images/tools/Tool-Text-16x16-Underline.pngbin0 -> 1136 bytes
-rw-r--r--images/tools/Tool-Text.pngbin0 -> 1143 bytes
-rw-r--r--images/tools/Tool-Zoom.pngbin0 -> 1380 bytes
-rwxr-xr-x[-rw-r--r--]images/tools/brush_down.pngbin3130 -> 3130 bytes
-rwxr-xr-x[-rw-r--r--]images/tools/brush_up.pngbin3104 -> 3104 bytes
-rwxr-xr-x[-rw-r--r--]images/tools/bucket_down.pngbin3283 -> 3283 bytes
-rwxr-xr-x[-rw-r--r--]images/tools/bucket_up.pngbin3275 -> 3275 bytes
-rwxr-xr-x[-rw-r--r--]images/tools/eraser_down.pngbin3140 -> 3140 bytes
-rwxr-xr-x[-rw-r--r--]images/tools/eraser_up.pngbin3138 -> 3138 bytes
-rwxr-xr-x[-rw-r--r--]images/tools/eyedropper_down.pngbin2991 -> 2991 bytes
-rwxr-xr-x[-rw-r--r--]images/tools/eyedropper_up.pngbin3003 -> 3003 bytes
-rwxr-xr-x[-rw-r--r--]images/tools/hand_down.pngbin3289 -> 3289 bytes
-rwxr-xr-x[-rw-r--r--]images/tools/hand_up.pngbin3275 -> 3275 bytes
-rwxr-xr-x[-rw-r--r--]images/tools/inkbottle_down.pngbin3352 -> 3352 bytes
-rwxr-xr-x[-rw-r--r--]images/tools/line_down.pngbin3017 -> 3017 bytes
-rwxr-xr-x[-rw-r--r--]images/tools/line_up.pngbin2927 -> 2927 bytes
-rwxr-xr-x[-rw-r--r--]images/tools/oval_down.pngbin3087 -> 3087 bytes
-rwxr-xr-x[-rw-r--r--]images/tools/oval_up.pngbin3071 -> 3071 bytes
-rwxr-xr-x[-rw-r--r--]images/tools/pen_down.pngbin3062 -> 3062 bytes
-rwxr-xr-x[-rw-r--r--]images/tools/pen_up.pngbin3080 -> 3080 bytes
-rwxr-xr-x[-rw-r--r--]images/tools/pencil_down.pngbin3103 -> 3103 bytes
-rwxr-xr-x[-rw-r--r--]images/tools/pencil_up.pngbin3101 -> 3101 bytes
-rwxr-xr-x[-rw-r--r--]images/tools/rect_down.pngbin2884 -> 2884 bytes
-rwxr-xr-x[-rw-r--r--]images/tools/rect_up.pngbin2874 -> 2874 bytes
-rwxr-xr-x[-rw-r--r--]images/tools/selection_down.pngbin3132 -> 3132 bytes
-rwxr-xr-x[-rw-r--r--]images/tools/selection_up.pngbin3034 -> 3034 bytes
-rwxr-xr-x[-rw-r--r--]images/tools/sprite-toolbar-3d.pngbin2599 -> 2599 bytes
-rwxr-xr-x[-rw-r--r--]images/tools/sprite-toolbar-tag.pngbin6403 -> 6403 bytes
-rwxr-xr-x[-rw-r--r--]images/tools/subselect_down.pngbin3043 -> 3043 bytes
-rwxr-xr-x[-rw-r--r--]images/tools/subselect_up.pngbin3022 -> 3022 bytes
-rwxr-xr-x[-rw-r--r--]images/tools/tag_down.pngbin3040 -> 3040 bytes
-rwxr-xr-x[-rw-r--r--]images/tools/tag_up.pngbin3045 -> 3045 bytes
-rwxr-xr-x[-rw-r--r--]images/tools/text_down.pngbin3051 -> 3051 bytes
-rwxr-xr-x[-rw-r--r--]images/tools/text_up.pngbin3061 -> 3061 bytes
-rwxr-xr-x[-rw-r--r--]images/tools/trans_down.pngbin3045 -> 3045 bytes
-rwxr-xr-x[-rw-r--r--]images/tools/trans_up.pngbin3050 -> 3050 bytes
-rwxr-xr-x[-rw-r--r--]images/tools/zoom_down.pngbin3180 -> 3180 bytes
-rwxr-xr-x[-rw-r--r--]images/tools/zoom_up.pngbin3197 -> 3197 bytes
190 files changed, 0 insertions, 0 deletions
diff --git a/images/SpriteSheets/NinjaSpriteSheet.png b/images/SpriteSheets/NinjaSpriteSheet.png
index 0359ee5d..0359ee5d 100644..100755
--- a/images/SpriteSheets/NinjaSpriteSheet.png
+++ b/images/SpriteSheets/NinjaSpriteSheet.png
Binary files differ
diff --git a/images/SpriteSheets/NinjaSpriteSheet.txt b/images/SpriteSheets/NinjaSpriteSheet.txt
index 220a3bd3..220a3bd3 100644..100755
--- a/images/SpriteSheets/NinjaSpriteSheet.txt
+++ b/images/SpriteSheets/NinjaSpriteSheet.txt