aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-07-09 11:52:02 -0700
committerNivesh Rajbhandari2012-07-09 11:52:02 -0700
commitfebfdb18042d1c73ac58ee4e35c5f176428dee00 (patch)
tree516a29ca99d4aae0d5228223fff438c1a3c4e0d3
parentac27d538af33ca8d67d3d88729f49c05793afda7 (diff)
parentaedd14b18695d031f695d27dfbd94df5614495bb (diff)
downloadninja-febfdb18042d1c73ac58ee4e35c5f176428dee00.tar.gz
Merge branch 'refs/heads/ninja-internal' into MaterialsUI
Conflicts: js/panels/Materials/materials-library-panel.reel/materials-library-panel.css js/panels/Materials/materials-popup.reel/materials-popup.css Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
-rw-r--r--assets/canvas-runtime.js48
-rw-r--r--assets/shaders/Basic.frag.glsl30
-rwxr-xr-xassets/shaders/Basic.vert.glsl32
-rw-r--r--assets/shaders/BasicTex.frag.glsl30
-rw-r--r--assets/shaders/Cloud.frag.glsl32
-rw-r--r--assets/shaders/Cloud.vert.glsl32
-rw-r--r--assets/shaders/Flag.frag.glsl32
-rw-r--r--assets/shaders/Flag.vert.glsl30
-rw-r--r--assets/shaders/Taper.frag.glsl30
-rw-r--r--assets/shaders/Taper.vert.glsl32
-rw-r--r--assets/shaders/TwistVert.frag.glsl30
-rw-r--r--assets/shaders/TwistVert.vert.glsl32
-rwxr-xr-xassets/shaders/linearGradient.frag.glsl32
-rwxr-xr-xassets/shaders/linearGradient.vert.glsl30
-rw-r--r--assets/shaders/radialGradient.frag.glsl30
-rw-r--r--assets/shaders/radialGradient.vert.glsl32
-rwxr-xr-xassets/shaders/test_fshader.glsl32
-rwxr-xr-xassets/shaders/test_fshader_full.glsl30
-rwxr-xr-xassets/shaders/test_vshader.glsl30
-rwxr-xr-xassets/shaders/ub_fshader.glsl32
-rwxr-xr-xassets/shaders/ub_vshader.glsl30
-rw-r--r--credits.html34
-rwxr-xr-xcss/ninja.css30
-rwxr-xr-xindex.html32
-rw-r--r--js/clipboard/external-apps-clipboard-agent.js32
-rw-r--r--js/clipboard/internal-ops/component-clipboard-agent.js32
-rw-r--r--js/clipboard/internal-ops/css-clipboard-agent.js32
-rw-r--r--js/clipboard/internal-ops/elements-clipboard-agent.js32
-rw-r--r--js/clipboard/internal-ops/timeline-clipboard-agent.js32
-rw-r--r--js/clipboard/util.js32
-rw-r--r--js/code-editor/code-editor-wrapper.js32
-rw-r--r--js/code-editor/codemirror-ninja/lib/ninja-simple-hint.js30
-rw-r--r--js/code-editor/codemirror-ninja/theme/lesser-dark-ninja.css32
-rw-r--r--js/code-editor/codemirror-ninja/theme/rubyblue-ninja.css32
-rw-r--r--js/code-editor/codemirror-ninja/theme/xq-dark-ninja.css32
-rw-r--r--js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.css34
-rw-r--r--js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html34
-rw-r--r--js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js32
-rwxr-xr-xjs/components/SliderBase.js30
-rw-r--r--js/components/about-box.reel/about-box.css32
-rw-r--r--js/components/about-box.reel/about-box.html34
-rw-r--r--js/components/about-box.reel/about-box.js30
-rwxr-xr-xjs/components/colorbar.reel/colorbar.html32
-rwxr-xr-xjs/components/colorbar.reel/colorbar.js32
-rwxr-xr-xjs/components/colorbar.reel/css/colorbar.css30
-rwxr-xr-xjs/components/colorbar.reel/css/colorbar.scss34
-rwxr-xr-xjs/components/colorwheel.reel/colorwheel.html32
-rwxr-xr-xjs/components/colorwheel.reel/colorwheel.js32
-rwxr-xr-xjs/components/colorwheel.reel/css/colorwheel.css30
-rwxr-xr-xjs/components/colorwheel.reel/css/colorwheel.scss34
-rwxr-xr-xjs/components/combobox.reel/combobox.html34
-rwxr-xr-xjs/components/combobox.reel/combobox.js32
-rw-r--r--js/components/controllers/tree-controller.js32
-rw-r--r--js/components/converter/string-units-converter.js32
-rw-r--r--js/components/converter/string-value-converter.js32
-rwxr-xr-xjs/components/core/class-uuid.js32
-rw-r--r--js/components/editable.reel/editable.js34
-rw-r--r--js/components/focus-manager.reel/focus-manager.js32
-rwxr-xr-xjs/components/gradientpicker.reel/css/gradientpicker.css32
-rwxr-xr-xjs/components/gradientpicker.reel/css/gradientpicker.scss34
-rwxr-xr-xjs/components/gradientpicker.reel/gradientpicker.html32
-rwxr-xr-xjs/components/gradientpicker.reel/gradientpicker.js32
-rw-r--r--js/components/hintable.reel/hintable.js32
-rwxr-xr-xjs/components/hottext.reel/hottext.css34
-rwxr-xr-xjs/components/hottext.reel/hottext.html34
-rwxr-xr-xjs/components/hottext.reel/hottext.js30
-rwxr-xr-xjs/components/hottextunit.reel/hottextunit.css34
-rwxr-xr-xjs/components/hottextunit.reel/hottextunit.html34
-rwxr-xr-xjs/components/hottextunit.reel/hottextunit.js30
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.css32
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.html34
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.js32
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.css34
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.html34
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.js30
-rwxr-xr-xjs/components/layout/document-entry.reel/document-entry.css32
-rwxr-xr-xjs/components/layout/document-entry.reel/document-entry.html34
-rwxr-xr-xjs/components/layout/document-entry.reel/document-entry.js30
-rwxr-xr-xjs/components/layout/documents-tab.reel/documents-tab.css34
-rwxr-xr-xjs/components/layout/documents-tab.reel/documents-tab.html32
-rwxr-xr-xjs/components/layout/documents-tab.reel/documents-tab.js32
-rwxr-xr-xjs/components/layout/stage-mode.reel/stage-mode.css34
-rwxr-xr-xjs/components/layout/stage-mode.reel/stage-mode.html32
-rwxr-xr-xjs/components/layout/stage-mode.reel/stage-mode.js32
-rwxr-xr-xjs/components/layout/subtool-button.reel/subtool-button.css32
-rwxr-xr-xjs/components/layout/subtool-button.reel/subtool-button.html32
-rwxr-xr-xjs/components/layout/subtool-button.reel/subtool-button.js30
-rwxr-xr-xjs/components/layout/tool-button.reel/tool-button.css32
-rwxr-xr-xjs/components/layout/tool-button.reel/tool-button.html32
-rwxr-xr-xjs/components/layout/tool-button.reel/tool-button.js32
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.css34
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.html32
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.js32
-rwxr-xr-xjs/components/layout/tools-properties.reel/tools-properties.css34
-rwxr-xr-xjs/components/layout/tools-properties.reel/tools-properties.html32
-rwxr-xr-xjs/components/layout/tools-properties.reel/tools-properties.js32
-rwxr-xr-xjs/components/menu/menu-entry.reel/menu-entry.css32
-rwxr-xr-xjs/components/menu/menu-entry.reel/menu-entry.html32
-rwxr-xr-xjs/components/menu/menu-entry.reel/menu-entry.js32
-rwxr-xr-xjs/components/menu/menu-item.reel/menu-item.css34
-rwxr-xr-xjs/components/menu/menu-item.reel/menu-item.html32
-rwxr-xr-xjs/components/menu/menu-item.reel/menu-item.js32
-rwxr-xr-xjs/components/menu/menu.reel/menu.css34
-rwxr-xr-xjs/components/menu/menu.reel/menu.html32
-rwxr-xr-xjs/components/menu/menu.reel/menu.js32
-rwxr-xr-xjs/components/popup-manager.reel/popup-manager.html32
-rwxr-xr-xjs/components/popup-manager.reel/popup-manager.js32
-rwxr-xr-xjs/components/popup.reel/css/popup.css32
-rwxr-xr-xjs/components/popup.reel/css/popup.scss34
-rwxr-xr-xjs/components/popup.reel/popup.html34
-rwxr-xr-xjs/components/popup.reel/popup.js32
-rw-r--r--js/components/prompt.reel/prompt.js32
-rwxr-xr-xjs/components/radio.reel/radio.html34
-rwxr-xr-xjs/components/radio.reel/radio.js32
-rwxr-xr-xjs/components/slider.reel/slider.css34
-rwxr-xr-xjs/components/slider.reel/slider.html34
-rwxr-xr-xjs/components/slider.reel/slider.js30
-rwxr-xr-xjs/components/textfield.reel/textfield.html34
-rwxr-xr-xjs/components/textfield.reel/textfield.js32
-rw-r--r--js/components/toolbar.reel/toolbar-button.js34
-rw-r--r--js/components/toolbar.reel/toolbar.css34
-rw-r--r--js/components/toolbar.reel/toolbar.html32
-rw-r--r--js/components/toolbar.reel/toolbar.js34
-rwxr-xr-xjs/components/tools-properties/binding-properties.reel/binding-properties.css34
-rwxr-xr-xjs/components/tools-properties/binding-properties.reel/binding-properties.html34
-rwxr-xr-xjs/components/tools-properties/binding-properties.reel/binding-properties.js32
-rwxr-xr-xjs/components/tools-properties/brush-properties.reel/brush-properties.css32
-rwxr-xr-xjs/components/tools-properties/brush-properties.reel/brush-properties.html34
-rwxr-xr-xjs/components/tools-properties/brush-properties.reel/brush-properties.js30