aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
...
| * | | | | | | | | | | | | | | | | | | | Merged old FileIOJose Antonio Marquez2012-01-27
* | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor...John Mayhew2012-02-14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/master' into StylesControllerUpdatesEric Guzman2012-02-13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into stage-colorValerio Virgillito2012-02-13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge pull request #34 from ericguzman/TreeComponentsValerio Virgillito2012-02-13
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Ninja leaf - remove console lotEric Guzman2012-02-13
| | | | * | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/master' into TreeComponentsEric Guzman2012-02-13
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | | | | |/| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Tree Components - Change the way delegate methods are calledEric Guzman2012-02-13
| | | | | |_|_|_|_|_|_|_|_|/ / / / / / / / | | | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/master' into stage-colorValerio Virgillito2012-02-13
| | |\| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Bug FixesJose Antonio Marquez2012-02-13
| | | | |/ / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Cleaning up the stage background color chip.Valerio Virgillito2012-02-13
| | * | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into sta...Valerio Virgillito2012-02-12
| | |\| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | initial color chip for the stageValerio Virgillito2012-02-10
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Styles Controller - Separate css animation rule gettersEric Guzman2012-02-13
| * | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/master' into StylesControllerUpdatesEric Guzman2012-02-08
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Styles Controller - added methods to get keyframe animation rulesEric Guzman2012-02-08
* | | | | | | | | | | | | | | | | | | Implemented about box component and hooked it up to the About menuJohn Mayhew2012-02-14
| |_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor...John Mayhew2012-02-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-02-10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Support export/import of GLLine data.Nivesh Rajbhandari2012-02-10
| * | | | | | | | | | | | | | | | | | Removing some console logs. I kept in the ones that signify error cases.Nivesh Rajbhandari2012-02-09
| * | | | | | | | | | | | | | | | | | Fixed switching between webGL and canvas 2d modes.Nivesh Rajbhandari2012-02-09
| * | | | | | | | | | | | | | | | | | Updated linear and radial gradient materials import/export routines.Nivesh Rajbhandari2012-02-09
| * | | | | | | | | | | | | | | | | | Merging changes for rectangle drawing.Nivesh Rajbhandari2012-02-09
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | Changed the rendering for canvas 2D rectangle.hwc4872012-02-08
| | * | | | | | | | | | | | | | | | | | Reversed the orientation of one of the triangles for WebGL rendering.hwc4872012-02-08
| | * | | | | | | | | | | | | | | | | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into workinghwc4872012-02-08
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into wor...hwc4872012-02-08
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Removed unused rdge files from the compiler.hwc4872012-02-08
| | * | | | | | | | | | | | | | | | | | | Fixed context switching problems in rdgehwc4872012-02-08
| | * | | | | | | | | | | | | | | | | | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into workinghwc4872012-02-07
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | test code for deformation shaderhwc4872012-02-07
| | * | | | | | | | | | | | | | | | | | | | Enhanced the overlap test for the selection tool marquee select.hwc4872012-02-06
| | * | | | | | | | | | | | | | | | | | | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into workinghwc4872012-02-06
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | Removed an unnecessary (and incorrect) snapping calculation.hwc4872012-02-06
| | * | | | | | | | | | | | | | | | | | | | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into workinghwc4872012-02-03
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | |