aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Guzman2012-06-20 19:42:03 -0700
committerEric Guzman2012-06-20 19:42:03 -0700
commit3270aac4980c908f305fb53abadda5121ff6b9cb (patch)
tree6255aaab239fde71b1f4862dd70de7be62f48b85
parenta5d93daf6fdccbfee160d6a8ba08f6b6d4b9d7cc (diff)
parent87377c81da06abf6d656017859830a3ab2902f0e (diff)
downloadninja-3270aac4980c908f305fb53abadda5121ff6b9cb.tar.gz
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
-rw-r--r--assets/canvas-runtime.js3452
-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
-rwxr-xr-xcss/ninja.css2
-rw-r--r--js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html2
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.html2
-rwxr-xr-xjs/components/layout/document-entry.reel/document-entry.html2
-rwxr-xr-xjs/components/menu/menu-entry.reel/menu-entry.js30
-rwxr-xr-xjs/components/menu/menu-item.reel/menu-item.js9
-rwxr-xr-xjs/components/menu/menu.reel/menu.html3
-rwxr-xr-xjs/components/menu/menu.reel/menu.js9
-rw-r--r--js/components/toolbar.reel/toolbar-button.js2
-rwxr-xr-xjs/components/tools-properties/fill-properties.reel/fill-properties.html4
-rwxr-xr-xjs/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html10
-rwxr-xr-xjs/components/ui/label-checkbox.reel/label-checkbox.html2
-rwxr-xr-xjs/controllers/elements/shapes-controller.js4
-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
-rwxr-xr-xjs/io/ui/file-picker/file-input-field.reel/file-input-field.html2
-rwxr-xr-xjs/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html2
-rw-r--r--js/io/ui/save-as-dialog.reel/save-as-dialog.html2
-rwxr-xr-xjs/lib/drawing/world.js361
-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/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
-rw-r--r--js/lib/rdge/materials/tunnel-material.js45
-rw-r--r--js/lib/rdge/materials/twist-material.js58
-rw-r--r--js/lib/rdge/materials/twist-vert-material.js325
-rwxr-xr-xjs/lib/rdge/materials/uber-material.js129
-rw-r--r--js/lib/rdge/materials/water-material.js313
-rw-r--r--js/lib/rdge/materials/z-invert-material.js50
-rw-r--r--js/lib/rdge/texture.js332
-rwxr-xr-xjs/mediators/element-mediator.js1
-rwxr-xr-xjs/models/materials-model.js151
-rw-r--r--js/panels/Materials/materials-data.json99
-rwxr-xr-xjs/panels/Materials/materials-library-panel.reel/materials-library-panel.html13
-rwxr-xr-xjs/panels/Materials/materials-library-panel.reel/materials-library-panel.js13
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.js181
-rwxr-xr-xjs/panels/Panel.reel/Panel.html2
-rw-r--r--js/panels/binding/edit-binding-view.reel/edit-binding-view.html18
-rwxr-xr-xjs/panels/color/colorpopup-manager.js56
-rwxr-xr-xjs/panels/components-panel.reel/components-panel.js5
-rw-r--r--js/panels/css-panel/css-style.reel/css-style.html2
-rw-r--r--js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html2
-rw-r--r--js/panels/css-panel/style-sheet.reel/style-sheet.html6
-rwxr-xr-xjs/panels/properties.reel/properties.html6
-rwxr-xr-xjs/panels/properties.reel/sections/three-d-view.reel/three-d-view.html2
-rwxr-xr-xjs/stage/binding-view.reel/binding-hud.reel/binding-hud.js2
-rwxr-xr-xjs/stage/binding-view.reel/binding-view.js2
-rwxr-xr-xjs/tools/LineTool.js2
-rwxr-xr-xjs/tools/SelectionTool.js7
-rwxr-xr-xjs/tools/TagTool.js1
-rwxr-xr-xjs/tools/TextTool.js2
-rwxr-xr-xjs/tools/ToolBase.js2
-rwxr-xr-xjs/tools/drawing-tool-base.js11
-rwxr-xr-xjs/tools/modifier-tool-base.js17
-rw-r--r--node_modules/components-data/anchor.json2
-rw-r--r--node_modules/components-data/button.json2
-rw-r--r--node_modules/components-data/checkbox.json4
-rw-r--r--node_modules/components-data/image.json2
-rw-r--r--node_modules/components-data/number-input.json4
-rw-r--r--node_modules/components-data/radio-button.json4
-rw-r--r--node_modules/components-data/range-input.json4
-rw-r--r--node_modules/components-data/select.json4
-rw-r--r--node_modules/components-data/textarea.json2
-rw-r--r--node_modules/components-data/textfield.json4
-rw-r--r--node_modules/descriptor.json162
-rwxr-xr-xnode_modules/montage/CHANGES.md12
-rwxr-xr-xnode_modules/montage/core/core.js14
-rwxr-xr-xnode_modules/montage/core/deserializer.js64
-rwxr-xr-xnode_modules/montage/core/event/mutable-event.js61
-rwxr-xr-xnode_modules/montage/core/promise.js42
-rwxr-xr-xnode_modules/montage/data/blueprint.js1831
-rwxr-xr-xnode_modules/montage/data/change-context.js (renamed from node_modules/montage/data/context.js)17
-rwxr-xr-xnode_modules/montage/data/control-listener.js (renamed from node_modules/montage/data/controllistener.js)6
-rw-r--r--node_modules/montage/data/ldap-access/ldap-mapping.js61
-rwxr-xr-xnode_modules/montage/data/ldap-access/ldap-object-id.js (renamed from node_modules/montage/data/ldapaccess/ldapobjectid.js)8
-rw-r--r--[-rwxr-xr-x]node_modules/montage/data/ldap-access/ldap-selector-semantics.js (renamed from node_modules/montage/service/service.js)5
-rwxr-xr-xnode_modules/montage/data/ldap-access/ldap-store.js72
-rwxr-xr-xnode_modules/montage/data/ldapaccess/ldapblueprint.js135
-rwxr-xr-xnode_modules/montage/data/ldapaccess/ldapselectorevaluator.js24
-rwxr-xr-xnode_modules/montage/data/ldapaccess/ldapstore.js38
-rw-r--r--node_modules/montage/data/mapping.js632
-rw-r--r--node_modules/montage/data/nosql-access/nosql-mapping.js61
-rwxr-xr-xnode_modules/montage/data/nosql-access/nosql-object-id.js (renamed from node_modules/montage/data/nosqlaccess/nosqlobjectid.js)14
-rw-r--r--node_modules/montage/data/nosql-access/nosql-selector-semantics.js5
-rwxr-xr-xnode_modules/montage/data/nosql-access/nosql-store.js102