aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-23 17:05:43 -0800
committerValerio Virgillito2012-02-23 17:05:43 -0800
commitafc53c6f553c97ab778154154aa2b7a146cb5fef (patch)
tree66b5ec886a49894feda44ccf8b5233ef39a46536
parent8974ecd564563a991ff96f9cb6d47da172174242 (diff)
parentdb2fd02a1b0e909bb536fa63cefd2144f4642ead (diff)
downloadninja-afc53c6f553c97ab778154154aa2b7a146cb5fef.tar.gz
Merge branch 'refs/heads/master' into local-storage-version
-rw-r--r--assets/shaders/Deform.frag.glsl29
-rw-r--r--assets/shaders/Flag.vert.glsl35
-rw-r--r--assets/shaders/Fly.frag.glsl23
-rw-r--r--assets/shaders/Julia.frag.glsl25
-rw-r--r--assets/shaders/Keleidoscope.frag.glsl25
-rw-r--r--assets/shaders/Mandel.frag.glsl55
-rw-r--r--assets/shaders/Pulse.frag.glsl22
-rw-r--r--assets/shaders/ReliefTunnel.frag.glsl35
-rw-r--r--assets/shaders/SquareTunnel.frag.glsl21
-rw-r--r--assets/shaders/Star.frag.glsl28
-rw-r--r--assets/shaders/Taper.frag.glsl17
-rw-r--r--assets/shaders/Taper.vert.glsl122
-rw-r--r--assets/shaders/Tunnel.frag.glsl23
-rw-r--r--assets/shaders/Twist.frag.glsl23
-rw-r--r--assets/shaders/TwistVert.frag.glsl32
-rw-r--r--assets/shaders/TwistVert.vert.glsl97
-rw-r--r--assets/shaders/Water.frag.glsl55
-rw-r--r--assets/shaders/Water2.frag.glsl66
-rw-r--r--assets/shaders/ZInvert.frag.glsl23
-rw-r--r--assets/shaders/plasma.frag.glsl32
-rw-r--r--assets/shaders/plasma.vert.glsl42
-rw-r--r--assets/shaders/radialBlur.frag.glsl47
-rwxr-xr-xcss/ninja.css108
-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-xjs/components/layout/bread-crumb.reel/bread-crumb.html2
-rwxr-xr-xjs/components/layout/subtool-button.reel/subtool-button.html7
-rwxr-xr-xjs/components/layout/subtool-button.reel/subtool-button.js10
-rwxr-xr-xjs/components/layout/tool-button.reel/tool-button.html7
-rwxr-xr-xjs/components/layout/tool-button.reel/tool-button.js21
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.html19
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.css16
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.html2
-rwxr-xr-xjs/components/ui/color-chip.reel/color-chip.js20
-rwxr-xr-xjs/components/ui/file-input.reel/file-input.html6
-rwxr-xr-xjs/components/ui/file-input.reel/file-input.js2
-rwxr-xr-xjs/components/ui/input-group.reel/input-group.css2
-rwxr-xr-xjs/components/ui/input-group.reel/input-group.html10
-rwxr-xr-xjs/components/ui/property-control.reel/property-control.html6
-rwxr-xr-xjs/components/ui/property-control.reel/property-control.js27
-rwxr-xr-xjs/controllers/color-controller.js14
-rwxr-xr-xjs/controllers/document-controller.js11
-rwxr-xr-xjs/controllers/elements/element-controller.js13
-rwxr-xr-xjs/controllers/elements/image-controller.js2
-rwxr-xr-xjs/controllers/elements/shapes-controller.js12
-rwxr-xr-xjs/controllers/elements/stage-controller.js2
-rwxr-xr-xjs/data/tools-data.js52
-rwxr-xr-xjs/helper-classes/3D/snap-manager.js1
-rwxr-xr-xjs/helper-classes/RDGE/GLCircle.js10
-rwxr-xr-xjs/helper-classes/RDGE/GLLine.js594
-rwxr-xr-xjs/helper-classes/RDGE/GLRectangle.js117
-rwxr-xr-xjs/helper-classes/RDGE/GLWorld.js45
-rw-r--r--js/helper-classes/RDGE/Materials/DeformMaterial.js133
-rw-r--r--js/helper-classes/RDGE/Materials/FlyMaterial.js133
-rw-r--r--js/helper-classes/RDGE/Materials/JuliaMaterial.js150
-rw-r--r--js/helper-classes/RDGE/Materials/KeleidoscopeMaterial.js149
-rw-r--r--js/helper-classes/RDGE/Materials/MandelMaterial.js151
-rw-r--r--js/helper-classes/RDGE/Materials/PlasmaMaterial.js134
-rw-r--r--js/helper-classes/RDGE/Materials/PulseMaterial.js263
-rw-r--r--js/helper-classes/RDGE/Materials/RadialBlurMaterial.js257
-rw-r--r--js/helper-classes/RDGE/Materials/ReliefTunnelMaterial.js133
-rw-r--r--js/helper-classes/RDGE/Materials/SquareTunnelMaterial.js133
-rw-r--r--js/helper-classes/RDGE/Materials/StarMaterial.js133
-rw-r--r--js/helper-classes/RDGE/Materials/TaperMaterial.js223
-rw-r--r--js/helper-classes/RDGE/Materials/TunnelMaterial.js133
-rw-r--r--js/helper-classes/RDGE/Materials/TwistMaterial.js149
-rw-r--r--js/helper-classes/RDGE/Materials/TwistVertMaterial.js248
-rw-r--r--js/helper-classes/RDGE/Materials/WaterMaterial.js133
-rw-r--r--js/helper-classes/RDGE/Materials/ZInvertMaterial.js133
-rwxr-xr-xjs/helper-classes/RDGE/MaterialsLibrary.js59
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/precompiled.js10
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/runtime.js14
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/scenegraphNodes.js8
-rw-r--r--js/helper-classes/RDGE/src/tools/compile-rdge-core.bat4
-rw-r--r--js/helper-classes/RDGE/src/tools/compile-rdge-core.sh3
-rw-r--r--js/helper-classes/RDGE/src/tools/compiler.jarbin0 -> 4927265 bytes
-rw-r--r--js/helper-classes/RDGE/src/tools/rdge-compiled.js454
-rwxr-xr-xjs/mediators/keyboard-mediator.js6
-rwxr-xr-xjs/ninja.reel/ninja.html3
-rwxr-xr-xjs/panels/Materials/Materials.xml2
-rwxr-xr-xjs/panels/Materials/materials-library-panel.reel/materials-library-panel.html8
-rwxr-xr-xjs/panels/Materials/materials-library-panel.reel/materials-library-panel.js121
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.css131
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.html18
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.js47
-rw-r--r--js/panels/Timeline/Keyframe.reel/Keyframe.html6
-rw-r--r--js/panels/Timeline/Keyframe.reel/Keyframe.js117
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.html2
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js27
-rw-r--r--js/panels/Timeline/Layer.reel/css/Layer.css117
-rw-r--r--js/panels/Timeline/Layer.reel/scss/Layer.scss17
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html24
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js15
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css13
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss21
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/scss/config.rb9
-rw-r--r--js/panels/Timeline/Span.reel/Span.html6
-rw-r--r--js/panels/Timeline/Span.reel/Span.js11
-rw-r--r--js/panels/Timeline/Style.reel/scss/Style.scss6
-rw-r--r--[-rwxr-xr-x]js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html70
-rw-r--r--[-rwxr-xr-x]js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js216
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css25
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html102
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js333
-rw-r--r--