aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-26
|\
| * Merge pull request #337 from mqg734/PanToolScrollValerio Virgillito2012-06-26
| |\ | | | | | | Fix for Pan Tool not working when initially opening banner or animation template files.
| | * Fix for Pan Tool not working when initially opening banner or animation ↵Nivesh Rajbhandari2012-06-25
| | | | | | | | | | | | | | | | | | | | | | | | template files. Also, fixed a case where the "stage" would become transparent due to rounding issues. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Merge pull request #336 from mqg734/IKNinja_1688Valerio Virgillito2012-06-26
| |\ \ | | | | | | | | IKNinja-1688 - Creating a banner file after a code file causes body div to shift to the right and has different scroll bars.
| | * | IKNinja-1688 - Creating a banner file after a code file causes body div to ↵Nivesh Rajbhandari2012-06-25
| | |/ | | | | | | | | | | | | | | | shift to the right and has different scroll bars. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Merge pull request #335 from imix23ways/Timeline-bugfix1Valerio Virgillito2012-06-26
| |\ \ | | |/ | |/| Timeline fix - reopen Position and Size keyframe correctly
| | * Merge branch 'refs/heads/NINJAmaster' into Timeline-bugfix1Jonathan Duran2012-06-25
| | |\
| | * \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-25
| | |\ \
| | * | | Timeline Fix - reopen subprop keyframes for Position and Size correctlyJonathan Duran2012-06-25
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | Timeline fix - remove unneeded bindingJonathan Duran2012-06-22
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | Merge branch 'refs/heads/NINJAmaster' into timeline-deletekeyframefixJonathan Duran2012-06-22
| | |\ \ \
| | * | | | FIx - can't delete keyframesJonathan Duran2012-06-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | F5 now deletes the selected keyframe Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | | Fixing alpha memory bug on reopenJose Antonio Marquez2012-06-26
| | | | | | | | | | | | | | | | | | | | | | | | This is for the color chip
* | | | | | Merge pull request #38 from mqg734/Jose_ColorJose Antonio Marquez Russo2012-06-26
|\ \ \ \ \ \ | | | | | | | | | | | | | | Added pre-flight support for gradients in Tag, Rect, Oval, Line, Brush and Pen tools.
| * | | | | | Support pre-flighting of gradients for shape tools - rect, line, oval, brush ↵Nivesh Rajbhandari2012-06-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and pen. Note that WebGL shapes are not supported yet. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | Tag tool pre-flight should support gradients.Nivesh Rajbhandari2012-06-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | Partially fixing alpha issues on gradient stopsJose Antonio Marquez2012-06-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Still need to implement getting value on retrieve while opening
* | | | | | | Fixing alpha bugs on color chipsJose Antonio Marquez2012-06-25
|/ / / / / / | | | | | | | | | | | | | | | | | | Getting the right value of alpha on reopening color chips.
* | | | | | Adding default values to chipJose Antonio Marquez2012-06-25
| | | | | | | | | | | | | | | | | | | | | | | | This is a fallback is null and alpha is changed.
* | | | | | Fixing alpha slider for chip popupsJose Antonio Marquez2012-06-25
| | | | | |
* | | | | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-25
|\| | | | |
| * | | | | 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>
* | | | | Fixing alpha binding bugJose Antonio Marquez2012-06-25
| | | | | | | | | | | | | | | | | | | | The chip popup alpha sliders were binding to the panel when they shouldn't, so added a check.
* | | | | Fixing bottom hit test for popupJose Antonio Marquez2012-06-25
| | | | | | | | | | | | | | | | | | | | This address clicking outside (below) and closing the popup. The wrong value was being used.
* | | | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-25
|\| | | |
| * | | | 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>
* | | | | | Cleaning up eventsJose Antonio Marquez2012-06-25
| | | | | | | | | | | | | | | | | | | | | | | | Adding/Removing events when only needed by color popups.
* | | | | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-25
|\| | | | |
| * | | | | 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
| | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | |
* | | | | | | | | | | | | Color Popup Test CandidateJose Antonio Marquez2012-06-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |