aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-05-01
|\
| * Merge pull request #184 from mqg734/StageWebTemplateValerio Virgillito2012-05-01
| |\
| | * webTemplate var gets reset to false, so must check for new stage template dif...Nivesh Rajbhandari2012-05-01
| | * Merge branch 'refs/heads/ninja-internal' into StageWebTemplateNivesh Rajbhandari2012-05-01
| | |\ | | |/ | |/|
| * | Removing some console logsValerio Virgillito2012-04-30
| | * Get working plane grid to draw for new stage web template workflow.Nivesh Rajbhandari2012-05-01
| |/
| * Squashed commit of stage architectureValerio Virgillito2012-04-30
| * Merge pull request #182 from ericmueller/Canvas-interactionValerio Virgillito2012-04-30
| |\
| | * added a console.log to show the working plane during a draghwc4872012-04-27
| | * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Can...hwc4872012-04-27
| | |\
| | * | Creating shapes in a containerhwc4872012-04-27
| | * | canvas interactionhwc4872012-04-26
| | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Can...hwc4872012-04-25
| | |\ \
| | * \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Can...hwc4872012-04-25
| | |\ \ \
| | * | | | Snapping tocontained objectshwc4872012-04-24
| | * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Can...hwc4872012-04-24
| | |\ \ \ \
| | * | | | | canvas interactionhwc4872012-04-23
| | * | | | | limitshwc4872012-04-23
| * | | | | | Merge cleanupValerio Virgillito2012-04-27
| * | | | | | Merge branch 'refs/heads/serialization'Valerio Virgillito2012-04-27
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'stage-document-architecture' of https://github.com/mencio/ninja...Valerio Virgillito2012-04-26
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'refs/heads/master' into stage-document-architectureValerio Virgillito2012-04-26
| | | |\ \ \ \ \ \
| | | * | | | | | | Fixed the stage border and layout in the new templateValerio Virgillito2012-04-26
| | | * | | | | | | Simplifying the getElement method from stage and adding an exclusion list to ...Valerio Virgillito2012-04-26
| | | * | | | | | | Merge branch 'refs/heads/master' into stage-document-architectureValerio Virgillito2012-04-26
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | Fixing the element model and adding get elementValerio Virgillito2012-04-26
| | | * | | | | | | | Merge branch 'refs/heads/master' into stage-document-architectureValerio Virgillito2012-04-24
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / | | | | |/| | | | | |
| | | * | | | | | | | Added a body controllerValerio Virgillito2012-04-24
| | | | |_|_|_|/ / / | | | |/| | | | | |
| | * | | | | | | | Merge branch 'master' of https://github.com/mayhewinator/ninja-internal into ...Valerio Virgillito2012-04-26
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| | | * | | | | | | Removing all "module" declarations and replaced with "prototype" in preparati...John Mayhew2012-04-26
| * | | | | | | | | Merge pull request #181 from imix23ways/TimelineUberValerio Virgillito2012-04-27
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | Refix brush tool elementAdded eventJonathan Duran2012-04-27
| | * | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-27
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge pull request #176 from pushkarjoshi/brushtoolValerio Virgillito2012-04-27
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| | * | | | | | | | track the dragging plane based on the hit record so that the file IO works ag...Pushkar Joshi2012-04-26
| | * | | | | | | | Merge branch 'master' into brushtoolPushkar Joshi2012-04-25
| | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | |
| | * | | | | | | | render the calligraphic brush stroke in realtime on a rotated canvasPushkar Joshi2012-04-25
| | * | | | | | | | allow the realtime drawing of brush strokes drawn off the standard XY plane b...Pushkar Joshi2012-04-24
| * | | | | | | | | Merge pull request #178 from mqg734/PerspectiveFixValerio Virgillito2012-04-26
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| | * | | | | | | | We don't currently support perspective values on individual elements, so remo...Nivesh Rajbhandari2012-04-26
| | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-04-26
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Fixing the eye dropper shortcut.Valerio Virgillito2012-04-26
| | | | | | * | | Revert "Fix Brush tool not broadcasting elementAdded event"Jonathan Duran2012-04-27
| | | | | | * | | Fix WEbGL not rendering on stage with timelineJonathan Duran2012-04-26
| | | | | | * | | Timeline: Deleting elements now deletes associated layers.Jon Reid2012-04-26
| | | | | | * | | Timeline: comment out a conditional debugger; re-enable layer name storage.Jon Reid2012-04-26
| | | | | | * | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-04-26
| | | | | | |\ \ \
| | | | | | | * \ \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-26
| | | | | | | |\ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| | | | | | | * | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-04-26
| | | | | | | |\ \ \
| | | | | | | * \ \ \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-26
| | | | | | | |\ \ \ \ | | | | |_|_|_|/ / / / | | | |/| | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 18:44:39 +0000