aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* fix compile error that was preventing non-gradient brush strokes from being ↵Pushkar Joshi2012-06-07
| | | | rendered in runtime
* change units for smoothing and calligraphic angle in PIPushkar Joshi2012-06-07
|
* Merge branch 'master' into brushtoolPushkar Joshi2012-06-07
|\
| * Merge pull request #276 from mqg734/DrawingToolsValerio Virgillito2012-06-06
| |\ | | | | | | Do not create any tags or shapes with width or height of 0.
| | * Do not create any tags or shapes with width or height of 0.Nivesh Rajbhandari2012-06-06
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Merge pull request #274 from ananyasen/bugfix-masterValerio Virgillito2012-06-06
| |\ \ | | | | | | | | Bugfix master
| | * | IKNINJA-1662 - fixed js error while resizing brewing in code viewAnanya Sen2012-06-05
| | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | Merge branch 'refs/heads/ninja-internal-master' into bugfix-masterAnanya Sen2012-06-05
| | |\ \
| | * | | IKNINJA-1645- fix - don't disable OK button on change of file typeAnanya Sen2012-06-05
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | Merge pull request #277 from joseeight/DocumentValerio Virgillito2012-06-06
| |\ \ \ \ | | | | | | | | | | | | Fixing referencing, also clean up
| | * | | | Cleaning more.Jose Antonio Marquez2012-06-06
| | | | | |
| | * | | | Cleaning upJose Antonio Marquez2012-06-06
| | | |_|/ | | |/| | | | | | | | | | | | Removed reference of model in design view, clean up slightly, need to implement binding later.
| * | | | Merge pull request #272 from pushkarjoshi/pentoolValerio Virgillito2012-06-06
| |\ \ \ \ | | |/ / / | |/| | | Pentool
| * | | | Merge pull request #273 from mqg734/TransformToolValerio Virgillito2012-06-05
| |\ \ \ \ | | |_|_|/ | |/| | | Free Transform tool's handle should stop when it reaches the other end.
| | * | | Free Transform tool's handle should stop when it reaches the other end.Nivesh Rajbhandari2012-06-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IKNINJA-1335 - Free Transform tool: When one of the handles reaches the other end, the tool should stop. IKNINJA-1261 - [WebGL] [Shape] [Selection] Material shows in the middle of Canvas area if the shape is transformed toward negative coordinate. (This was happening because setting a canvas' width to 0 resets the canvas' width to 300.) Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | Merge pull request #267 from mqg734/ToolOptionsValerio Virgillito2012-06-05
| |\ \ \ \ | | | | | | | | | | | | Updated ink bottle and fill tools to support tool options checkboxes and materials.
| | * \ \ \ Merge branch 'refs/heads/ninja-internal' into ToolOptionsNivesh Rajbhandari2012-06-05
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Updated ink bottle tool to support color-chip's checkbox and undo/redo for ↵Nivesh Rajbhandari2012-06-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | strokes/borders. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | Fill and Ink-Bottle fixes.Nivesh Rajbhandari2012-06-04
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | change the PI to make it look like the fill color affects the brush stroke colorPushkar Joshi2012-06-07
| | | | | |
* | | | | | enable gradients for brush stroke (in authoring as well as runtime)Pushkar Joshi2012-06-06
| | | | | |
* | | | | | Merge branch 'pentool' into brushtoolPushkar Joshi2012-06-06
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Conflicts: assets/canvas-runtime.js
| * | | | | added gradients to pen path runtimePushkar Joshi2012-06-06
| | | | | |
* | | | | | Merge branch 'pentool' into brushtoolPushkar Joshi2012-06-06
|\| | | | |
| * | | | | updated the ninja library version (now contains brushstroke and pen path ↵Pushkar Joshi2012-06-05
| | | | | | | | | | | | | | | | | | | | | | | | rendering)
| * | | | | Merge branch 'master' into pentoolPushkar Joshi2012-06-05
| |\| | | |
| | * | | | Merge pull request #271 from mencio/element-model-fixesValerio Virgillito2012-06-05
| | |\ \ \ \ | | | | | | | | | | | | | | fixing the save as
| | | * | | | fixing the save asValerio Virgillito2012-06-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | Merge pull request #270 from mencio/element-model-fixesValerio Virgillito2012-06-05
| | |\| | | | | | | | | | | | | | | | | | fixing a small typo
| | | * | | | fixing a small typoValerio Virgillito2012-06-05
| | |/ / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | Merge pull request #269 from mencio/save-as-fixValerio Virgillito2012-06-05
| | |\ \ \ \ | | | |_|_|/ | | |/| | | fixing the save as
| | | * | | fixing the save asValerio Virgillito2012-06-05
| | |/ / / | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | Merge pull request #268 from mqg734/CompassLocationValerio Virgillito2012-06-05
| | |\ \ \ | | | | | | | | | | | | Compass should draw in lower-left regardless of the stage height.
| | | * | | Compass should draw in lower-left regardless of the stage height.Nivesh Rajbhandari2012-06-05
| | | | |/ | | | |/| | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | Merge pull request #263 from joseeight/ComponentsValerio Virgillito2012-06-05
| | |\ \ \ | | | |/ / | | |/| | Saving Google Components (reel components)
| | | * | Fixing CSS bugJose Antonio Marquez2012-06-04
| | | | | | | | | | | | | | | | | | | | This is for files using 'save' and not 'save all' in which the styles would be thrown off and mixed improperly.
| | | * | Canvas lib fixJose Antonio Marquez2012-06-04
| | | | | | | | | | | | | | | | | | | | Fixed a bug where an extra tag would be added to the file and break I/O.
| | | * | Adding saving blocking screenJose Antonio Marquez2012-06-04
| | | | | | | | | | | | | | | | | | | | This is for chrome preview, also fixed other preview bug with plain files not opening in preview.
| | | * | Fixing saveAll from menuJose Antonio Marquez2012-06-04
| | | | | | | | | | | | | | | | | | | | This was broken, not sure when it broke, but working again.
| | | * | Adding lib copy blocking to previewJose Antonio Marquez2012-06-04
| | | | | | | | | | | | | | | | | | | | This fixes an issue with launching preview before libraries were copied, hence, first time run would fail. Need to add a feedback screen for this process.
| | | * | Merge branch 'refs/heads/Ninja-Internal' into ComponentsJose Antonio Marquez2012-06-04
| | | |\|
| | | * | Adding blocking logic to copy libsJose Antonio Marquez2012-06-03
| | | | | | | | | | | | | | | | | | | | Need to implement logic in parsing method, might require a minor restructuring.
| | | * | Merge branch 'refs/heads/Ninja-Internal' into ComponentsJose Antonio Marquez2012-06-01
| | | |\ \
| | | * | | Adding open draw to reel componentsJose Antonio Marquez2012-06-01
| | | | | |
| | | * | | Merge branch 'refs/heads/Ninja-Internal' into ComponentsJose Antonio Marquez2012-06-01
| | | |\ \ \
| | | * | | | Fixing feedread componentJose Antonio Marquez2012-06-01
| | | | | | |
| | | * | | | Add logic to allow dynamic placement of canvas json fileJose Antonio Marquez2012-06-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Save to and read from any path on disk (webGL/Canvas data only)
| | | * | | | Map fixesJose Antonio Marquez2012-06-01
| | | | | | |
| | | * | | | Creating template mediator classJose Antonio Marquez2012-06-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to simplify code, more to be changed and added.
| | | * | | | Fixing Google Map componentJose Antonio Marquez2012-06-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Pulled in from components branch.