aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnanya Sen2012-06-19 11:00:49 -0700
committerAnanya Sen2012-06-19 11:00:49 -0700
commitf1d8401aeb84e0eb0680caf72878dae26fd78a37 (patch)
tree31771ccaf3d1e2ddf01fa9605438d20be0d155d7
parent9ea2610cec6569e7b7d5268b6c65bbf94c4753e5 (diff)
parent483ad57efcd6475776f580c3af5b60e6deeaf781 (diff)
downloadninja-f1d8401aeb84e0eb0680caf72878dae26fd78a37.tar.gz
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
-rw-r--r--assets/canvas-runtime.js3456
-rw-r--r--assets/descriptor.json2
-rw-r--r--assets/images/CL13.pngbin0 -> 40537 bytes
-rw-r--r--assets/images/cloud10.pngbin0 -> 58580 bytes
-rw-r--r--assets/images/us_flag.pngbin0 -> 9946 bytes
-rwxr-xr-xassets/shaders/Basic.vert.glsl3
-rw-r--r--assets/shaders/BasicTex.frag.glsl19
-rw-r--r--assets/shaders/Cloud.frag.glsl23
-rw-r--r--assets/shaders/Cloud.vert.glsl51
-rw-r--r--assets/shaders/Deform.frag.glsl3
-rw-r--r--assets/shaders/Flag.frag.glsl20
-rw-r--r--assets/shaders/Flag.vert.glsl32
-rw-r--r--assets/shaders/Fly.frag.glsl5
-rw-r--r--assets/shaders/Julia.frag.glsl3
-rw-r--r--assets/shaders/Keleidoscope.frag.glsl8
-rw-r--r--assets/shaders/Mandel.frag.glsl9
-rw-r--r--assets/shaders/Pulse.frag.glsl12
-rw-r--r--assets/shaders/ReliefTunnel.frag.glsl7
-rw-r--r--assets/shaders/SquareTunnel.frag.glsl3
-rw-r--r--assets/shaders/Star.frag.glsl11
-rw-r--r--assets/shaders/Taper.vert.glsl2
-rw-r--r--assets/shaders/Tunnel.frag.glsl3
-rw-r--r--assets/shaders/Twist.frag.glsl7
-rw-r--r--assets/shaders/TwistVert.frag.glsl1
-rw-r--r--assets/shaders/TwistVert.vert.glsl11
-rw-r--r--assets/shaders/Water2.frag.glsl30
-rw-r--r--assets/shaders/ZInvert.frag.glsl7
-rw-r--r--assets/shaders/plasma.frag.glsl16
-rw-r--r--assets/shaders/radialBlur.frag.glsl5
-rwxr-xr-xassets/shaders/test_fshader.glsl2
-rw-r--r--js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js33
-rwxr-xr-xjs/components/SliderBase.js9
-rwxr-xr-xjs/components/colorbar.reel/colorbar.html4
-rwxr-xr-xjs/components/colorbar.reel/colorbar.js12
-rwxr-xr-xjs/components/colorwheel.reel/colorwheel.html14
-rwxr-xr-xjs/components/colorwheel.reel/colorwheel.js172
-rwxr-xr-xjs/components/combobox.reel/combobox.js6
-rw-r--r--js/components/controllers/tree-controller.js11
-rwxr-xr-xjs/components/gradientpicker.reel/gradientpicker.html33
-rwxr-xr-xjs/components/gradientpicker.reel/gradientpicker.js76
-rwxr-xr-xjs/components/hottext.reel/hottext.js13
-rwxr-xr-xjs/components/hottextunit.reel/hottextunit.js9
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.html2
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.js6
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.html2
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.js7
-rwxr-xr-xjs/components/layout/document-entry.reel/document-entry.js5
-rwxr-xr-xjs/components/layout/documents-tab.reel/documents-tab.js3
-rwxr-xr-xjs/components/layout/tool-button.reel/tool-button.html2
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.html5
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.js106
-rwxr-xr-xjs/components/layout/tools-properties.reel/tools-properties.html54
-rwxr-xr-xjs/components/layout/tools-properties.reel/tools-properties.js82
-rwxr-xr-xjs/components/menu/menu-entry.reel/menu-entry.html6
-rwxr-xr-xjs/components/menu/menu-entry.reel/menu-entry.js49
-rwxr-xr-xjs/components/menu/menu-item.reel/menu-item.js15
-rwxr-xr-xjs/components/menu/menu.reel/menu.html14
-rwxr-xr-xjs/components/popup.reel/popup.html8
-rwxr-xr-xjs/components/popup.reel/popup.js24
-rwxr-xr-xjs/components/radio.reel/radio.js21
-rwxr-xr-xjs/components/slider.reel/slider.js15
-rw-r--r--js/components/toolbar.reel/toolbar-button.js4
-rw-r--r--js/components/toolbar.reel/toolbar.js5
-rwxr-xr-xjs/components/tools-properties/brush-properties.reel/brush-properties.js40
-rwxr-xr-xjs/components/tools-properties/fill-properties.reel/fill-properties.js25
-rwxr-xr-xjs/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js65
-rwxr-xr-xjs/components/tools-properties/line-properties.reel/line-properties.js5
-rwxr-xr-xjs/components/tools-properties/object3d-properties.reel/object3d-properties.js11
-rwxr-xr-xjs/components/tools-properties/oval-properties.reel/oval-properties.js11
-rwxr-xr-xjs/components/tools-properties/pen-properties.reel/pen-properties.html4
-rwxr-xr-xjs/components/tools-properties/pen-properties.reel/pen-properties.js33
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.html1
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.js20
-rwxr-xr-xjs/components/tools-properties/selection-properties.reel/selection-properties.js86
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.html7
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.js71
-rwxr-xr-xjs/components/tools-properties/tag-properties.reel/tag-properties.js26
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.html18
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.js44
-rwxr-xr-xjs/components/tools-properties/zoom-properties.reel/zoom-properties.js12
-rw-r--r--js/components/treeview/ninja-branch.reel/ninja-branch.html2
-rw-r--r--js/components/treeview/ninja-branch.reel/ninja-branch.js33
-rw-r--r--js/components/treeview/ninja-leaf.reel/ninja-leaf.js7
-rw-r--r--js/components/treeview/treeview.reel/treeview.html2
-rw-r--r--js/components/treeview/treeview.reel/treeview.js39
-rwxr-xr-xjs/components/ui/color-chip.reel/color-chip.js5
-rwxr-xr-xjs/components/ui/file-input.reel/file-input.js10
-rwxr-xr-xjs/components/ui/icon-list-basic/icon.reel/icon.js12
-rwxr-xr-xjs/components/ui/icon-list-basic/iconsList.reel/iconsList.html22
-rwxr-xr-xjs/components/ui/icon-list-basic/iconsList.reel/iconsList.js4
-rwxr-xr-xjs/controllers/color-controller.js50
-rwxr-xr-xjs/controllers/elements/body-controller.js5
-rwxr-xr-xjs/controllers/elements/shapes-controller.js4
-rwxr-xr-xjs/controllers/selection-controller.js22
-rwxr-xr-xjs/data/pi/pi-data.js60
-rwxr-xr-xjs/document/document-html.js2
-rwxr-xr-xjs/document/mediators/template.js33
-rw-r--r--js/document/templates/app/main.js6
-rwxr-xr-xjs/document/views/design.js21
-rwxr-xr-xjs/helper-classes/3D/draw-utils.js18
-rw-r--r--js/helper-classes/RDGE/src/tools/compile-rdge-core.bat1
-rw-r--r--js/helper-classes/RDGE/src/tools/compile-rdge-core.sh1
-rw-r--r--js/io/system/ninjalibrary.json4
-rw-r--r--js/io/templates/descriptor.json7
-rwxr-xr-xjs/io/ui/file-picker/file-input-field.reel/file-input-field.js10
-rw-r--r--js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js80
-rwxr-xr-xjs/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js10
-rw-r--r--js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js40
-rwxr-xr-xjs/lib/drawing/world.js361
-rwxr-xr-xjs/lib/geom/brush-stroke.js70
-rwxr-xr-xjs/lib/geom/circle.js90
-rwxr-xr-xjs/lib/geom/geom-obj.js29
-rwxr-xr-xjs/lib/geom/line.js1
-rwxr-xr-xjs/lib/geom/rectangle.js105
-rw-r--r--js/lib/geom/shape-primitive.js130
-rwxr-xr-xjs/lib/geom/sub-path.js35
-rwxr-xr-xjs/lib/math/matrix.js9
-rwxr-xr-xjs/lib/rdge/materials/bump-metal-material.js170
-rw-r--r--js/lib/rdge/materials/cloud-material.js439
-rw-r--r--js/lib/rdge/materials/deform-material.js36
-rw-r--r--js/lib/rdge/materials/flag-material.js136
-rwxr-xr-xjs/lib/rdge/materials/flat-material.js99
-rw-r--r--js/lib/rdge/materials/fly-material.js38
-rw-r--r--js/lib/rdge/materials/julia-material.js49
-rw-r--r--js/lib/rdge/materials/keleidoscope-material.js52
-rwxr-xr-xjs/lib/rdge/materials/linear-gradient-material.js250
-rw-r--r--js/lib/rdge/materials/mandel-material.js46
-rwxr-xr-xjs/lib/rdge/materials/material.js306
-rw-r--r--js/lib/rdge/materials/plasma-material.js61
-rw-r--r--js/lib/rdge/materials/pulse-material.js185
-rw-r--r--js/lib/rdge/materials/radial-blur-material.js124
-rwxr-xr-xjs/lib/rdge/materials/radial-gradient-material.js277
-rw-r--r--js/lib/rdge/materials/relief-tunnel-material.js49
-rw-r--r--js/lib/rdge/materials/square-tunnel-material.js45
-rw-r--r--js/lib/rdge/materials/star-material.js53
-rw-r--r--js/lib/rdge/materials/taper-material.js131