aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-26
|\
| * Fix play marker appearing in wrong position when clicking on a tweenJonathan Duran2012-06-26
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Move time marker when clicking anywhere in timeline tracksJonathan Duran2012-06-26
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-06-26
| |\
| | * Timeline: bug fix: command-click now works for multi selecting layers on ↵Jon Reid2012-06-25
| | | | | | | | | | | | Macs. Also disabled control-click on macs.
| | * Timeline: Bug fix IKNINJA-1812, "Easing option switches to NoneJon Reid2012-06-25
| | | | | | | | | | | | automatically when moving a keyframe"
| | * Timeline: CSS fixes.Jon Reid2012-06-25
| | |
| * | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-26
| |\ \
| | * \ Merge pull request #326 from mqg734/ReclaimStagePaddingValerio Virgillito2012-06-25
| | |\ \ | | | | | | | | | | Reclaim negative padding when moving items back into positive direction.
| | | * | When reclaiming stage's negative scroll padding, we need to use the ↵Nivesh Rajbhandari2012-06-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | template's left and top padding as the minimum values when switching between documents. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | Reclaim negative padding when moving items back into positive direction.Nivesh Rajbhandari2012-06-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that we only do this on elementChange and not elementChanging since it is a potentially slow routine. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | Merge pull request #333 from mencio/IKNINJA-1394Valerio Virgillito2012-06-25
| | |\ \ \ | | | | | | | | | | | | Fixing our textfield component to support binding. Fix for IKNINJA-1394
| | | * | | Fixing our textfield component to support binding. Fix for IKNINJA-1394Valerio Virgillito2012-06-22
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | Merge pull request #332 from mqg734/ViewPortHackValerio Virgillito2012-06-25
| | |\ \ \ \ | | | | | | | | | | | | | | Make stage transparent when rotating/zooming templates and draw an outline around the user's root instead.
| | | * | | | Make stage transparent when rotating/zooming templates and draw an outline ↵Nivesh Rajbhandari2012-06-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | around the user's root instead. Also, fixed the background color setting on banner and animation templates' "body." Stage outline draws using drawGridLines code so it can show intersection with element planes. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | Merge pull request #334 from joseeight/FileIOValerio Virgillito2012-06-25
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Modifying HTML template
| | | * | | | | Support for browser escaped file paths (CSS)Jose Antonio Marquez2012-06-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes an issue with files located in folder with names/paths that the browser escapes, hence, caused a bug with the path passed to the cloud simulator and files not to be found. This does not require testing to merge. The fix is simple, addresses folder paths with spaces and such characters in which CSS files consumed by the HTML we open in design view.
| | | * | | | | Adding soft resetJose Antonio Marquez2012-06-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding a soft reset to the HTML file we create, this eliminates the margin/padding added to the page by browsers, and better illustrates what the user sees in Ninja.
| | | * | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-06-22
| | | |\| | | |
| | | * | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-06-22
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-06-21
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-06-21
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-06-20
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-06-20
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-06-19
| | | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-06-15
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-06-15
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #330 from ericmueller/MaterialBugFixesValerio Virgillito2012-06-25
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | fixed a small startup issue with the RDGE library.
| | | * | | | | | | | | | | | | fixed a small startup issue with the RDGE library.hwc4872012-06-22
| | | | |_|_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | | Timeline Bug fixesJonathan Duran2012-06-26
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix keyframe selection updating stage for sub props. Fix tween 0 for sub props on re-open. Fix repetition mismatch for styles and position tracks. Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-06-25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Resolution: Use both.
| | * | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-25
| | |\| | | | | | | | | | | |
| | | * | | | | | | | | | | | Merge pull request #331 from mencio/picasa-fixValerio Virgillito2012-06-22
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | fixing the size of the picasa images
| | | | * | | | | | | | | | | fixing the size of the picasa imagesValerio Virgillito2012-06-22
| | | | | |_|_|_|_|_|_|_|/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | | | | | | | | | | Merge pull request #324 from mqg734/StageGuidesValerio Virgillito2012-06-22
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | | Draw stage left and top references lines. Also fixed IKNinja-1720.
| | | | * | | | | | | | | | Display "(0, 0)" where the origin is.Nivesh Rajbhandari2012-06-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | | * | | | | | | | | | Have to guard against cases when stage lines are parallel to the canvas and ↵Nivesh Rajbhandari2012-06-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the line intersection routine returns null. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | | * | | | | | | | | | IKNINJA-1720 - Object in a document erases 3D grid in other document when ↵Nivesh Rajbhandari2012-06-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |