aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| | | * | | | | | Timeline: Changed the variables names to resolve issues.And removed the alert.Kruti Shah2012-02-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| | | * | | | | | Merge branch 'refs/heads/Timeline-jd' into Timeline-b2-latestKruti Shah2012-02-29
| | | |\ \ \ \ \ \
| * | | | | | | | | Timeline: Document switching and code restructuring.Jon Reid2012-03-01
| | | | | | | | | |
| * | | | | | | | | Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-newdocJon Reid2012-02-29
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
| * | | | | | | | | Timeline: document switching + new document.Jon Reid2012-02-29
| | | | | | | | | |
* | | | | | | | | | Merge pull request #92 from mqg734/WebGLFixesValerio Virgillito2012-03-02
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Selection Tool Fixes for elements flying off into space when they overlap
| * | | | | | | | | | Fixing flying off into space bug for translate tool too.Nivesh Rajbhandari2012-03-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | | | Don't draw transform handles if the stage is the target element.Nivesh Rajbhandari2012-03-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | | | Fix for jumping issue when moving items that have any 3d on them.Nivesh Rajbhandari2012-03-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can't translate 3d moves into 2d space due to perspective, so we must update the matrix3d values instead of the top-left values if items have 3d. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | | | Fix for elements flying off into space when moving elements that overlap.Nivesh Rajbhandari2012-03-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was happening because our hit record's element and the browser's element from point did not match. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | | | Re-fixing IKNinja-940 - Can't select objects when in side/top view.Nivesh Rajbhandari2012-03-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | | | Last-used material (instead of FlatMaterial) is applied to shape when ↵Nivesh Rajbhandari2012-02-29
| | |_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | turning on use WebGL checkbox in the PI. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | | | | | * | | Formatting fixesJose Antonio Marquez2012-03-02
| | | | | | | |/ /
| | | | | | | * | Minor logic fixes for URL resolution in CSSJose Antonio Marquez2012-03-02
| | | | | | | | |
| | | | | | | * | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-02
| | | | | | | |\ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
* | | | | | | | | Merge pull request #94 from ericguzman/PresetsPanelValerio Virgillito2012-03-02
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | Presets Panel - Fix single-click activation, and transition cut-off bug.
| * | | | | | | | Presets Panel - Fix single-click activation, and transition cut-off bug.Eric Guzman2012-03-02
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Use double-click as the activation event for transition presets. Also fixed the bug when applying a style preset before the transition preset, which disabled transitions after the first one.
| | | | | | * | Fixing CSS URL issuesJose Antonio Marquez2012-03-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only partially, supporting unquoted files under same root.
| | | | | | * | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-02
| | | | | | |\ \ | |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | Merge pull request #91 from mayhewinator/WorkingBranchmayhewinator2012-03-01
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | updated name in our manifest and incremented base build number
| * | | | | | | | updated name in our manifest and incremented base build numberJohn Mayhew2012-03-01
|/ / / / / / / /
| | | | | | * | Fixing IO RegExJose Antonio Marquez2012-03-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed parsing files to have correct URLs with RegEx, inner content of CSS files still needs to be fixed.
| | | | | | * | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-01
| | | | | | |\ \ | |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | Merge pull request #90 from mencio/stage-fixesValerio Virgillito2012-03-01
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Stage fixes
| * \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into stage-fixesValerio Virgillito2012-03-01
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Squashed commit of the workspace-bugsValerio Virgillito2012-03-01
| |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Panels fixes. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | Merge branch 'stage-fixes' of github.com:mencio/ninja-internal into stage-fixesValerio Virgillito2012-03-01
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/tools/TagTool.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | | revert removing the webkit transform from elements.Valerio Virgillito2012-03-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | revert removing the webkit transform from elements.Valerio Virgillito2012-03-01
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * / / / / / / stage and elements fixesValerio Virgillito2012-03-01
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Resizing the iframe container when resizing the stage - Removing 3d rules from elements when adding them - Adding a name property in the pi Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | | | * | Optimizing URL intercepting detectionJose Antonio Marquez2012-03-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified the way the webRequest maps to the file.
| | | | | * | Merge pull request #24 from ananyasen/FileIOJose Antonio Marquez Russo2012-02-29
| |_|_|_|/| | |/| | | | | | | | | | | | | undo/redo per document , codemirror 2.22 update
| | | | | * | Merge branch 'refs/heads/ninja-internal-master' into FileIOAnanya Sen2012-02-29
| | | | | |\ \