| Commit message (Collapse) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| | * | Merge branch 'refs/heads/master' into text-tool | Armen Kesablyan | 2012-02-13 | |
| | |\ | ||||
| | * | | Fixed binding to font size dropdown | Armen Kesablyan | 2012-02-13 | |
| | | | | ||||
| | * | | Fixed Color on text edit. Also Fixed Indent & Outdent button. toggle bullet ↵ | Armen Kesablyan | 2012-02-13 | |
| | | | | | | | | | | | | | and numbered now bound to text tool | |||
| * | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-10 | |
| |\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html js/stage/stage.reel/stage.html | |||
| | * | | Merge branch 'text-tool' of https://github.com/dhg637/ninja-internal into ↵ | Valerio Virgillito | 2012-02-09 | |
| | |\| | | | | | | | | | | feature-branch | |||
| | | * | More Text Tool Updates | Armen Kesablyan | 2012-02-09 | |
| | | | | ||||
| | | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | Armen Kesablyan | 2012-02-07 | |
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | text-tool Conflicts: _scss/compass_app_log.txt css/ninja.css | |||
| | | * | | Refactored rich text editor location | Armen Kesablyan | 2012-02-07 | |
| | | | | | ||||
| | | * | | Initial Text tool completion. | Armen Kesablyan | 2012-02-07 | |
| | | | | | ||||
| * | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-09 | |
| |\| | | | ||||
| | * | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-02-08 | |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/helper-classes/RDGE/GLWorld.js js/helper-classes/RDGE/MaterialsLibrary.js | |||
| | * \ \ \ | Merge branch 'master' into pentool | Pushkar Joshi | 2012-02-07 | |
| | |\ \ \ \ | | | |_|/ | | |/| | | ||||
| | * | | | | missed a couple of pen tool property files on last checkin | Pushkar Joshi | 2012-01-30 | |
| | | |_|/ | |/| | | ||||
| * | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-08 | |
| |\ \ \ \ | | |_|/ | |/| | | ||||
| | * | | | Merge pull request #21 from mencio/pi_bugs | Valerio Virgillito | 2012-02-08 | |
| | |\ \ \ | | | | | | | | | | | Pi bugs fixes for 964, 616, 1084 | |||
| | | * | | | IKNINJA - 1084: Fixing the custom tag. | Valerio Virgillito | 2012-02-07 | |
| | | | |/ | | |/| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | * | | | Added ability to toggle combobox's visibility so we can show/hide materials ↵ | Nivesh Rajbhandari | 2012-02-07 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | comboboxes in the tool options. 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> | |||
| * | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-02 | |
| |\| | | | | | | | | | | | | | | | | | Conflicts: .gitignore js/ninja.reel/ninja.js | |||
| | * | | Updating Shapes PI to support corner radii. Also fixed PI bug where we were ↵ | Nivesh Rajbhandari | 2012-02-02 | |
| | |/ | | | | | | | | | | | always updating custom section 0. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * / | Merged old FileIO | Jose Antonio Marquez | 2012-01-27 | |
| |/ | ||||
| * | First commit of Ninja to ninja-internal | Pierre Frisch | 2012-01-27 | |
| Signed-off-by: Valerio Virgillito <rmwh84@motorola.com> | ||||