aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
* | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #150 from ericguzman/PresetsPIValerio Virgillito2012-04-04
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | / / / / / / / / / / / / / / / / / / | | |_|_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-04-04
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Animation Presets - Only combine animations if pre-existing animations existEric Guzman2012-04-02
| * | | | | | | | | | | | | | | | | | | | | | Presets Controller - Remove unused method callEric Guzman2012-03-30
| * | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-03-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Presets - Remove style transition when transition doesn't start. Also added t...Eric Guzman2012-03-29
| | | | * | | | | | | | | | | | | | | | | | | removed unnecessary call to exportMaterials from init(). this call should not...John Mayhew2012-04-04
| | | | * | | | | | | | | | | | | | | | | | | Removed the dependence on an "assets" directory for the RDGE runtime. Now Nin...John Mayhew2012-04-03
| | | | * | | | | | | | | | | | | | | | | | | removed old unused import and export functions.John Mayhew2012-04-03
| | | | * | | | | | | | | | | | | | | | | | | Namespaced the canvas runtime file and updated all dependenciesJohn Mayhew2012-04-03
| | | | * | | | | | | | | | | | | | | | | | | updated the rdge compiled version and its runtime, incremented rdge library v...John Mayhew2012-04-03
| | | | * | | | | | | | | | | | | | | | | | | fixed remaining namespace bugs ensuring the use of the RDGE namespace everywh...John Mayhew2012-04-03
| | | | * | | | | | | | | | | | | | | | | | | removed unnecessary files from the RDGE build.John Mayhew2012-04-03
| | | | * | | | | | | | | | | | | | | | | | | added the Closure compiler to the gitignore file so we wouldn't track it in s...John Mayhew2012-04-03
| | | | * | | | | | | | | | | | | | | | | | | Made use of semicolons consistent and updated new files to use the new RDGE n...John Mayhew2012-04-03
| | | | * | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor...John Mayhew2012-04-02
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|/ / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Recompiled RDGE and put index.html back to loading the compiled version of RDGEJohn Mayhew2012-04-02
| | | | * | | | | | | | | | | | | | | | | | | Fixed compiler warningsJohn Mayhew2012-04-02
| | | | * | | | | | | | | | | | | | | | | | | -Namespaced all RDGE javascript.John Mayhew2012-04-02
| | | | | |_|_|_|_|_|_|/ / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | * Should not select any layer on element deleteJonathan Duran2012-04-04
| | | | | | | | | | | | | | | | | | | | | * Update timeline to work with new element removed eventJonathan Duran2012-04-04
| | | | | | | | | | | | | | | | | | | | | * Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-04
| | | | | | | | | | | | | | | | | | | | | |\ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Squashed commit of Preparing for the montage undo-manager: Architecture changesValerio Virgillito2012-04-04
| |_|_|_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | * Changing layer name should put dirty flag on docJonathan Duran2012-04-04
| | | | | | | | | | | | | | | | | | | | * define "that" var correctlyJonathan Duran2012-04-04
| | | | | | | | | | | | | | | | | | | | * Merge branch 'timeline-k' of github.com:ntfx47/ninja-internal into TimelineUberJonathan Duran2012-04-04
| | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | * Timeline: Saving layernameKruti Shah2012-04-04
| | | | | | | | | | | | | | | | | | | | | * Timeline: Initial implementation of timeline zoom.Jon Reid2012-04-03
| | | | | | | | | | | | | | | | | | | | | * TImeline : Bug Fix 1429 & The zoom tweendataKruti Shah2012-04-02
| | | | | | | | | | | | | | | | | | | | * | FIX IKNINJA-1309 Timeline:Master Layer animation span is gone when another ne...Jonathan Duran2012-04-03
| | | | | | | | | | | | | | | | | | | | * | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-04-03
| | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | * | Timeline: disable console logs in layer component.Jon Reid2012-04-03
| | | | | | | | | | | | | | | | | | | | * | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-04-03
| | | | | | | | | | | | | | | | | | | | |\| |
| | | | | | | | | | | | | | | | | | | | | * | Timeline: Bug fix: IKNINJA-1431, "Adding a new element to the stage with oneJon Reid2012-04-02
| | | | | | | | | | | | | | | | | | | | | * | Timeline: Autoscrolling when dragging a layer within a scrollable layerJon Reid2012-04-02
| | | | | | | | | | | | | | | | | | | | | * | Timeline: Move drag-and-drop helper deletion to draw routine. Bug fix:Jon Reid2012-03-30
| | | | | | | | | | | | | | | | | | | | | * | Timeline: Link layerDragEnd and layerDrop events to better handle end ofJon Reid2012-03-30
| | | | | | | | | | | | | | | | | | | | | * | Timeline: Bug fixes.Jon Reid2012-03-30
| | | | | | | | | | | | | | | | | | | | | |/
| | | | | | | | | | | | | | | | | | | | * | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-03
| | | | | | | | | | | | | | | | | | | | |\ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | / | | | | | | | | | | | | | | | | | | | | |/
* | | | | | | | | | | | | | | | | | | | | Merge pull request #148 from ananyasen/integration-candidateValerio Virgillito2012-04-01
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | |