aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-13 21:43:51 -0800
committerValerio Virgillito2012-02-13 21:43:51 -0800
commit081f17954c735fc8b946d72a25b0ee60d370ef9b (patch)
treede7b50f2d02365df897ef4356f953d3833c9cabd
parent47df0aff81c25334b129047bb227ea5015357eda (diff)
parent1d82f1a041612f32bbf6c9f20d9fb14e2d11fcc7 (diff)
downloadninja-081f17954c735fc8b946d72a25b0ee60d370ef9b.tar.gz
Merge branch 'refs/heads/master' into components
Conflicts: js/components/treeview/ninja-leaf.reel/ninja-leaf.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
-rw-r--r--assets/images/irredecentENV.pngbin103121 -> 0 bytes
-rw-r--r--assets/images/scales_normal.pngbin113789 -> 0 bytes
-rw-r--r--assets/images/stitchStroke.pngbin8054 -> 0 bytes
-rw-r--r--assets/shaders/Basic.vert.glsl2
-rw-r--r--credits.html2
-rw-r--r--css/ninja.css16
-rw-r--r--index.html77
-rw-r--r--js/components/button.reel/button.js2
-rw-r--r--js/components/colorwheel.reel/compass_app_log.txt3
-rw-r--r--js/components/editable.reel/editable.js250
-rw-r--r--js/components/hintable.reel/hintable.js360
-rw-r--r--js/components/layout/bread-crumb.reel/bread-crumb.js108
-rw-r--r--js/components/package.json8
-rw-r--r--js/components/popup.reel/compass_app_log.txt48
-rw-r--r--js/components/tools-properties/text-properties.reel/text-properties.css30
-rw-r--r--js/components/tools-properties/text-properties.reel/text-properties.html326
-rw-r--r--js/components/tools-properties/text-properties.reel/text-properties.js236
-rw-r--r--js/components/treeview/ninja-branch.reel/ninja-branch.html3
-rw-r--r--js/components/treeview/ninja-branch.reel/ninja-branch.js1
-rw-r--r--js/components/treeview/ninja-leaf.reel/ninja-leaf.html2
-rw-r--r--js/components/treeview/ninja-leaf.reel/ninja-leaf.js42
-rw-r--r--js/components/ui/color-chip.reel/color-chip.js64
-rw-r--r--js/controllers/elements/shapes-controller.js29
-rw-r--r--js/controllers/elements/stage-controller.js4
-rw-r--r--js/controllers/main-menu-controller.js43
-rw-r--r--js/controllers/styles-controller.js80
-rw-r--r--js/data/menu-data.js41
-rw-r--r--js/data/pi/pi-data.js22
-rw-r--r--js/helper-classes/RDGE/GLCircle.js3
-rw-r--r--js/helper-classes/RDGE/GLLine.js70
-rw-r--r--js/helper-classes/RDGE/GLMaterial.js11
-rw-r--r--js/helper-classes/RDGE/GLRectangle.js162
-rw-r--r--js/helper-classes/RDGE/GLWorld.js75
-rw-r--r--js/helper-classes/RDGE/Materials/BrickMaterial.js231
-rw-r--r--js/helper-classes/RDGE/Materials/BumpMetalMaterial.js48
-rw-r--r--js/helper-classes/RDGE/Materials/FlatMaterial.js60
-rw-r--r--js/helper-classes/RDGE/Materials/IridescentScalesMaterial.js215
-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/LinearGradientMaterial.js148
-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.js237
-rw-r--r--js/helper-classes/RDGE/Materials/QuiltMaterial.js168
-rw-r--r--js/helper-classes/RDGE/Materials/RadialBlurMaterial.js244
-rw-r--r--js/helper-classes/RDGE/Materials/RadialGradientMaterial.js87
-rw-r--r--js/helper-classes/RDGE/Materials/StitchMaterial.js119
-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/UberMaterial.js56
-rw-r--r--js/helper-classes/RDGE/MaterialsLibrary.js38
-rw-r--r--js/helper-classes/RDGE/rdge-compiled.js57
-rw-r--r--js/helper-classes/RDGE/src/core/script/renderer.js22
-rw-r--r--js/helper-classes/Utils.js33
-rw-r--r--js/io/document/html-document.js3
-rw-r--r--js/lib/NJUtils.js21
-rw-r--r--js/mediators/element-mediator.js19
-rw-r--r--js/ninja.reel/ninja.html15
-rw-r--r--js/panels/CSSPanel/CSSPanel.js6
-rw-r--r--js/panels/Color/colorpanelbase.reel/colorpanelbase.js8
-rw-r--r--js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.css4
-rw-r--r--js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.scss4
-rw-r--r--js/panels/Materials/Materials.xml13
-rw-r--r--js/panels/Materials/materials-popup.reel/materials-popup.js14
-rw-r--r--js/panels/Resizer.js4
-rw-r--r--js/panels/Timeline/Collapser.js320
-rw-r--r--js/panels/Timeline/Keyframe.reel/Keyframe.html27
-rw-r--r--js/panels/Timeline/Keyframe.reel/Keyframe.js154
-rw-r--r--js/panels/Timeline/Keyframe.reel/css/Keyframe.css15
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.html168
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js626
-rw-r--r--js/panels/Timeline/Layer.reel/css/Layer.css322
-rw-r--r--js/panels/Timeline/Layer.reel/images/eye.pngbin0 -> 1331 bytes
-rw-r--r--js/panels/Timeline/Layer.reel/images/icon-collapsed.pngbin0 -> 325 bytes
-rw-r--r--js/panels/Timeline/Layer.reel/images/icon-eye.pngbin0 -> 550 bytes
-rw-r--r--js/panels/Timeline/Layer.reel/images/icon-lock.pngbin0 -> 475 bytes
-rw-r--r--js/panels/Timeline/Layer.reel/images/icon-minus.pngbin0 -> 161 bytes
-rw-r--r--js/panels/Timeline/Layer.reel/images/icon-open.pngbin0 -> 323 bytes
-rw-r--r--js/panels/Timeline/Layer.reel/images/icon-plus.pngbin0 -> 230 bytes
-rw-r--r--js/panels/Timeline/Layer.reel/images/lock_closed.pngbin0 -> 1208 bytes
-rw-r--r--js/panels/Timeline/Layer.reel/images/lock_open.pngbin0 -> 1186 bytes
-rw-r--r--js/panels/Timeline/Layer.reel/images/panelDisclosureIcon.png (renamed from assets/images/stitchStroke_N.png)bin2868 -> 3028 bytes
-rw-r--r--js/panels/Timeline/Layer.reel/scss/Layer.scss220
-rw-r--r--js/panels/Timeline/Layer.reel/scss/config.rb9
-rw-r--r--js/panels/Timeline/Span.reel/Span.html27
-rw-r--r--js/panels/Timeline/Span.reel/Span.js41
-rw-r--r--js/panels/Timeline/Span.reel/css/Span.css11
-rw-r--r--js/panels/Timeline/Style.reel/Style.html91
-rw-r--r--js/panels/Timeline/Style.reel/Style.js648
-rw-r--r--js/panels/Timeline/Style.reel/css/Style.css133
-rw-r--r--js/panels/Timeline/Style.reel/scss/Style.scss70
-rw-r--r--js/panels/Timeline/Style.reel/scss/config.rb9
-rw-r--r--js/panels/Timeline/TimelineController.js13
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.css6
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html242
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js1027
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css251
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/images/pause.pngbin0 -> 1076 bytes
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/images/play.pngbin0 -> 1190 bytes
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/images/play_next.pngbin0 -> 1185 bytes
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/images/play_prev.pngbin0 -> 1199 bytes
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/images/plus.pngbin0 -> 1133 bytes
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/images/timetick.jpgbin0 -> 737 bytes
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/images/trash.pngbin0 -> 1154 bytes
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html112
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js433
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/css/TimelineTrack.css117
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/images/gridline.jpgbin0 -> 724 bytes
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss65
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/scss/config.rb9
-rw-r--r--js/panels/Timeline/Track.reel/Track.html61
-rw-r--r--js/panels/Timeline/Track.reel/Track.js186
-rw-r--r--js/panels/Timeline/Track.reel/css/Track.css26
-rw-r--r--js/panels/Timeline/Track.reel/images/gridline.jpgbin0 -> 724 bytes
-rw-r--r--js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html26
-rw-r--r--js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js15
-rw-r--r--js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css5
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.html48
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js109
-rw-r--r--js/panels/Timeline/Tween.reel/css/Tween.css4
-rw-r--r--js/panels/properties/content.reel/content.js29
-rw-r--r--js/panels/properties/sections/custom.reel/custom.js51
-rwxr-xr-xjs/preloader/Preloader.js16
-rw-r--r--js/stage/stage.reel/stage.html12
-rw-r--r--js/stage/stage.reel/stage.js7
-rw-r--r--js/tools/TextTool.js97
-rw-r--r--license.html2
-rw-r--r--node_modules/labs/rich-text-editor.reel/rich-text-editor.css112
-rw-r--r--node_modules/labs/rich-text-editor.reel/rich-text-editor.html27
-rw-r--r--node_modules/labs/rich-text-editor.reel/rich-text-editor.js1716
-rw-r--r--node_modules/labs/rich-text-editor.reel/rich-text-resizer.js349
-rw-r--r--node_modules/labs/rich-text-editor.reel/rich-text-sanitizer.js132
-rw-r--r--node_modules/labs/rich-text-editor.reel/shortcut-manager.js237
-rw-r--r--scss/imports/scss/_Base.scss2
-rw-r--r--scss/imports/scss/_MainWindow.scss7
-rw-r--r--scss/imports/scss/_MontageOverrides.scss19
-rw-r--r--scss/imports/scss/_PanelUI.scss2
-rw-r--r--scss/imports/scss/_Stage.scss