| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-05-31 |
| |\ | | | | | | | | | | | | | Textures Conflicts: js/io/system/ninjalibrary.json | ||
| | * | Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document | Jose Antonio Marquez | 2012-05-24 |
| | |\ | | | | | | | | | | | | | | | | | | | Conflicts: js/document/document-html.js js/helper-classes/3D/view-utils.js js/stage/stage.reel/stage.js | ||
| | | * | Removed unused variables and methods in stage-deps, layout design, and ↵ | Nivesh Rajbhandari | 2012-05-24 |
| | | | | | | | | | | | | | | | | | | | snap-manager. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | Fixed scrolling and centering stage code. Also, moved liveNodeList into the ↵ | Nivesh Rajbhandari | 2012-05-23 |
| | | | | | | | | | | | | | | | | | | | design view and added an option to exclude styles and text nodes when retrieving the live nodes. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | Cleaning up referencing to 'documentRoot' and '_document' | Jose Antonio Marquez | 2012-05-24 |
| | |/ | | | | | | | Moved to reference new model in DOM architecture rework. This should not affect anything, just moving the references, and also the setting to the render methods in the design view. | ||
| | * | Merge branch 'refs/heads/master' into dom-architecture | Valerio Virgillito | 2012-05-22 |
| | |\ | | | | | | | | | | | | | | | | | | | Conflicts: js/io/system/ninjalibrary.json Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | fixing a scrolling issue when multiple documents are switched | Valerio Virgillito | 2012-05-18 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | fixing some snapping bugs | Valerio Virgillito | 2012-05-18 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | fixed the draw util doc root reference | Valerio Virgillito | 2012-05-17 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | removing all stageDeps for drawing classes. | Valerio Virgillito | 2012-05-17 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture | Nivesh Rajbhandari | 2012-05-16 |
| | |\ \ | |||
| | | * | | changing @change to propertyChangeListener | Valerio Virgillito | 2012-05-16 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | Inline style for html's padding for content in negative space to guarantee ↵ | Nivesh Rajbhandari | 2012-05-16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | highest specificity. Also, set up scrollbars when opening files with content in negative space. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | Automatically add scrollbars when moving content to negative space. | Nivesh Rajbhandari | 2012-05-16 |
| | |/ / | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | Fixing 3d to work in banner templates. | Nivesh Rajbhandari | 2012-05-14 |
| | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | Fixing drawing in nested divs. | Nivesh Rajbhandari | 2012-05-11 |
| | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | Checked/Unchecked 'Use WebGL' checkbox in PI throws error in view-utils.. | Nivesh Rajbhandari | 2012-05-11 |
| | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | Adjusting 3d compass's drawing location so it's not hitting the edge of the ↵ | Nivesh Rajbhandari | 2012-05-11 |
| | | | | | | | | | | | | | | | | | | | frame. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | Draw 3d compass at the bottom-left. | Nivesh Rajbhandari | 2012-05-10 |
| | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | Merge branch 'refs/heads/master' into dom-architecture | Valerio Virgillito | 2012-05-08 |
| | |\ \ | |||
| | * | | | Removed special-casing for new template workflow. Instead, we will enforce ↵ | Nivesh Rajbhandari | 2012-05-04 |
| | | | | | | | | | | | | | | | | | | | | | | | | | a width and height on the body in order to do 3d. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-05-22 |
| |\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Textures Conflicts: js/lib/geom/shape-primitive.js js/lib/rdge/materials/linear-gradient-material.js | ||
| | * | | | removed console output. | hwc487 | 2012-05-14 |
| | | | | | |||
| | * | | | Drag plane not being set. Injection from a recent checkin of mine. | hwc487 | 2012-05-14 |
| | | | | | |||
| | * | | | removed some console output. | hwc487 | 2012-05-14 |
| | | | | | |||
| | * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugs | hwc487 | 2012-05-11 |
| | |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | Conflicts: js/lib/geom/circle.js js/lib/geom/rectangle.js | ||
| | * / | | Fixed an inaccuracy snapping to the stage. | hwc487 | 2012-05-10 |
| | |/ / | |||
| * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-05-11 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | Textures Conflicts: js/lib/geom/geom-obj.js js/lib/geom/rectangle.js js/tools/TagTool.js | ||
| | * | | fixes for 2D and 3D translation. | hwc487 | 2012-05-07 |
| | |/ | |||
| * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-05-02 |
| |\| | | | | | | | Textures | ||
| | * | Draw a red outline around the stage for reference when rotating stage. | Nivesh Rajbhandari | 2012-05-01 |
| | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Offset side and top working planes by half the stage width/height. | Nivesh Rajbhandari | 2012-05-01 |
| | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | webTemplate var gets reset to false, so must check for new stage template ↵ | Nivesh Rajbhandari | 2012-05-01 |
| | | | | | | | | | | | | | differently. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Get working plane grid to draw for new stage web template workflow. | Nivesh Rajbhandari | 2012-05-01 |
| | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-05-01 |
| |\| | | | | | | | Textures | ||
| | * | Creating shapes in a container | hwc487 | 2012-04-27 |
| | | | |||
| | * | canvas interaction | hwc487 | 2012-04-26 |
| | | | |||
| | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-04-25 |
| | |\ | | | | | | | | | | Canvas-interaction | ||
| | * | | canvas interaction | hwc487 | 2012-04-23 |
| | | | | |||
| * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-04-26 |
| |\ \ \ | | |/ | |/| | | | | Textures | ||
| | * | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-04-19 |
| | |\| | | | | | | | | | | | | | Conflicts: js/helper-classes/3D/view-utils.js | ||
| | * | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-04-17 |
| | |\ \ | | | | | | | | | | | | | | | | | Conflicts: js/tools/PenTool.js | ||
| | * | | | snapping feedback for pen tool, correct for subpaths that may lie on rotated ↵ | Pushkar Joshi | 2012-04-09 |
| | | | | | | | | | | | | | | | | | canvas, and with a rotated view | ||
| | * | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-04-06 |
| | |\ \ \ | |||
| | * | | | | complete version of the code for rendering selected subpath anchor points ↵ | Pushkar Joshi | 2012-04-06 |
| | | | | | | | | | | | | | | | | | | | | | and path overlay (code needs cleanup)...still buggy if creating new paths | ||
| | * | | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-04-04 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/tools/PenTool.js | ||
| | * | | | | | render the pen path with local coordinates, but use stage world coordinates ↵ | Pushkar Joshi | 2012-04-02 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to position the canvas on which the path is rendered AND add data-montage- to the ids in the pen and brush reels AND fix a bug with pen stroke transparency not working | ||
| * | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-04-19 |
| |\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | Textures | ||
| | * | | | | | Merge pull request #168 from mqg734/EricMerge | Valerio Virgillito | 2012-04-19 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Merging Eric's snapping and tool fixes into master. | ||
| | | * | | | | | Fixing some more merge issues. | Nivesh Rajbhandari | 2012-04-18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||