| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Armen Kesablyan | 2012-02-14 |
| |\ | |||
| | * | Merge pull request #39 from mencio/montage-overrides | Valerio Virgillito | 2012-02-13 |
| | |\ | | | | | | | Adding a montage override sass file. Overriding the default css for montage popups. | ||
| | | * | Adding a montage override sass file. Overriding the default css for montage ↵ | Valerio Virgillito | 2012-02-13 |
| | |/ | | | | | | | | | | | popups. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | Merge pull request #38 from ericguzman/StylesControllerUpdates | Valerio Virgillito | 2012-02-13 |
| | |\ | | | | | | | Styles controller updates | ||
| | | * | Merge branch 'refs/heads/master' into StylesControllerUpdates | Eric Guzman | 2012-02-13 |
| | | |\ | | |/ | |/| | | | | | | | Conflicts: js/controllers/styles-controller.js | ||
| | * | | Merge pull request #37 from mencio/stage-color | Valerio Virgillito | 2012-02-13 |
| | |\ \ | | | | | | | | | Stage color: Adding the stage background color chip to the stage PI | ||
| | | * \ | Merge branch 'refs/heads/master' into stage-color | Valerio Virgillito | 2012-02-13 |
| | | |\ \ | | |/ / | |/| | | |||
| | * | | | Merge pull request #36 from mayhewinator/WorkingBranch | Valerio Virgillito | 2012-02-13 |
| | |\ \ \ | | | | | | | | | | | Final Splash Screen Art | ||
| | | * \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | John Mayhew | 2012-02-13 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | WorkingBranch | ||
| | | * | | | | implemented finalized splash screen | John Mayhew | 2012-02-13 |
| | | | | | | | |||
| | * | | | | | Merge pull request #34 from ericguzman/TreeComponents | Valerio Virgillito | 2012-02-13 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Tree components - updating the ninja branch/leaf | ||
| | | * | | | | | Ninja leaf - remove console lot | Eric Guzman | 2012-02-13 |
| | | | | | | | | |||
| | | * | | | | | Merge branch 'refs/heads/master' into TreeComponents | Eric Guzman | 2012-02-13 |
| | | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | |||
| | | * | | | | | Tree Components - Change the way delegate methods are called | Eric Guzman | 2012-02-13 |
| | | | | | | | | |||
| | | | | | * | | Merge branch 'refs/heads/master' into stage-color | Valerio Virgillito | 2012-02-13 |
| | | | | | |\ \ | | |_|_|_|/ / | |/| | | | | | |||
| | * | | | | | | Bug Fixes | Jose Antonio Marquez | 2012-02-13 |
| | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | IKNINJA-1101 IKNINJA-1079 IKNINJA-1144 | ||
| | | | | * | | Cleaning up the stage background color chip. | Valerio Virgillito | 2012-02-13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | | | * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | Valerio Virgillito | 2012-02-12 |
| | | | | |\ \ | | |_|_|/ / | |/| | | | | | | | | | | stage-color | ||
| | | | | * | | initial color chip for the stage | Valerio Virgillito | 2012-02-10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | | | | * | Styles Controller - Separate css animation rule getters | Eric Guzman | 2012-02-13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | To add document- and sheet-specific getters. | ||
| | | | | | * | Merge branch 'refs/heads/master' into StylesControllerUpdates | Eric Guzman | 2012-02-08 |
| | | | | | |\ | |||
| | | | | | * | | Styles Controller - added methods to get keyframe animation rules | Eric Guzman | 2012-02-08 |
| | | | | | | | | |||
| * | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Armen Kesablyan | 2012-02-13 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: css/ninja.css js/stage/stage.reel/stage.html js/tools/TextTool.js node_modules/labs/rich-text-editor.reel/rich-text-editor.css node_modules/labs/rich-text-editor.reel/rich-text-editor.html node_modules/labs/rich-text-editor.reel/rich-text-editor.js node_modules/labs/rich-text-editor.reel/rich-text-resizer.js node_modules/labs/rich-text-editor.reel/rich-text-sanitizer.js Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | * | | | | | | Merge pull request #32 from mayhewinator/WorkingBranch | mayhewinator | 2012-02-10 |
| | |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | Updates for splash screen, menu items and implemented some of the new help menu items | ||
| | | * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | John Mayhew | 2012-02-10 |
| | | |\ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | WorkingBranch | ||
| | * | | | | | | Merge pull request #31 from mqg734/WebGLFixes | Valerio Virgillito | 2012-02-10 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Merging WebGL fixes | ||
| | | * \ \ \ \ \ | Merge branch 'refs/heads/ninja-internal' into WebGLFixes | Nivesh Rajbhandari | 2012-02-10 |
| | | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||
| | | * | | | | | | Support export/import of GLLine data. | Nivesh Rajbhandari | 2012-02-10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | | | | Removing some console logs. I kept in the ones that signify error cases. | Nivesh Rajbhandari | 2012-02-09 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | | | | Fixed switching between webGL and canvas 2d modes. | Nivesh Rajbhandari | 2012-02-09 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | | | | Updated linear and radial gradient materials import/export routines. | Nivesh Rajbhandari | 2012-02-09 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | | | | Merging changes for rectangle drawing. | Nivesh Rajbhandari | 2012-02-09 |
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | | * | | | | | | Changed the rendering for canvas 2D rectangle. | hwc487 | 2012-02-08 |
| | | | | | | | | | | |||
| | | | * | | | | | | Reversed the orientation of one of the triangles for WebGL rendering. | hwc487 | 2012-02-08 |
| | | | | | | | | | | |||
| | | | * | | | | | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into working | hwc487 | 2012-02-08 |
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/helper-classes/RDGE/Materials/FlatMaterial.js | ||
| | | | * \ \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-02-08 |
| | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | working | ||
| | | | * | | | | | | | | Removed unused rdge files from the compiler. | hwc487 | 2012-02-08 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | switched the preloader to use the compiled version of rdge Updated the rdge binary. | ||
| | | | * | | | | | | | | Fixed context switching problems in rdge | hwc487 | 2012-02-08 |
| | | | | | | | | | | | | |||
| | | | * | | | | | | | | 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 | ||
| | | | * | | | | | | | | | test code for deformation shader | hwc487 | 2012-02-07 |
| | | | | | | | | | | | | | |||
| | | | * | | | | | | | | | Enhanced the overlap test for the selection tool marquee select. | hwc487 | 2012-02-06 |
| | | | | | | | | | | | | | |||
| | | | * | | | | | | | | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into working | hwc487 | 2012-02-06 |
| | | | |\ \ \ \ \ \ \ \ \ | |||
| | | | * | | | | | | | | | | Removed an unnecessary (and incorrect) snapping calculation. | hwc487 | 2012-02-06 |
| | | | | | | | | | | | | | | |||
| | | | * | | | | | | | | | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into working | hwc487 | 2012-02-03 |
| | | | |\ \ \ \ \ \ \ \ \ \ | |||
| | | | * | | | | | | | | | | | Added a counter to the renderer that tracks the number of unloaded texture maps. | hwc487 | 2012-02-03 |
| | | | |||