| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-09 |
| |\ | |||
| | * | Fixed bad merge in FlatMaterials. | Nivesh Rajbhandari | 2012-02-09 |
| | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Merge branch 'refs/heads/ninja-internal' into SnapManagerFixes | Nivesh Rajbhandari | 2012-02-09 |
| | |\ | | | | | | | | | | | | | | | | | | | Conflicts: js/helper-classes/RDGE/Materials/FlatMaterial.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * \ | Merge branch 'refs/heads/ninja-internal' into SnapManagerFixes | Nivesh Rajbhandari | 2012-02-09 |
| | |\ \ | |||
| | * | | | Changed the rendering for canvas 2D rectangle. | Nivesh Rajbhandari | 2012-02-09 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | Reversed the orientation of one of the triangles for WebGL rendering. | Nivesh Rajbhandari | 2012-02-09 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | Fixed runtime error when using 3d tools without any items selected. | Nivesh Rajbhandari | 2012-02-09 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | Merging snap manager fix for infinite projection errors when stage view is ↵ | Nivesh Rajbhandari | 2012-02-08 |
| | | | | | | | | | | | | | | | | | | | | | | | | | changed to top or side. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | Merging fix for marquee selection that accounts for 3d values. | Nivesh Rajbhandari | 2012-02-08 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | Merge branch 'refs/heads/ninja-internal' into ToolFixes | Nivesh Rajbhandari | 2012-02-08 |
| | |\ \ \ | |||
| | * | | | | Fixed several typos in Materials import/export code to support toggling ↵ | Nivesh Rajbhandari | 2012-02-08 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | between 2d and 3d shape modes. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | Fixed radio button to update 3d values when switching from local to global ↵ | Nivesh Rajbhandari | 2012-02-08 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and vice-versa. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | | File Open | Jose Antonio Marquez | 2012-02-09 |
| | | | | | | | | | | | | | | | | | | | | | Adding file open functionality. | ||
| * | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-09 |
| |\ \ \ \ \ | | |_|_|/ | |/| | | | |||
| | * | | | | Merge pull request #26 from pushkarjoshi/pentool | Valerio Virgillito | 2012-02-09 |
| | |\ \ \ \ | | | | | | | | | | | | | Pentool | ||
| | | * | | | | fill all paths even if they are open | Pushkar Joshi | 2012-02-08 |
| | | | | | | | |||
| | | * | | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-02-08 |
| | | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | Conflicts: js/helper-classes/RDGE/GLWorld.js js/helper-classes/RDGE/MaterialsLibrary.js | ||
| | | * | | | | bug fixes for better anchor point rotation and removing snapping on hover ↵ | Pushkar Joshi | 2012-02-08 |
| | | | | | | | | | | | | | | | | | | | | | | | | | and mouse down | ||
| | | * | | | | some minor bug fixes and code cleanup | Pushkar Joshi | 2012-02-07 |
| | | | | | | | |||
| | | * | | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-02-07 |
| | | |\ \ \ \ | |||
| | | * | | | | | don't use colorToHex function because it only works for 3D color (needs a ↵ | Pushkar Joshi | 2012-02-07 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix to colorToHex) | ||
| | | * | | | | | Merge branch 'working' of c:/Code/github/emueller/ninja-internal/ into pentool | Pushkar Joshi | 2012-02-02 |
| | | |\ \ \ \ \ | |||
| | | | * | | | | | Removed a console log and set the Plasma material to animating. | hwc487 | 2012-02-01 |
| | | | | | | | | | |||
| | | | * | | | | | Fixed plane orientations for view orientations other than front. | hwc487 | 2012-02-01 |
| | | | | | | | | | |||
| | | | * | | | | | listen for the appMouseUp event in the Pan tool | hwc487 | 2012-02-01 |
| | | | | | | | | | |||
| | | | * | | | | | factor in the zoom factor when drawing the stage compass. | hwc487 | 2012-02-01 |
| | | | | | | | | | |||
| | | | * | | | | | Fix for a marquee zoom bug. | hwc487 | 2012-02-01 |
| | | | | | | | | | |||
| | | | * | | | | | mouse wheel for zoom tool | hwc487 | 2012-02-01 |
| | | | | | | | | | |||
| | | | * | | | | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into working | hwc487 | 2012-02-01 |
| | | | |\ \ \ \ \ | |||
| | | | * | | | | | | changes to allow minimal rendering ofnon-animated materials. | hwc487 | 2012-02-01 |
| | | | | | | | | | | |||
| | | | * | | | | | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into working | hwc487 | 2012-01-31 |
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/stage/stage.reel/stage.js | ||
| | | | * \ \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-01-31 |
| | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | working | ||
| | | | * | | | | | | | | Renderer startup handling of non-animated materials. | hwc487 | 2012-01-30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed zoom from the document bar to keep the location center of the viewable portion of the document fixed. | ||
| | | | * | | | | | | | | Merge branch 'staging' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-01-30 |
| | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | working | ||
| | | | * | | | | | | | | | updated from old repo | hwc487 | 2012-01-27 |
| | | | | | | | | | | | | | |||
| | | * | | | | | | | | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-02-02 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | | | | make GLAnchorPoint functions as part of its prototype | Pushkar Joshi | 2012-02-01 |
| | | | | | | | | | | | | | | |||
| | | * | | | | | | | | | | | avoid overriding GlGeomObj translate method | Pushkar Joshi | 2012-02-01 |
| | | | | | | | | | | | | | | |||
| | | * | | | | | | | | | | | when selecting anchor points, first check if the selected anchor position is ↵ | Pushkar Joshi | 2012-02-01 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | close enough | ||
| | | * | | | | | | | | | | | performance improvement: add most of the GLSubpath functions to its prototype | Pushkar Joshi | 2012-02-01 |
| | | | | | | | | | | | | | | |||
| | | * | | | | | | | | | | | handle the case of proper redraw when the alt key is held down even after ↵ | Pushkar Joshi | 2012-01-31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mouse up | ||
| | | * | | | | | | | | | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-01-31 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | | | | | display the anchor point to be selected on mouse hover | Pushkar Joshi | 2012-01-31 |
| | | | | | | | | | | | | | | | |||
| | | * | | | | | | | | | | | | do the fill before the stroke for the path, so the stroke width renders acc. ↵ | Pushkar Joshi | 2012-01-30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to user specification | ||
| | | * | | | | | | | | | | | | missed a couple of pen tool property files on last checkin | Pushkar Joshi | 2012-01-30 |
| | | | | | | | | | | | | | | | |||
| | | * | | | | | | | | | | | | Merge pushkar branch on gerritt with github version | Pushkar Joshi | 2012-01-30 |
| | | | |_|/ / / / / / / / / | | |/| | | | | | | | | | | |||
| | * | | | | | | | | | | | | adding oneway to the 3d bindings to fix a bug where the stage was getting ↵ | Valerio Virgillito | 2012-02-09 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | selected. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | | | | | | |</ | |||