aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
* Merge branch 'Timeline-uber' into timeline-serializedJon Reid2012-03-06
|\
| * Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-uberJon Reid2012-03-06
| |\
| | * Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-03-06
| | |\
| | | * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-03-06
| | | |\
| | | | * Merge branch 'refs/heads/master' into panelsValerio Virgillito2012-03-06
| | | | |\
| | | | * \ Merge branch 'refs/heads/master' into panelsValerio Virgillito2012-03-06
| | | | |\ \
| | | | * | | Adding drag and dropValerio Virgillito2012-03-05
| | | | * | | remove console logValerio Virgillito2012-03-05
| | | | * | | removing repetition from the panel container and using a static list of panels.Valerio Virgillito2012-03-05
| | | * | | | Squashed commit FileIO-Build-Candidate into MasterValerio Virgillito2012-03-06
| | | | |_|/ | | | |/| |
| | | * | | Fixing WebGL not available bugJose Antonio Marquez2012-03-06
| | | | |/ | | | |/|
| | | * | Squashed commit of preload-fix into MasterValerio Virgillito2012-03-06
| | | |/
| | | * Merge pull request #93 from imix23ways/TimelineValerio Virgillito2012-03-02
| | | |\
| | | | * Timeline Fix timing functionJonathan Duran2012-03-02
| | | | * Timeline: Fix for animation iteration countJonathan Duran2012-03-02
| | | * | Merge pull request #92 from mqg734/WebGLFixesValerio Virgillito2012-03-02
| | | |\ \
| | | | * | Fixing flying off into space bug for translate tool too.Nivesh Rajbhandari2012-03-02
| | | | * | Don't draw transform handles if the stage is the target element.Nivesh Rajbhandari2012-03-02
| | | | * | Fix for jumping issue when moving items that have any 3d on them.Nivesh Rajbhandari2012-03-02
| | | | * | Fix for elements flying off into space when moving elements that overlap.Nivesh Rajbhandari2012-03-01
| | | | * | Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-03-01
| | | | |\ \
| | | | * | | Fixed logic error when resizing with the top-left transform handles.Nivesh Rajbhandari2012-03-01
| | | | * | | Re-fixing IKNinja-940 - Can't select objects when in side/top view.Nivesh Rajbhandari2012-03-01
| | | | * | | Last-used material (instead of FlatMaterial) is applied to shape when turning...Nivesh Rajbhandari2012-02-29
| | | * | | | Presets Panel - Fix single-click activation, and transition cut-off bug.Eric Guzman2012-03-02
| | | | |/ / | | | |/| |
* | | | | | Timeline: Code cleanup. Fix bug with unfound property in serialization.Jon Reid2012-03-06
* | | | | | Merge branch 'Timeline-uber' into timeline-serializedJon Reid2012-03-06
|\| | | | |
| * | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-uberJon Reid2012-03-06
| |\ \ \ \ \
| | * | | | | Squashed commit of the following:Jonathan Duran2012-03-06
| | |/ / / /
| | * | | | Timeline Fix for layer/element selectionJonathan Duran2012-03-06
| * | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-uberJon Reid2012-03-02
| |\| | | |
* | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-serial...Jon Reid2012-03-02
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Support writing and reading of animation duration with millsecondsJonathan Duran2012-03-02
| * | | | | Timeline Fix timing functionJonathan Duran2012-03-02
| * | | | | Timeline: Fix for animation iteration countJonathan Duran2012-03-02
* | | | | | Timeline: Serialization of all Collapser componentsJon Reid2012-03-02
| |/ / / / |/| | | |
* | | | | Timeline: Fix TODOs for consolidating repetition objects.Jon Reid2012-03-02
|/ / / /
* | | | Remove console logJonathan Duran2012-03-02
* | | | CleanupJonathan Duran2012-03-02
* | | | Start looping over tweened properties genericallyJonathan Duran2012-03-02
* | | | Timeline bug fixes and cleanupJonathan Duran2012-03-01
* | | | Fix for selection change event handlerJonathan Duran2012-03-01
* | | | Merge branch 'refs/heads/Timeline-local' into TimelineUberJonathan Duran2012-03-01
|\ \ \ \ | |_|_|/ |/| | |
| * | | Timeline: Merge arrlayers and arrtracks into one object.Jon Reid2012-03-01
* | | | Merge branch 'refs/heads/NINJAmaster' into TimelineJonathan Duran2012-03-01
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge branch 'refs/heads/master' into stage-fixesValerio Virgillito2012-03-01
| |\ \
| | * | Squashed commit of the workspace-bugsValerio Virgillito2012-03-01
| | |/
| * | revert removing the webkit transform from elements.Valerio Virgillito2012-03-01
| * | stage and elements fixesValerio Virgillito2012-03-01
| |/
| * Merge pull request #88 from mqg734/ToolFixesValerio Virgillito2012-02-29
| |\