Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-03-16 |
|\ | | | | | | | integration | ||
| * | Fixed element mediator, PI, and eye-dropper to handle different borders ↵ | Nivesh Rajbhandari | 2012-03-12 |
| | | | | | | | | | | | | sides and gradients. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | | Conversion to JSON based file IO for canvas2D and WebGL rendering | hwc487 | 2012-03-16 |
|/ | |||
* | Squashed commit of preload-fix into Master | Valerio Virgillito | 2012-03-06 |
| | | | | | | | - Requiring all the previously pre-loaded files - RDGE, Codemirror and gl-matrix are not included via a script tag. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | Chrome Preview | Jose Antonio Marquez | 2012-02-17 |
| | |||
* | Fixing the preset panel undefined property for the menu model. | Valerio Virgillito | 2012-02-16 |
| | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-08 |
|\ | |||
| * | 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> | ||
| * | Support use WebGL checkbox in the PI. | Nivesh Rajbhandari | 2012-02-06 |
| | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-06 |
|\| | |||
| * | Merge branch 'refs/heads/NiveshColor' into ToolFixes | Nivesh Rajbhandari | 2012-02-03 |
| |\ | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Updated color code in the PI to go through element mediator. | Nivesh Rajbhandari | 2012-02-01 |
| | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Updated color code to handle shapes. | Nivesh Rajbhandari | 2012-01-31 |
| | | | | | | | | | | | | 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 | ||
| * | | Fixed issue with elements not drawing in the correct plane. | Nivesh Rajbhandari | 2012-01-30 |
| | | | | | | | | | | | | | | | | | | When first adding an element, force the 3d model to update with the element's webkit transform values. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | Syncing stage view when rotating stage. | Nivesh Rajbhandari | 2012-01-30 |
| |/ | | | | | | | 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> |