aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* code cleanup, light refactor and now adding components at the center stage ↵Valerio Virgillito2012-02-09
| | | | | | point. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-09
|\
| * Merge pull request #28 from mqg734/SnapManagerFixesValerio Virgillito2012-02-09
| |\ | | | | | | Merging SnapManager fixes, webGL drawing fixes and some 3d tool fixes
| | * Fixed bad merge in FlatMaterials.Nivesh Rajbhandari2012-02-09
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * Merge branch 'refs/heads/ninja-internal' into SnapManagerFixesNivesh Rajbhandari2012-02-09
| | |\ | | |/ | |/| | | | | | | | | | | | | Conflicts: js/helper-classes/RDGE/Materials/FlatMaterial.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Merge pull request #26 from pushkarjoshi/pentoolValerio Virgillito2012-02-09
| |\ \ | | | | | | | | Pentool
| | * | removing shadersPushkar Joshi2012-02-09
| | | |
| | * | fill all paths even if they are openPushkar Joshi2012-02-08
| | | |
| | * | Merge branch 'master' into pentoolPushkar Joshi2012-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 Joshi2012-02-08
| | | | | | | | | | | | | | | | | | | | and mouse down
| | * | | some minor bug fixes and code cleanupPushkar Joshi2012-02-07
| | | | |
| | * | | Merge branch 'master' into pentoolPushkar Joshi2012-02-07
| | |\ \ \
| | * | | | don't use colorToHex function because it only works for 3D color (needs a ↵Pushkar Joshi2012-02-07
| | | | | | | | | | | | | | | | | | | | | | | | fix to colorToHex)
| | * | | | Merge branch 'working' of c:/Code/github/emueller/ninja-internal/ into pentoolPushkar Joshi2012-02-02
| | |\ \ \ \
| | | * | | | Removed a console log and set the Plasma material to animating.hwc4872012-02-01
| | | | | | |
| | | * | | | Fixed plane orientations for view orientations other than front.hwc4872012-02-01
| | | | | | |
| | | * | | | listen for the appMouseUp event in the Pan toolhwc4872012-02-01
| | | | | | |
| | | * | | | factor in the zoom factor when drawing the stage compass.hwc4872012-02-01
| | | | | | |
| | | * | | | Fix for a marquee zoom bug.hwc4872012-02-01
| | | | | | |
| | | * | | | mouse wheel for zoom toolhwc4872012-02-01
| | | | | | |
| | | * | | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into workinghwc4872012-02-01
| | | |\ \ \ \
| | | * | | | | changes to allow minimal rendering ofnon-animated materials.hwc4872012-02-01
| | | | | | | |
| | | * | | | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into workinghwc4872012-01-31
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/stage/stage.reel/stage.js
| | | * \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-01-31
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | working
| | | * | | | | | | Renderer startup handling of non-animated materials.hwc4872012-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 ↵hwc4872012-01-30
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | working
| | | * | | | | | | | updated from old repohwc4872012-01-27
| | | | | | | | | | |
| | * | | | | | | | | Merge branch 'master' into pentoolPushkar Joshi2012-02-02
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | make GLAnchorPoint functions as part of its prototypePushkar Joshi2012-02-01
| | | | | | | | | | | |
| | * | | | | | | | | | avoid overriding GlGeomObj translate methodPushkar Joshi2012-02-01
| | | | | | | | | | | |
| | * | | | | | | | | | when selecting anchor points, first check if the selected anchor position is ↵Pushkar Joshi2012-02-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | close enough
| | * | | | | | | | | | performance improvement: add most of the GLSubpath functions to its prototypePushkar Joshi2012-02-01
| | | | | | | | | | | |
| | * | | | | | | | | | handle the case of proper redraw when the alt key is held down even after ↵Pushkar Joshi2012-01-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mouse up
| | * | | | | | | | | | Merge branch 'master' into pentoolPushkar Joshi2012-01-31
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | display the anchor point to be selected on mouse hoverPushkar Joshi2012-01-31
| | | | | | | | | | | | |
| | * | | | | | | | | | | do the fill before the stroke for the path, so the stroke width renders acc. ↵Pushkar Joshi2012-01-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to user specification
| | * | | | | | | | | | | missed a couple of pen tool property files on last checkinPushkar Joshi2012-01-30
| | | | | | | | | | | | |
| | * | | | | | | | | | | Merge pushkar branch on gerritt with github versionPushkar Joshi2012-01-30
| | | | | | | | | | | | |
| * | | | | | | | | | | | adding oneway to the 3d bindings to fix a bug where the stage was getting ↵Valerio Virgillito2012-02-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | selected. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | | | | | Merge pull request #29 from mayhewinator/WorkingBranchValerio Virgillito2012-02-09
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates for Splash screen, icon, license page and credits page
| | * | | | | | | | | | | | removed null characters at the end of this file that made GIT treat it as a ↵John Mayhew2012-02-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | binary file
| | * | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵John Mayhew2012-02-09
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | WorkingBranch
| | * | | | | | | | | | | | Implemented final splash screen, the credits page and the license pageJohn Mayhew2012-02-09
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | fixed error with initializing and accessing the ninja version object from ↵John Mayhew2012-02-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the main reel
| | * | | | | | | | | | | | Updated fav icon to the final imageJohn Mayhew2012-02-09
| | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | |
| | | | | | | | | | | | * Merge branch 'refs/heads/ninja-internal' into SnapManagerFixesNivesh Rajbhandari2012-02-09
| | | | | | | | | | | | |\ | | |_|_