| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-01-31 |
| |\ | | | | | | | working | ||
| | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Valerio Virgillito | 2012-01-30 |
| | |\ | |||
| | | * | Merge pull request #7 from mayhewinator/WorkingBranch | mayhewinator | 2012-01-30 |
| | | |\ | | | | | | | | | Removed unused images and reduced the size of the larger image files | ||
| | | | * | Removed unused images and reduced the size of the larger image files used ↵ | John Mayhew | 2012-01-30 |
| | | | | | | | | | | | | | | | | | for shaders. | ||
| | * | | | Merge branch 'core' of https://github.com/mencio/ninja-internal into mencio-core | Valerio Virgillito | 2012-01-30 |
| | |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | Conflicts: index.html Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | Adding browser check for Chrome and redirect page. | Valerio Virgillito | 2012-01-30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Adding a check for Google Chrome browser and a redirect page to download and install Chrome. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | Adding the version to the main Ninja reel component. | Valerio Virgillito | 2012-01-30 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <rmwh84@motorola.com> | ||
| | | * | | Code cleanup - Removed extra log. | Valerio Virgillito | 2012-01-30 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <rmwh84@motorola.com> | ||
| | | * | | Adding a version json object to Ninja | Valerio Virgillito | 2012-01-30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Versions object to start keeping track of versions for Ninja, Montage and eventually other dependencies. Loaded before montage to use in the splash screen. Signed-off-by: Valerio Virgillito <rmwh84@motorola.com> | ||
| | * | | | Adding the version to the main Ninja reel component. | Valerio Virgillito | 2012-01-31 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <rmwh84@motorola.com> | ||
| | * | | | Code cleanup - Removed extra log. | Valerio Virgillito | 2012-01-31 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <rmwh84@motorola.com> | ||
| | * | | | Adding a version json object to Ninja | Valerio Virgillito | 2012-01-31 |
| | |/ / | | | | | | | | | | | | | | | | | | | Versions object to start keeping track of versions for Ninja, Montage and eventually other dependencies. Loaded before montage to use in the splash screen. Signed-off-by: Valerio Virgillito <rmwh84@motorola.com> | ||
| * | | | 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 | ||
| | * \ \ | Merge pull request #5 from joseeight/Color | Valerio Virgillito | 2012-01-30 |
| | |\ \ \ | | |/ / | |/| | | IKNINJA-1083 | ||
| | | * | | IKNINJA-1083 | Jose Antonio Marquez | 2012-01-30 |
| | |/ / | | | | | | | | | | Fixing minor bug with no color breaking on null alpha value. | ||
| | * | | Merge pull request #4 from ericguzman/CSSPanelUpdates | Valerio Virgillito | 2012-01-30 |
| | |\ \ | | | | | | | | | CSSPanel Updates - Add new original CSS error icon | ||
| | | * | | CSSPanel Updates - Add new original CSS error icon | Eric Guzman | 2012-01-30 |
| | | | | | |||
| | * | | | Merge pull request #3 from mayhewinator/master | mayhewinator | 2012-01-30 |
| | |\ \ \ | | |/ / | |/| / | | |/ | Code cleanup. Removing unnecessary Thumbs.db file from our assets folder. | ||
| | | * | Removing unused file from assets/images. This file should not have been ↵ | John Mayhew | 2012-01-30 |
| | | | | | | | | | | | | | committed initially. | ||
| | * | | Merge pull request #2 from jreid01/pullrequest | Valerio Virgillito | 2012-01-27 |
| | |\ \ | | |/ | |/| | Fixes to radio button base styles. Comment clean-up. | ||
| | | * | Fixes to radio button base styles. Comment clean-up. | Jon Reid | 2012-01-27 |
| | | | | |||
| * | | | updated from old repo | hwc487 | 2012-01-27 |
| |/ / | |||
| * | | Merge pull request #1 from mqg734/ToolFixes | Valerio Virgillito | 2012-01-27 |
| |\ \ | |/ |/| | Fixed canvas width/height bug. | ||
| | * | Updated canvas controller to override setProperties so we don't set styles ↵ | Nivesh Rajbhandari | 2012-01-27 |
| |/ | | | | | | when updating width and height. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | Adding excluded list of files to gitignore and removed cloud/config.xml file. | Valerio Virgillito | 2012-01-27 |
| | | | | | Signed-off-by: Valerio Virgillito <rmwh84@motorola.com> | ||
| * | First commit of Ninja to ninja-internal | Pierre Frisch | 2012-01-27 |
| | | | | | Signed-off-by: Valerio Virgillito <rmwh84@motorola.com> | ||
| * | first commit | Pierre Frisch | 2011-12-22 |