aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* changes to reopen sub property functionsJonathan Duran2012-06-11
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-06
|\
| * 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
| | * | | | 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.
| | * | | | Merge branch 'refs/heads/Ninja-Internal' into ComponentsJose Antonio Marquez2012-06-01
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into ComponentsJose Antonio Marquez2012-05-31
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into ComponentsJose Antonio Marquez2012-05-31
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ Merge pull request #266 from mencio/element-model-fixesValerio Virgillito2012-06-05
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | components fix: adding a first draw event to components
| | * | | | | | | | components fix: adding a first draw event to componentsValerio Virgillito2012-06-04
| | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding a first draw allows the component to have the right element so that ninja can use it's controller to get the component instance Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | Merge pull request #265 from jreid01/pull-requestValerio Virgillito2012-06-05
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | Timeline: Fixes to timeline to handle document switching & breadcrumb interactions
* | | | | | | | | Fix references to documentController.activeDocument to currentDocument.modelJonathan Duran2012-06-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | | | | | Fix error when opening file with no animationsJonathan Duran2012-06-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | | | | | Timeline: Merge branch 'pull-request' into timeline-localJon Reid2012-06-05
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
| * | | | | | | | Timeline: Fix line endings, set to UNIX.Jon Reid2012-06-05
| | | | | | | | |
| * | | | | | | | Timeline: Fixes to timeline to handle document switching & breadcrumbJon Reid2012-06-04
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | interactions under new DOM Architecture.
* | | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-06-05
|\ \ \ \ \ \ \ \
| * | | | | | | | Timeline: Better style selection and deselection. Automatic re-selection ofJon Reid2012-06-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | previously selected style when parent layer is reselected.
| * | | | | | | | Timeline: Bug fixes for deleting styles and their associated tracksJon Reid2012-05-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | correctly.
* | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-05
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/element-controller.js js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | | Merge pull request #264 from mencio/document-bindings-fixValerio Virgillito2012-06-04
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | Document bindings fix - Changing the documents architecture to use bindings instead of events
| | * | | | | | fix for the css panelValerio Virgillito2012-06-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | Merge branch 'document-bindings-fix' of github.com:mencio/ninja-internal ↵Valerio Virgillito2012-06-01
| | |\