Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
| | * | | | | | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-04-03 | |
| | |\ \ \ \ \ \ \ | ||||
| | * | | | | | | | | working File I/O for pen tool created paths and some minor bug fixes (correct... | Pushkar Joshi | 2012-04-03 | |
| | * | | | | | | | | track the canvas top left position instead of the center position to figure o... | Pushkar Joshi | 2012-04-03 | |
| | * | | | | | | | | First attempt at preventing the drifting of the canvas due to floating point ... | Pushkar Joshi | 2012-04-03 | |
| | * | | | | | | | | render the pen path with local coordinates, but use stage world coordinates t... | Pushkar Joshi | 2012-04-02 | |
| | * | | | | | | | | adjust the position for the pen tool feedback cursor AND fix a bug where ever... | Pushkar Joshi | 2012-03-28 | |
| | * | | | | | | | | change cursors for pen tool realtime feedback....still need to position the c... | Pushkar Joshi | 2012-03-28 | |
| | * | | | | | | | | Merge branch 'brushtool' into pentool | Pushkar Joshi | 2012-03-28 | |
| | |\ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | added cursors to the pen tool UI AND change cursor when the user hovers over ... | Pushkar Joshi | 2012-03-27 | |
| * | | | | | | | | | | Fixed materials editor popup not refreshing correctly. | Nivesh Rajbhandari | 2012-04-16 | |
* | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-04-24 | |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | ||||
| * | | | | | | | | | | Merge branch 'refs/heads/master' into stage-document-architecture | Valerio Virgillito | 2012-04-23 | |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | ||||
| | * | | | | | | | | | Merge branch 'refs/heads/master' into cleanup | Valerio Virgillito | 2012-04-19 | |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | | | ||||
| | | * | | | | | | | | Merge pull request #168 from mqg734/EricMerge | Valerio Virgillito | 2012-04-19 | |
| | | |\ \ \ \ \ \ \ \ | ||||
| | | | * | | | | | | | | Moving initialzeSnapping routine from RotateObject3DTool tool to Rotate3DTool... | Nivesh Rajbhandari | 2012-04-18 | |
| | | | * | | | | | | | | Merge branch 'refs/heads/ninja-internal' into EricMerge | Nivesh Rajbhandari | 2012-04-18 | |
| | | | |\ \ \ \ \ \ \ \ | ||||
| | | | * | | | | | | | | | Fixing some more merge issues. | Nivesh Rajbhandari | 2012-04-18 | |
| | | | * | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into EricMerge | Nivesh Rajbhandari | 2012-04-18 | |
| | | | |\ \ \ \ \ \ \ \ \ | ||||
| | | | * \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/Snapping_II' into EricMerge | Nivesh Rajbhandari | 2012-04-18 | |
| | | | |\ \ \ \ \ \ \ \ \ \ | ||||
| | | | | * | | | | | | | | | | Allow snapping to unselected objects | hwc487 | 2012-04-17 | |
| | | | | * | | | | | | | | | | snapping for stage rotation tool | hwc487 | 2012-04-16 | |
| | | | | * | | | | | | | | | | 3D translation fixes | hwc487 | 2012-04-16 | |
| | | | | * | | | | | | | | | | 3D rotation | hwc487 | 2012-04-13 | |
| | | | | * | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Sna... | hwc487 | 2012-04-13 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | |_|/ / / / / / / | | | | | | |/| | | | | | | | | ||||
| | | | | * | | | | | | | | | | 3D Rotate changes | hwc487 | 2012-04-13 | |
| | | | | * | | | | | | | | | | Rotate3D tool changes | hwc487 | 2012-04-11 | |
| | | | | * | | | | | | | | | | Merge branch 'Snapping' of github.com:ericmueller/ninja-internal into Snappin... | hwc487 | 2012-04-05 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|/ / | | | | | |/| | | | | | | | | | ||||
| | | | | | * | | | | | | | | | translate3DObject tool fixes. | hwc487 | 2012-04-05 | |
| | | | | | * | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Sna... | hwc487 | 2012-04-04 | |
| | | | | | |\ \ \ \ \ \ \ \ \ | ||||
| | | | | | * | | | | | | | | | | Cap fix for vecUtils. | hwc487 | 2012-04-04 | |
| | | | | | * | | | | | | | | | | turned off translation handles during a multi-object drag. | hwc487 | 2012-04-04 | |
| | | | | | * | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Sna... | hwc487 | 2012-04-03 | |
| | | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | |_|_|_|_|_|/ / / | | | | | | | |/| | | | | | | | | ||||
| | | | | | * | | | | | | | | | | Translate 3D fix for multi-selection Z translation | hwc487 | 2012-04-02 | |
| | * | | | | | | | | | | | | | | cleanup unused code. | Valerio Virgillito | 2012-04-19 | |
| | | |_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | Temporary fix for the PI and Stage when opening the new template. | Valerio Virgillito | 2012-04-23 | |
| * | | | | | | | | | | | | | | adjusting the bread crumb to work with the new template | Valerio Virgillito | 2012-04-23 | |
| * | | | | | | | | | | | | | | more backup fixes for the old stage | Valerio Virgillito | 2012-04-20 | |
| * | | | | | | | | | | | | | | reverting old template to current working status. New template work. | Valerio Virgillito | 2012-04-20 | |
| * | | | | | | | | | | | | | | Merge branch 'refs/heads/Document' into stage-document-architecture | Valerio Virgillito | 2012-04-19 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | typo fix | Valerio Virgillito | 2012-04-19 | |
| * | | | | | | | | | | | | | | | initial stage web template | Valerio Virgillito | 2012-04-18 | |
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | Merge pull request #167 from mqg734/BoundsCalculation | Valerio Virgillito | 2012-04-18 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into AllFixes | Nivesh Rajbhandari | 2012-04-17 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | Grid should redraw on elementChanging as well as elementChange. | Nivesh Rajbhandari | 2012-04-17 | |
| | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | Squashed commit of the following: | Valerio Virgillito | 2012-04-18 | |
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | ||||
| * | | | | | | | | | | | | Adding back setProperties for canvas because width and height values need to ... | Nivesh Rajbhandari | 2012-04-17 | |
| * | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLFixes | Nivesh Rajbhandari | 2012-04-17 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | ||||
| | * | | | | | | | | | | | Merge pull request #165 from mqg734/BoundsCalculation | Valerio Virgillito | 2012-04-17 | |
| | |\| | | | | | | | | | | ||||
| | | * | | | | | | | | | | Drag and drop of images and components should not add 3d values by default. | Nivesh Rajbhandari | 2012-04-16 | |
| | | | |_|_|_|_|/ / / / | | | |/| | | | | | | | | ||||
| | * | | | | | | | | | | Merge pull request #164 from mqg734/ToolTipFixes | Valerio Virgillito | 2012-04-17 | |
| | |\ \ \ \ \ \ \ \ \ \ |