aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Collapse)AuthorAge
...
| * | | | | | Refactoring PropertyTrack.js & Span.jsKruti Shah2012-07-03
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * / / / / Fix re-open 3D tweens correctlyJonathan Duran2012-07-03
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | Fix performance bug when moving between nested levelsJonathan Duran2012-07-02
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-07-02
| |\ \ \ \
| | * | | | Timeline: Bug fix: Unable to reselect a layer with control-click that wasJon Reid2012-06-29
| | | | | | | | | | | | | | | | | | | | | | | | previously just deselected with control-click. (Yes, that's a weird one.)
| | * | | | Timeline: Bug fix: IKNINJA-1857, "Using keyboard shortcut for chrome-previewJon Reid2012-06-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | causes each layer in the timeline to remain selected even when clicking on another layer."
| * | | | | Fix 3d rotate tweens not showing upJonathan Duran2012-07-02
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | select keyframe when first createdJonathan Duran2012-07-02
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-29
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-28
| |\ \ \ \ \
| | * | | | | clean upJonathan Duran2012-06-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-06-28
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Used Theirs, doesn't matter, code block is in commented-out section.
| | * | | | | | Timeline: Better deselection of tweens when selecting/deselecting layers.Jon Reid2012-06-28
| | | | | | | |
| * | | | | | | Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-krutiKruti Shah2012-06-28
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| * | | | | | | Bug Fix : Hot text updates with keyframe selectionKruti Shah2012-06-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | | | | | | CSS Panel - Fix updating when media changes, sheets are deleted.Eric Guzman2012-07-20
| | | | | | | |
* | | | | | | | Style Sheets - Show dirty marker when editing media attributeEric Guzman2012-07-18
| | | | | | | |
* | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja into fixes_7.1Eric Guzman2012-07-18
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Fix: IKNINJA-1935 - Chips handling alpha 0 valuesJose Antonio Marquez2012-07-17
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Fixed an issue where alpha value was not checked for value and was evaluated in an if statement causing false to trigger, although it had a value. Oversight, this checked allow setting/getting 0 alpha value from chip and fixes issues with the gradient stops not handling 0 alpha.
* | | | | | | CSS Panel - Handle media attribute changesEric Guzman2012-07-17
| | | | | | |
* | | | | | | Styles Controller - Re-add dirty event. Add data- attribute to keep created ↵Eric Guzman2012-07-17
|/ / / / / / | | | | | | | | | | | | | | | | | | stylesheets.
* | | | | | Removed the shaders that we do not have rights to.hwc4872012-07-10
| | | | | |
* | | | | | fixed incorrect capitalization for DOCTYPE htmlJohn Mayhew2012-07-09
| | | | | |
* | | | | | Normalize HTML DOCTYPEKris Kowal2012-07-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was lower-case. Now upper-case. Also fixed BOMs, trailing white-space, DOS line terminators. Did not expand tabs to spaces.
* | | | | | BSD LicenseKris Kowal2012-07-09
| | | | | |
* | | | | | Merge branch 'normalize' of https://github.com/kriskowal/ninja-internalValerio Virgillito2012-07-09
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/gradientpicker.reel/gradientpicker.js js/components/tools-properties/text-properties.reel/text-properties.js js/document/views/base.js js/document/views/design.js js/helper-classes/3D/StageLine.js js/helper-classes/3D/draw-utils.js js/lib/drawing/world.js js/lib/geom/circle.js js/lib/geom/line.js js/lib/geom/rectangle.js js/lib/geom/shape-primitive.js js/lib/rdge/materials/bump-metal-material.js js/lib/rdge/materials/flag-material.js js/lib/rdge/materials/fly-material.js js/lib/rdge/materials/julia-material.js js/lib/rdge/materials/keleidoscope-material.js js/lib/rdge/materials/mandel-material.js js/lib/rdge/materials/material.js js/lib/rdge/materials/plasma-material.js js/lib/rdge/materials/pulse-material.js js/lib/rdge/materials/radial-gradient-material.js js/lib/rdge/materials/taper-material.js js/lib/rdge/materials/twist-vert-material.js js/lib/rdge/materials/water-material.js js/panels/Materials/materials-library-panel.reel/materials-library-panel.html js/panels/Materials/materials-library-panel.reel/materials-library-panel.js js/panels/Materials/materials-popup.reel/materials-popup.html js/panels/Materials/materials-popup.reel/materials-popup.js js/tools/LineTool.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | Normalize HTML doctypeKris Kowal2012-07-06
| | | | | | |
| * | | | | | Remove byte order markers (BOM)Kris Kowal2012-07-06
| | | | | | |
| * | | | | | Remove trailing spacesKris Kowal2012-07-06
| | | | | | |
| * | | | | | Remove trailing spacesKris Kowal2012-07-06
| | | | | | |
| * | | | | | Expand tabsKris Kowal2012-07-06
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'refs/heads/ninja-internal' into MaterialsUINivesh Rajbhandari2012-07-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | | Update copyright boilerplateKris Kowal2012-07-06
| | |_|_|/ | |/| | |
* | | | | PI, drawing and editing fixes for shapes and materials.Nivesh Rajbhandari2012-07-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IKNinja-1841 - Cannot change webgl shape with LinearGradient and RadialGradient to solid color. IKNINJA-1851 - Cannot draw webgl shapes with Linear/RadialGradient material. IKNINJA-1864 - PI doesn't update the color of shape if WebGL material switches to Flat. IKNINJA-1886 - Gradient edits not applied to WebGL Stage object. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | Merge branch 'refs/heads/ninja-internal' into MaterialsUINivesh Rajbhandari2012-07-02
|\| | | |
| * | | | Merge pull request #358 from jreid01/timeline-prValerio Virgillito2012-06-28
| |\ \ \ \ | | | | | | | | | | | | Timeline: Fix for deselect bug.
| | * | | | Timeline: Better deselection of tweens when selecting/deselecting layers.Jon Reid2012-06-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Resolved: use mine (doesn't matter, affected code block is in commented out section)
| * | | | | Merge pull request #361 from ericguzman/PresetsUpdate_6_28Valerio Virgillito2012-06-28
| |\ \ \ \ \ | | | | | | | | | | | | | | Presets/CSS Panel - Update css panel with preset class.
| | * | | | | Presets/CSS Panel - Update css panel with preset class.Eric Guzman2012-06-28
| | |/ / / /
| * | | | | Merge pull request #354 from mencio/IKNINJA-1829Valerio Virgillito2012-06-28
| |\ \ \ \ \ | | |/ / / / | |/| | | | Fixing the button for the shape pi
| | * | | | removing some commentsValerio Virgillito2012-06-28
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | Fixing the button for the shape piValerio Virgillito2012-06-28
| | | |/ / | | |/| |