| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-06-07 |
| |\ | |||
| | * | Merge pull request #276 from mqg734/DrawingTools | Valerio Virgillito | 2012-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 Rajbhandari | 2012-06-06 |
| | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | Merge pull request #274 from ananyasen/bugfix-master | Valerio Virgillito | 2012-06-06 |
| | |\ \ | | | | | | | | | Bugfix master | ||
| | | * | | IKNINJA-1662 - fixed js error while resizing brewing in code view | Ananya Sen | 2012-06-05 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | * | | Merge branch 'refs/heads/ninja-internal-master' into bugfix-master | Ananya Sen | 2012-06-05 |
| | | |\ \ | |||
| | | * | | | IKNINJA-1645- fix - don't disable OK button on change of file type | Ananya Sen | 2012-06-05 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | | | Merge pull request #277 from joseeight/Document | Valerio Virgillito | 2012-06-06 |
| | |\ \ \ \ | | | | | | | | | | | | | Fixing referencing, also clean up | ||
| | | * | | | | Cleaning more. | Jose Antonio Marquez | 2012-06-06 |
| | | | | | | | |||
| | | * | | | | Cleaning up | Jose Antonio Marquez | 2012-06-06 |
| | | | |_|/ | | |/| | | | | | | | | | | | | Removed reference of model in design view, clean up slightly, need to implement binding later. | ||
| | * | | | | Merge pull request #272 from pushkarjoshi/pentool | Valerio Virgillito | 2012-06-06 |
| | |\ \ \ \ | | |/ / / | |/| | | | Pentool | ||
| | * | | | | Merge pull request #273 from mqg734/TransformTool | Valerio Virgillito | 2012-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 Rajbhandari | 2012-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/ToolOptions | Valerio Virgillito | 2012-06-05 |
| | |\ \ \ \ | | | | | | | | | | | | | Updated ink bottle and fill tools to support tool options checkboxes and materials. | ||
| | | * \ \ \ | Merge branch 'refs/heads/ninja-internal' into ToolOptions | Nivesh Rajbhandari | 2012-06-05 |
| | | |\ \ \ \ | | | | |_|/ | | | |/| | | |||
| | | * | | | | Updated ink bottle tool to support color-chip's checkbox and undo/redo for ↵ | Nivesh Rajbhandari | 2012-06-05 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | strokes/borders. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | | Fill and Ink-Bottle fixes. | Nivesh Rajbhandari | 2012-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 color | Pushkar Joshi | 2012-06-07 |
| | | | | | | | |||
| * | | | | | | enable gradients for brush stroke (in authoring as well as runtime) | Pushkar Joshi | 2012-06-06 |
| | | | | | | | |||
| * | | | | | | Merge branch 'pentool' into brushtool | Pushkar Joshi | 2012-06-06 |
| |\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | Conflicts: assets/canvas-runtime.js | ||
| | * | | | | | added gradients to pen path runtime | Pushkar Joshi | 2012-06-06 |
| | | | | | | | |||
| * | | | | | | Merge branch 'pentool' into brushtool | Pushkar Joshi | 2012-06-06 |
| |\| | | | | | |||
| | * | | | | | updated the ninja library version (now contains brushstroke and pen path ↵ | Pushkar Joshi | 2012-06-05 |
| | | | | | | | | | | | | | | | | | | | | | | | | | rendering) | ||
| | * | | | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-06-05 |
| | |\| | | | | |||
| | | * | | | | Merge pull request #271 from mencio/element-model-fixes | Valerio Virgillito | 2012-06-05 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | fixing the save as | ||
| | | | * | | | | fixing the save as | Valerio Virgillito | 2012-06-05 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | | | Merge pull request #270 from mencio/element-model-fixes | Valerio Virgillito | 2012-06-05 |
| | | |\| | | | | | | | | | | | | | | | | | | fixing a small typo | ||
| | | | * | | | | fixing a small typo | Valerio Virgillito | 2012-06-05 |
| | | |/ / / / | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | | Merge pull request #269 from mencio/save-as-fix | Valerio Virgillito | 2012-06-05 |
| | | |\ \ \ \ | | | |_|_|/ | | |/| | | | fixing the save as | ||
| | | | * | | | fixing the save as | Valerio Virgillito | 2012-06-05 |
| | | |/ / / | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | Merge pull request #268 from mqg734/CompassLocation | Valerio Virgillito | 2012-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 Rajbhandari | 2012-06-05 |
| | | | | |/ | | | |/| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | Merge pull request #263 from joseeight/Components | Valerio Virgillito | 2012-06-05 |
| | | |\ \ \ | | | |/ / | | |/| | | Saving Google Components (reel components) | ||
| | | | * | | Fixing CSS bug | Jose Antonio Marquez | 2012-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 fix | Jose Antonio Marquez | 2012-06-04 |
| | | | | | | | | | | | | | | | | | | | | | Fixed a bug where an extra tag would be added to the file and break I/O. | ||
| | | | * | | Adding saving blocking screen | Jose Antonio Marquez | 2012-06-04 |
| | | | | | | | | | | | | | | | | | | | | | This is for chrome preview, also fixed other preview bug with plain files not opening in preview. | ||
| | | | * | | Fixing saveAll from menu | Jose Antonio Marquez | 2012-06-04 |
| | | | | | | | | | | | | | | | | | | | | | This was broken, not sure when it broke, but working again. | ||
| | | | * | | Adding lib copy blocking to preview | Jose Antonio Marquez | 2012-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 Components | Jose Antonio Marquez | 2012-06-04 |
| | | | |\| | |||
| | | | * | | Adding blocking logic to copy libs | Jose Antonio Marquez | 2012-06-03 |
| | | | | | | | | | | | | | | | | | | | | | Need to implement logic in parsing method, might require a minor restructuring. | ||
| | | | * | | Merge branch 'refs/heads/Ninja-Internal' into Components | Jose Antonio Marquez | 2012-06-01 |
| | | | |\ \ | |||
| | | | * | | | Adding open draw to reel components | Jose Antonio Marquez | 2012-06-01 |
| | | | | | | | |||
| | | | * | | | Merge branch 'refs/heads/Ninja-Internal' into Components | Jose Antonio Marquez | 2012-06-01 |
| | | | |\ \ \ | |||
| | | | * | | | | Fixing feedread component | Jose Antonio Marquez | 2012-06-01 |
| | | | | | | | | |||
| | | | * | | | | Add logic to allow dynamic placement of canvas json file | Jose Antonio Marquez | 2012-06-01 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Save to and read from any path on disk (webGL/Canvas data only) | ||
| | | | * | | | | Map fixes | Jose Antonio Marquez | 2012-06-01 |
| | | | | | | | | |||
| | | | * | | | | Creating template mediator class | Jose Antonio Marquez | 2012-06-01 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to simplify code, more to be changed and added. | ||
| | | | * | | | | Fixing Google Map component | Jose Antonio Marquez | 2012-06-01 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pulled in from components branch. | ||
| | | | * | | | | Merge branch 'refs/heads/Ninja-Internal' into Components | Jose Antonio Marquez | 2012-06-01 |
| | | | |\ \ \ \ | |||
| | | | * \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into Components | Jose Antonio Marquez | 2012-05-31 |
| | | | |\ \ \ \ \ | |||