| Commit message (Collapse) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| | | * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | Jonathan Duran | 2012-02-06 | |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Timeline | |||
| | | * | | | | | | Change keyframe to use element mediator when repositioning animated elements ↵ | Jonathan Duran | 2012-02-06 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on stage Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | | * | | | | | | Fix Timeline layer resizer from being inversed | Jonathan Duran | 2012-02-06 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | layer resizer now works in the correct direction when dragging Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | | * | | | | | | Timeline: add new layers to top of stack instead of bottom. | Jonathan Duran | 2012-02-06 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | | * | | | | | | Fix problem with resizer set to capture all webkitTransitionEnd events. ↵ | Jonathan Duran | 2012-02-06 | |
| | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update collapser to use namespaced webkitTransitionEnd events for forward compatibility. Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | | * | | | | | Add back keyframe selection code | Jonathan Duran | 2012-02-06 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | | * | | | | | Integrate breadcrumb component and layer handling code | Jonathan Duran | 2012-02-06 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | | * | | | | | CSS for timeline | Jonathan Duran | 2012-02-06 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | | * | | | | | style controller update for CSS animations | Jonathan Duran | 2012-02-06 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | | * | | | | | merge new timeline | Jonathan Duran | 2012-02-06 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | * | | | | | | Merge pull request #28 from mqg734/SnapManagerFixes | Valerio Virgillito | 2012-02-09 | |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Merging SnapManager fixes, webGL drawing fixes and some 3d tool fixes | |||
| | | * | | | | | | 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 pull request #26 from pushkarjoshi/pentool | Valerio Virgillito | 2012-02-09 | |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Pentool | |||
| | | * | | | | | | | removing shaders | Pushkar Joshi | 2012-02-09 | |
| | | | | | | | | | | ||||
| | | * | | | | | | | 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 | |
| | | | | | | | | ||||