| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into working | hwc487 | 2012-02-08 |
| |\ | | | | | | | | | Conflicts: js/helper-classes/RDGE/Materials/FlatMaterial.js | ||
| | * | Fixed radio button to update 3d values when switching from local to global ↵ | Nivesh Rajbhandari | 2012-02-08 |
| | | | | | | | | | | | | | and vice-versa. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into working | hwc487 | 2012-02-07 |
| |\| | | | | | | | | | | | | | Conflicts: js/helper-classes/RDGE/GLRectangle.js js/helper-classes/RDGE/GLWorld.js js/helper-classes/RDGE/MaterialsLibrary.js | ||
| | * | Fixed PI to support WebGL materials. | Nivesh Rajbhandari | 2012-02-07 |
| | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Add enabled property for ComboBox to support enabling/disabling materials ↵ | Nivesh Rajbhandari | 2012-02-06 |
| | | | | | | | | | | | | | dropdowns in the PI. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into working | hwc487 | 2012-02-06 |
| |\| | |||
| | * | We were only updating the first custom section in the PI. | Nivesh Rajbhandari | 2012-02-03 |
| | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into working | hwc487 | 2012-02-03 |
| |\| | |||
| | * | Update grid and planes when elementChange event signifies the "matrix", ↵ | Nivesh Rajbhandari | 2012-02-03 |
| | | | | | | | | | | | | | "left", "top", "width" or "height" properties have changed. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Merge branch 'refs/heads/NiveshColor' into ToolFixes | Nivesh Rajbhandari | 2012-02-03 |
| | |\ | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | Removed border special-casing from PI since the mediator now handles this ↵ | Nivesh Rajbhandari | 2012-02-01 |
| | | | | | | | | | | | | | | | | | | | generically. Updated mediator's set stroke routine to use the setColor routine. 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> | ||
| | * | | Merge branch 'refs/heads/master' into ToolFixes | Nivesh Rajbhandari | 2012-02-03 |
| | |\ \ | |||
| | * | | | Update PI when element is changed by one of the tools. | Nivesh Rajbhandari | 2012-02-02 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-02-03 |
| |\ \ \ \ | | |/ / | |/| | | | | | | working | ||
| | * | | | Merge branch 'montage-integration' into staging | Valerio Virgillito | 2012-02-02 |
| | |\ \ \ | |||
| | | * | | | Fixed the color popups to work with m-js v6 | Jose Antonio Marquez | 2012-02-02 |
| | | | | | | | | | | | | | | | | | | | | | Removed the wrapper DIV, now it's more direct to create and insert the content in the popups. Changes created DOM exceptions, so it had to be modified. | ||
| | | * | | | upgrading to Montage v0.6 | Valerio Virgillito | 2012-02-02 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | Fixes for montage integration | Valerio Virgillito | 2012-02-01 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | upgrading to Montage v0.6 | Valerio Virgillito | 2012-02-02 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | Fixes for montage integration | Valerio Virgillito | 2012-02-02 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | Merge pull request #12 from mqg734/ToolFixes | Valerio Virgillito | 2012-02-02 |
| | |\ \ \ \ | | | |/ / | | |/| | | Merged pan and zoom tool and 3d stage orientation fixes. Also updated PI to support shapes properties. | ||
| | * | | | | Delete unneeded compass log file (IKNINJA 1101). | Jon Reid | 2012-02-01 |
| | | |/ / | |/| | | | | | | | | | | | | | | Update base styles for better colors on HTML buttons. Change project panel so it shows no project by default. | ||
| | * | | | IKNINJA-1083 | Jose Antonio Marquez | 2012-02-01 |
| | | | | | | | | | | | | | | | | | Fixing minor bug with no color breaking on null alpha value. | ||
| * | | | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into working | hwc487 | 2012-02-02 |
| |\ \ \ \ | | |/ / | |/| | | |||
| | * | | | 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> | ||
| * | | | | added some additional shaders | hwc487 | 2012-02-02 |
| | | | | | |||
| * | | | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into working | hwc487 | 2012-02-01 |
| |\| | | | |||
| | * | | | Fixing 3d section of the PI. | Nivesh Rajbhandari | 2012-01-31 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | Support stage in PI's 3d section. | Nivesh Rajbhandari | 2012-01-31 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | Merging Jose's colorchip change. | Nivesh Rajbhandari | 2012-01-31 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | CSSPanel Updates - Add new original CSS error icon | Eric Guzman | 2012-01-30 |
| | | | | | |||
| * | | | | Merge branch 'staging' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-01-30 |
| |\ \ \ \ | | |_|/ | |/| | | | | | | working | ||
| | * | | | IKNINJA-1083 | Jose Antonio Marquez | 2012-01-30 |
| | | |/ | |/| | | | | | | | Fixing minor bug with no color breaking on null alpha value. | ||
| | * | | CSSPanel Updates - Add new original CSS error icon | Eric Guzman | 2012-01-30 |
| | |/ | |||
| * / | updated from old repo | hwc487 | 2012-01-27 |
| |/ | |||
| * | First commit of Ninja to ninja-internal | Pierre Frisch | 2012-01-27 |
| Signed-off-by: Valerio Virgillito <rmwh84@motorola.com> | |||