diff options
| author | Jose Antonio Marquez | 2012-02-15 20:37:48 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-15 20:37:48 -0800 |
| commit | 89b5e793ea88ef235b54b6e1d1c379698d3e612b (patch) | |
| tree | 4d29118f35df77ca6b423119a4ff61694a442cbf | |
| parent | 9d2c2a80483415d7560b00cda5519153db23e241 (diff) | |
| parent | d366c0bd1af6471511217ed574083e15059519b5 (diff) | |
| download | ninja-89b5e793ea88ef235b54b6e1d1c379698d3e612b.tar.gz | |
Merge branch 'refs/heads/NinjaInternal' into Color
| -rw-r--r-- | .gitignore | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | assets/images/BoxB2_AO.png | bin | 86244 -> 86244 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | assets/images/BoxB2_DM.png | bin | 86470 -> 86470 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | assets/images/black.png | bin | 2791 -> 2791 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | assets/images/blue.png | bin | 2796 -> 2796 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | assets/images/cubelight.png | bin | 33154 -> 33154 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | assets/images/grey.png | bin | 935 -> 935 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | assets/images/material_paint.png | bin | 8450 -> 8450 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | assets/images/metal.png | bin | 696663 -> 696663 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | assets/images/normalMap.png | bin | 105161 -> 105161 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | assets/images/random_normal.png | bin | 9356 -> 9356 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | assets/images/rocky-diffuse.jpg | bin | 262144 -> 262144 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | assets/images/rocky-normal.jpg | bin | 262144 -> 262144 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | assets/images/rocky-spec.jpg | bin | 316095 -> 316095 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | assets/images/silver.png | bin | 46756 -> 46756 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | assets/images/white.png | bin | 2794 -> 2794 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | assets/shaders/Basic.vert.glsl | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | assets/shaders/linearGradient.frag.glsl | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | assets/shaders/linearGradient.vert.glsl | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | assets/shaders/test_fshader.glsl | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | assets/shaders/test_fshader_full.glsl | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | assets/shaders/test_vshader.glsl | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | assets/shaders/ub_fshader.glsl | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | assets/shaders/ub_vshader.glsl | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | css/ninja.css | 6 | ||||
| -rw-r--r-- | document-templates/files/template.css | 3 | ||||
| -rw-r--r-- | document-templates/files/template.html | 18 | ||||
| -rw-r--r-- | document-templates/files/template.js | 3 | ||||
| -rw-r--r-- | document-templates/files/template.xml | 1 | ||||
| -rw-r--r-- | document-templates/projects/montage/index.html | 16 | ||||
| -rw-r--r-- | document-templates/projects/montage/package.json | 8 | ||||
| -rwxr-xr-x[-rw-r--r--] | images/SpriteSheets/NinjaSpriteSheet.png | bin | 12780 -> 12780 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/SpriteSheets/NinjaSpriteSheet.txt | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | images/SpriteSheets/NinjaSpriteSheet2.png | bin | 19651 -> 19651 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/SpriteSheets/NinjaSpriteSheet2.psd | bin | 199849 -> 199849 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/SpriteSheets/NinjaSpriteSheet2_5.png | bin | 17381 -> 17381 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/colorpanel/transparent.png | bin | 984 -> 984 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/cursors/Crosshair.png | bin | 345 -> 345 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/cursors/Translate_X.png | bin | 2897 -> 2897 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/cursors/Translate_Y.png | bin | 2890 -> 2890 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/cursors/Translate_Z.png | bin | 2894 -> 2894 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/cursors/fill.png | bin | 3583 -> 3583 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/cursors/ink.png | bin | 3352 -> 3352 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/cursors/ink_no.png | bin | 1688 -> 1688 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/cursors/nofill.png | bin | 3672 -> 3672 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/cursors/zoom.png | bin | 418 -> 418 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/cursors/zoom_minus.png | bin | 423 -> 423 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/documentsTab/close_button.gif | bin | 139 -> 139 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/dropdown-bg.png | bin | 1130 -> 1130 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/favicon.png | bin | 564 -> 564 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/menu/arrow.png | bin | 2881 -> 2881 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/menu/checkmark.png | bin | 1083 -> 1083 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/optionsbar/checkmark.png | bin | 2999 -> 2999 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/optionsbar/edit_mode.png | bin | 3513 -> 3513 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/optionsbar/link.png | bin | 1295 -> 1295 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/optionsbar/live_mode.png | bin | 3455 -> 3455 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/optionsbar/options_selection.png | bin | 4004 -> 4004 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/optionsbar/rectangle/cornerRadius.png | bin | 2955 -> 2955 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/optionsbar/selection/AlignBottom.png | bin | 2852 -> 2852 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/optionsbar/selection/alignHcenter.png | bin | 2859 -> 2859 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/optionsbar/selection/alignLeft.png | bin | 2847 -> 2847 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/optionsbar/selection/alignRight.png | bin | 2851 -> 2851 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/optionsbar/selection/alignTop.png | bin | 2856 -> 2856 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/optionsbar/selection/alignVcenter.png | bin | 2864 -> 2864 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/optionsbar/selection/distCenter.png | bin | 2868 -> 2868 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/optionsbar/selection/distLeft.png | bin | 2856 -> 2856 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/optionsbar/selection/distRight.png | bin | 2851 -> 2851 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/optionsbar/selection/distTop.png | bin | 2856 -> 2856 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/optionsbar/selection/distVcenter.png | bin | 2868 -> 2868 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/optionsbar/unlinked.png | bin | 1581 -> 1581 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/optionsbar/zoom/zoom_minus.png | bin | 3117 -> 3117 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/optionsbar/zoom/zoom_plus.png | bin | 3128 -> 3128 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/panels/closeIcon.png | bin | 3052 -> 3052 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/panels/lock_icon.png | bin | 3452 -> 3452 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/panels/panelDisclosureIcon.png | bin | 3028 -> 3028 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/panels/plusIcon.png | bin | 3057 -> 3057 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/panels/project-panel/icon-button-audio.png | bin | 3569 -> 3569 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/panels/project-panel/icon-button-close.png | bin | 1088 -> 1088 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/panels/project-panel/icon-button-component.png | bin | 3716 -> 3716 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/panels/project-panel/icon-button-delete.png | bin | 1154 -> 1154 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/panels/project-panel/icon-button-flash.png | bin | 3376 -> 3376 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/panels/project-panel/icon-button-image.png | bin | 3550 -> 3550 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/panels/project-panel/icon-button-plus.png | bin | 1133 -> 1133 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/panels/project-panel/icon-button-project.png | bin | 4043 -> 4043 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/panels/project-panel/icon-button-script.png | bin | 3540 -> 3540 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/panels/project-panel/icon-button-search.png | bin | 1240 -> 1240 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/panels/project-panel/icon-button-selected.png | bin | 2991 -> 2991 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/panels/project-panel/icon-button-showall.png | bin | 3863 -> 3863 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/panels/project-panel/icon-button-tag.png | bin | 3498 -> 3498 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/panels/project-panel/icon-button-video.png | bin | 4097 -> 4097 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/panels/project-panel/icon-file-audio.png | bin | 1301 -> 1301 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/panels/project-panel/icon-file-flash.png | bin | 1262 -> 1262 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/panels/project-panel/icon-file-folderclosed.png | bin | 1300 -> 1300 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/panels/project-panel/icon-file-folderopen.png | bin | 1252 -> 1252 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/panels/project-panel/icon-file-image.png | bin | 1325 -> 1325 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/panels/project-panel/icon-file-misc.png | bin | 1397 -> 1397 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/panels/project-panel/icon-file-script.png | bin | 1286 -> 1286 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/panels/project-panel/icon-file-video.png | bin | 1420 -> 1420 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/panels/project-panel/icon-sort-arrow.png | bin | 2861 -> 2861 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/picker/css_file.png | bin | 3184 -> 3184 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/picker/doc_file.png | bin | 11398 -> 11398 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/picker/executable.png | bin | 7449 -> 7449 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/picker/file.png | bin | 27869 -> 27869 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/picker/folder.png | bin | 276680 -> 276680 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/picker/html_file.png | bin | 3677 -> 3677 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/picker/jpeg_file.png | bin | 3249 -> 3249 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/picker/js_file.png | bin | 3080 -> 3080 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/picker/pdf_file.png | bin | 2331 -> 2331 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/picker/php_file.png | bin | 5182 -> 5182 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/picker/png_file.png | bin | 23160 -> 23160 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/picker/rtf_file.png | bin | 7348 -> 7348 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/picker/txt_file.png | bin | 13898 -> 13898 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/picker/xml_file.png | bin | 7377 -> 7377 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/picker/zip_file.png | bin | 13316 -> 13316 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/scrollbars/scrollbar_resizer.png | bin | 274 -> 274 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/splitter/splitterIconDown.png | bin | 2809 -> 2809 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/splitter/splitterIconLeft.png | bin | 2840 -> 2840 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/splitter/splitterIconRight.png | bin | 2829 -> 2829 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/splitter/splitterIconUp.png | bin | 2820 -> 2820 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/temp/ruler-left.png | bin | 1638 -> 1638 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/temp/ruler-top.png | bin | 1685 -> 1685 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/timeline/eye.png | bin | 1331 -> 1331 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/timeline/lock_closed.png | bin | 1208 -> 1208 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/timeline/lock_open.png | bin | 1186 -> 1186 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/timeline/pause.png | bin | 1076 -> 1076 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/timeline/play.png | bin | 1190 -> 1190 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/timeline/play_next.png | bin | 1185 -> 1185 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/timeline/play_prev.png | bin | 1199 -> 1199 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/timeline/plus.png | bin | 1133 -> 1133 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/timeline/resize_handle.png | bin | 2874 -> 2874 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/timeline/resize_handle_over.png | bin | 2873 -> 2873 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/timeline/timeline.png | bin | 48543 -> 48543 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/timeline/trash.png | bin | 1154 -> 1154 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/tools/3D_rotate_obj_down.png | bin | 3204 -> 3204 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/tools/3D_rotate_obj_up.png | bin | 3189 -> 3189 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/tools/3D_rotate_stage_down.png | bin | 3043 -> 3043 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/tools/3D_rotate_stage_up.png | bin | 3036 -> 3036 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/tools/3D_translate_object_down.png | bin | 511 -> 511 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/tools/3D_translate_object_up.png | bin | 534 -> 534 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/tools/3D_translate_stage_down.png | bin | 359 -> 359 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/tools/3D_translate_stage_up.png | bin | 397 -> 397 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/tools/brush_down.png | bin | 3130 -> 3130 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/tools/brush_up.png | bin | 3104 -> 3104 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/tools/bucket_down.png | bin | 3283 -> 3283 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/tools/bucket_up.png | bin | 3275 -> 3275 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/tools/eraser_down.png | bin | 3140 -> 3140 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/tools/eraser_up.png | bin | 3138 -> 3138 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/tools/eyedropper_down.png | bin | 2991 -> 2991 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/tools/eyedropper_up.png | bin | 3003 -> 3003 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/tools/hand_down.png | bin | 3289 -> 3289 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/tools/hand_up.png | bin | 3275 -> 3275 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/tools/inkbottle_down.png | bin | 3352 -> 3352 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/tools/line_down.png | bin | 3017 -> 3017 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/tools/line_up.png | bin | 2927 -> 2927 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/tools/oval_down.png | bin | 3087 -> 3087 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/tools/oval_up.png | bin | 3071 -> 3071 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/tools/pen_down.png | bin | 3062 -> 3062 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/tools/pen_up.png | bin | 3080 -> 3080 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/tools/pencil_down.png | bin | 3103 -> 3103 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/tools/pencil_up.png | bin | 3101 -> 3101 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/tools/rect_down.png | bin | 2884 -> 2884 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/tools/rect_up.png | bin | 2874 -> 2874 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/tools/selection_down.png | bin | 3132 -> 3132 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/tools/selection_up.png | bin | 3034 -> 3034 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/tools/sprite-toolbar-3d.png | bin | 2599 -> 2599 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/tools/sprite-toolbar-tag.png | bin | 6403 -> 6403 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/tools/subselect_down.png | bin | 3043 -> 3043 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/tools/subselect_up.png | bin | 3022 -> 3022 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/tools/tag_down.png | bin | 3040 -> 3040 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/tools/tag_up.png | bin | 3045 -> 3045 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/tools/text_down.png | bin | 3051 -> 3051 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/tools/text_up.png | bin | 3061 -> 3061 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/tools/trans_down.png | bin | 3045 -> 3045 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/tools/trans_up.png | bin | 3050 -> 3050 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/tools/zoom_down.png | bin | 3180 -> 3180 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/tools/zoom_up.png | bin | 3197 -> 3197 bytes | |||
| -rwxr-xr-x | imports/codemirror/LICENSE | 19 | ||||
| -rwxr-xr-x | imports/codemirror/keymap/emacs.js | 29 | ||||
| -rwxr-xr-x | imports/codemirror/keymap/vim.js | 76 | ||||
| -rwxr-xr-x | imports/codemirror/lib/codemirror.css | 104 | ||||
| -rwxr-xr-x | imports/codemirror/lib/codemirror.js | 2761 | ||||
