aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| | | | | | | | | | | * Merge branch 'refs/heads/master' into element-model-fixesValerio Virgillito2012-06-05
| | | | | | | | | | | |\ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/mediators/element-mediator.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | | | | | 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>
* | | | | | | | | | | Merge pull request #271 from mencio/element-model-fixesValerio Virgillito2012-06-05
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | fixing the save as
* \ \ \ \ \ \ \ \ \ \ \ Merge pull request #270 from mencio/element-model-fixesValerio Virgillito2012-06-05
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | fixing a small typo
| | | | | | | | | | | | * removing all model creators.Valerio Virgillito2012-06-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The elementModel is now a getter that will create a new model when needed. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | | | | | | | | | | * fix in the draw utils for drawing the 3d compassValerio Virgillito2012-06-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | | | | | | | | | | * cleanup and making the webgl-helper only loop canvas on file saveValerio Virgillito2012-06-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | | | | | | | | | | * disabling the menu when closing all filesValerio Virgillito2012-06-05
| | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | | | | | fixing the save asValerio Virgillito2012-06-05
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * / / / / / / / / / 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
| |\ \ \ \ \ \ \ \ \