aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-03-05
|\
| * Minor FixJose Antonio Marquez2012-03-05
* | Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-03-05
|\|
| * Fixed URL parsing issue on actual opened documentJose Antonio Marquez2012-03-05
* | Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-03-05
|\|
| * Resolved URL path issues in document and CSSJose Antonio Marquez2012-03-05
| * Setting up document level URL parsingJose Antonio Marquez2012-03-04
| * Improved CSS URL cleanedJose Antonio Marquez2012-03-04
| * Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-02
| |\
* | \ Merge branch 'refs/heads/Ninja-Internal' into FileIO-Build-CandidateJose Antonio Marquez2012-03-02
|\ \ \ | | |/ | |/|
| * | 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 branch 'refs/heads/NINJAmaster' into TimelineJonathan Duran2012-03-01
| | |\ \
| | * \ \ Merge branch 'Timeline-main' into Timeline-localJon Reid2012-03-01
| | |\ \ \
| | | * | | Set doc dirty flag when adding tweens or modifying animationsJonathan Duran2012-03-01
| | | * | | Update master track on duration change instead of tween add.Jonathan Duran2012-03-01
| | | * | | Timeline: Track Duration FixJonathan Duran2012-03-01
| | * | | | Timeline: efficiency improvements to collapser. Document switching.Jon Reid2012-03-01
| | * | | | Timeline: Merge. Set collapser heights.Jon Reid2012-03-01
| | * | | | Merge branch 'Timeline-main' into Timeline-newdocJon Reid2012-03-01
| | |\| | |
| | | * | | Merge branch 'refs/heads/NINJAmaster' into TimelineJonathan Duran2012-03-01
| | | |\ \ \
| | | * | | | Squashed commit of the following:Jonathan Duran2012-02-29
| | | * | | | Merge branch 'Timeline-b2-latest' of github.com:ntfx47/ninja-internal into Ti...Jonathan Duran2012-02-29
| | | |\ \ \ \
| | | | * | | | Timeline:Revert back to earlier codeKruti Shah2012-02-29
| | | | * | | | TImeline: CleanupKruti Shah2012-02-29
| | | | * | | | Timeline: Changed the variables names to resolve issues.And removed the alert.Kruti Shah2012-02-29
| | | | * | | | 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
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | * | | | | | | Timeline: document switching + new document.Jon Reid2012-02-29
| * | | | | | | | 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
| | | |_|_|_|_|/ / | | |/| | | | | |
* | | | | | | | | 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.Eric Guzman2012-03-02
| |/ / / / / /
* | | | | | | Fixing CSS URL issuesJose Antonio Marquez2012-03-02
* | | | | | | 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 numberJohn Mayhew2012-03-01
| |/ / / / / /
* | | | | | | Fixing IO RegExJose Antonio Marquez2012-03-02