| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | 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> | ||
| | * | 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 |
| | | | | | | |||
| | | * | | | factor in the zoom factor when drawing the stage compass. | 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 | ||
| | | * | | | | 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. | ||
| | | * | | | | updated from old repo | hwc487 | 2012-01-27 |
| | | | | | | | |||
| | * | | | | | 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 |
| | | | | | | | |||
| | * | | | | | 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 | ||
| | * | | | | | Merge pushkar branch on gerritt with github version | Pushkar Joshi | 2012-01-30 |
| | |/ / / / | |||
| * | | | | | 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> | ||
| * | | | | | 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> | ||
| * | | | | | 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> | ||
| * | | | | id's must start with a letter, so our workaround for using uuid for RDGE ↵ | Nivesh Rajbhandari | 2012-02-07 |
| | | | | | | | | | | | | | | | | | | | | | | | | | canvas id's won't work because they often start with a number. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | Fixing some typos and undeclared variables in GLRectangle and ShapesController. | Nivesh Rajbhandari | 2012-02-07 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | Supporting switching materials in the PI. Also, moved makeFillMaterial and ↵ | Nivesh Rajbhandari | 2012-02-07 |
| | | | | | | | | | | | | | | | | | | | | | | | | | makeStrokeMaterial functions into GLGeomObj so shapes other than GLRectangle can use these routines. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | Updated tools and PI to get/set materials by binding to appModel's materials ↵ | Nivesh Rajbhandari | 2012-02-07 |
| | |_|/ |/| | | | | | | | | | | | | | | property. This requires us to add FlatMaterial to the list of materials in the MaterialsLibrary. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | Attempt to fix initialization bug for snap-manager | Jose Antonio Marquez | 2012-02-06 |
| | | | | |||
| * | | | Handle delete of multiple objects. Also, have deletion go through the ↵ | Nivesh Rajbhandari | 2012-02-03 |
| | | | | | | | | | | | | | | | | | | | mediator so elementDeleted event is fired for SnapManager, DrawUtils, etc. to clean up after deleted element(s). Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | Update grid and planes when elementChange event signifies the "matrix", ↵ | Nivesh Rajbhandari | 2012-02-03 |
| | | | | | | | | | | | | | | | | | | | "left", "top", "width" or "height" properties have changed. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | Update grid and planes when elementChange event signifies the "matrix", ↵ | Nivesh Rajbhandari | 2012-02-03 |
| | | | | | | | | | | | | | | | | | | | "left", "top", "width" or "height" properties have changed. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | Fixes for montage integration | Valerio Virgillito | 2012-02-02 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | Integrating Pan and Zoom tool and snap manager fixes. | Nivesh Rajbhandari | 2012-02-02 |
| | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | Adding legal attribution for decompose matrix routine. | Nivesh Rajbhandari | 2012-02-02 |
| | |/ |/| | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | Removing unused Properties3D file since those values are now saved with the ↵ | Nivesh Rajbhandari | 2012-01-30 |
| | | | | | | | | | | | | | models. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | Syncing stage view when rotating stage. | Nivesh Rajbhandari | 2012-01-30 |
| |/ | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | First commit of Ninja to ninja-internal | Pierre Frisch | 2012-01-27 |
| Signed-off-by: Valerio Virgillito <rmwh84@motorola.com> | |||