aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Collapse)AuthorAge
...
* | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-RefactorCodeKruti Shah2012-07-03
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-07-03
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-07-03
| | |\ \ \
| | * | | | Timeline: Code refactor for Layer.jsJon Reid2012-07-03
| | | | | |
| | * | | | Timeline: Bug fix IKNINJA-1792, Cut pasting multiple selected objects throwsJon Reid2012-07-02
| | | | | | | | | | | | | | | | | | | | | | | | error on console.
| * | | | | Cleanup PropertyTrack.jsJonathan Duran2012-07-03
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | Cleanup Keyframe.jsJonathan Duran2012-07-03
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | Cleanup Tween.jsJonathan Duran2012-07-03
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | Cleanup TimelineTrack.jsJonathan Duran2012-07-03
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | Refactor Code + Bug Fix for the Colorchip disappear between breadcrumb ↵Kruti Shah2012-07-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | navigation Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | | | 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 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
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Fixing body PI background getterJose Antonio Marquez2012-06-28
| | | |
| * | | Fixing chips updating with alpha changeJose Antonio Marquez2012-06-28
| | | |
| * | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-28
| |\| |
| * | | Fixing body background bugJose Antonio Marquez2012-06-28
| | | |
| * | | Fixing init alpha issueJose Antonio Marquez2012-06-28
| | | |
| * | | Fixing color panel sliders updatingJose Antonio Marquez2012-06-28
| | | |
| * | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-28
| |\ \ \
| * | | | Fixing history bugJose Antonio Marquez2012-06-27
| | | | |
| * | | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-27
| |\ \ \ \
| * | | | | Fixing minor color history bugJose Antonio Marquez2012-06-27
| | | | | |
| * | | | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-27
| |\ \ \ \ \
| * | | | | | Adding a dismiss step when switching popupsJose Antonio Marquez2012-06-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed to allow for model to change during draw routines
| * | | | | | Fixing palette reference bugJose Antonio Marquez2012-06-27
| | | | | | |
| * | | | | | Adding no color support to popup in chipsJose Antonio Marquez2012-06-27
| | | | | | |
| * | | | | | Fixing alpha hottext input bugJose Antonio Marquez2012-06-27
| | | | | | |
| * | | | | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-27
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Fix to remember gradient from chip inputJose Antonio Marquez2012-06-26
| | | | | | |
| * | | | | | Fixing losing focus when switch wheels from popups (nested)Jose Antonio Marquez2012-06-26
| | | | | | |
| * | | | | | Fixing toggle modes losing valueJose Antonio Marquez2012-06-26
| | | | | | |
| * | | | | | Fixing hiding gradient popupsJose Antonio Marquez2012-06-26
| | | | | | |
| * | | | | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-26
| |\ \ \ \ \ \
| * | | | | | | Fixing gradient/solid color toggleJose Antonio Marquez2012-06-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also added a null value setter fix for no color hex
| * | | | | | | Adding support for no color init on hex input popupJose Antonio Marquez2012-06-26
| | | | | | | |
| * | | | | | | Fixing hex value syncing in popupsJose Antonio Marquez2012-06-26
| | | | | | | |