Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
* | | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into AllFixes | Nivesh Rajbhandari | 2012-04-09 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | Single perspective fix. | Nivesh Rajbhandari | 2012-04-09 | |
* | | | | | | | | | | | | | | Merge branch 'refs/heads/timeline-kruti-local' into TimelineUber | Jonathan Duran | 2012-04-12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | Timeline:Changing function name | Kruti Shah | 2012-04-12 | |
* | | | | | | | | | | | | | | More Absolute vs Relative changes and cleanup | Jonathan Duran | 2012-04-11 | |
| |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | Timeline: Bug fix: Drag and Drop now working again. | Jon Reid | 2012-04-10 | |
* | | | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-04-10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | Abs. vs. Rel. animation postion functions | Jonathan Duran | 2012-04-10 | |
| * | | | | | | | | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-04-10 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-10 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | / / / / / / / / / / | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | Merge pull request #159 from mqg734/WebGLMaterials | Valerio Virgillito | 2012-04-09 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | | | ||||
| | | * | | | | | | | | | | | Grow/shrink Line, Oval and Rectangles when changing stroke size. | Nivesh Rajbhandari | 2012-04-06 | |
| | | * | | | | | | | | | | | -webkit-transform-style needs to be set to preserve-3d for shapes regardless ... | Nivesh Rajbhandari | 2012-04-05 | |
| | | * | | | | | | | | | | | Fix for line tool not working because PI requests fill color for line as well... | Nivesh Rajbhandari | 2012-04-05 | |
| | | * | | | | | | | | | | | Removing fill, stroke, fillMaterial and strokeMaterial from the shapeModel ca... | Nivesh Rajbhandari | 2012-04-05 | |
| | | * | | | | | | | | | | | Fixing 3d tool reset to redraw handles. | Nivesh Rajbhandari | 2012-04-05 | |
| | | * | | | | | | | | | | | Adding back fix in mediator to not set 3d styles unless necessary. | Nivesh Rajbhandari | 2012-04-05 | |
| | | * | | | | | | | | | | | Undoing bad auto-merge resize-composer.js. | Nivesh Rajbhandari | 2012-04-05 | |
| | | * | | | | | | | | | | | Fixing curly brackets from auto-merge. | Nivesh Rajbhandari | 2012-04-05 | |
| | | * | | | | | | | | | | | Undoing some minor spacing differences from auto-merge. | Nivesh Rajbhandari | 2012-04-05 | |
| | | * | | | | | | | | | | | Undoing mistakes from auto-merge. | Nivesh Rajbhandari | 2012-04-05 | |
| | | * | | | | | | | | | | | Removing unnecessary code element = element. | Nivesh Rajbhandari | 2012-04-05 | |
| | | * | | | | | | | | | | | Commenting out console logs. | Nivesh Rajbhandari | 2012-04-05 | |
| | | * | | | | | | | | | | | Merge branch 'refs/heads/ToolFixes' into WebGLMaterials | Nivesh Rajbhandari | 2012-04-04 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/WebGLFileIO' into ToolFixes | Nivesh Rajbhandari | 2012-04-04 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | | * | | | | | | | | | | | We should require VecUtils instead of referring to the global reference since... | Nivesh Rajbhandari | 2012-04-04 | |
| | | | | * | | | | | | | | | | | Merge branch 'refs/heads/EricSnapping' into WebGLFileIO | Nivesh Rajbhandari | 2012-04-04 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | |_|/ / / / / / / / | | | | | | |/| | | | | | | | | | ||||
| | | | | | * | | | | | | | | | | Snapping fixes. | hwc487 | 2012-04-02 | |
| | | | | | * | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Sna... | hwc487 | 2012-03-29 | |
| | | | | | |\ \ \ \ \ \ \ \ \ \ | ||||
| | | | | | * | | | | | | | | | | | merge from main | hwc487 | 2012-03-29 | |
| | | | | | | |_|_|_|_|/ / / / / | | | | | | |/| | | | | | | | | | ||||
| | | | | * | | | | | | | | | | | Adjusting line's width and height when changing stroke size. | Nivesh Rajbhandari | 2012-04-04 | |
| | | | | * | | | | | | | | | | | IKNinja-635 - Can't see 3d handles if div is red, green or blue color. | Nivesh Rajbhandari | 2012-04-03 | |
| | | | | * | | | | | | | | | | | Give user feedback about which element the Fill/InkBottle tools will act on. | Nivesh Rajbhandari | 2012-04-03 | |
| | | | | * | | | | | | | | | | | IKNinja-1375 - After WebGL conversion from PI, Selection tool gets deactivate... | Nivesh Rajbhandari | 2012-04-03 | |
| | | | | * | | | | | | | | | | | IKNinja-1376 - 3D values reverted when using Selection tool to move the objec... | Nivesh Rajbhandari | 2012-04-02 | |
| | | | | * | | | | | | | | | | | IKNinja-1399 - [Eyedropper] Not sampling WebGL gradients after file open. | Nivesh Rajbhandari | 2012-04-02 | |
| | | | | * | | | | | | | | | | | Switching to Linear/RadialGradient materials will set the corresponding color... | Nivesh Rajbhandari | 2012-04-02 | |
| | | | | * | | | | | | | | | | | IKNinna-1409 - Should dirty document when changing shape properties. IKNinja-... | Nivesh Rajbhandari | 2012-04-02 | |
| | | | | * | | | | | | | | | | | IKNinja-1410 - Inner Radius should be restricted to 99%. | Nivesh Rajbhandari | 2012-04-02 | |
| | | | | * | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLFileIO | Nivesh Rajbhandari | 2012-04-02 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | |_|_|_|/ / / / / / | | | | | | |/| | | | | | | | | | ||||
| | | | | * | | | | | | | | | | | Update PI and Color Panel to reflect default LinearGradient and RadialGradien... | Nivesh Rajbhandari | 2012-03-30 | |
| | | | | * | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLFileIO | Nivesh Rajbhandari | 2012-03-30 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | |_|/ / / / / / / / | | | | | | |/| | | | | | | | | | ||||
| | | | | * | | | | | | | | | | | Updated shapes to always check for its stroke and fill colors and materials i... | Nivesh Rajbhandari | 2012-03-29 | |
| | | | | * | | | | | | | | | | | We shouldn't set z to 0 for translate tool snapping because user may want to ... | Nivesh Rajbhandari | 2012-03-29 | |
| | | | | | |_|/ / / / / / / / | | | | | |/| | | | | | | | | | ||||
| | | | * | | | | | | | | | | | Styling PI's Materials edit button. | Nivesh Rajbhandari | 2012-04-04 | |
| | | | * | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into ToolFixes | Nivesh Rajbhandari | 2012-04-04 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|/ / / | | | | | |/| | | | | | | | | | ||||
| | | | * | | | | | | | | | | | Adding replaceElement routine and event so Timeline can avoid removing and ad... | Nivesh Rajbhandari | 2012-04-04 | |
| | | | | |_|_|_|_|_|_|/ / / | | | | |/| | | | | | | | | | ||||
| | | * | | | | | | | | | | | IKNINJA-764 - The Local/Global options are not in synced with both 3D object ... | Nivesh Rajbhandari | 2012-03-27 | |
| | | * | | | | | | | | | | | IKNINJA-1378 - Line Tool's drawing preview changes tool canvas's line style. | Nivesh Rajbhandari | 2012-03-27 |