| Commit message (Collapse) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| | | * | | | 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 branch 'refs/heads/master' into stage-color | Valerio Virgillito | 2012-02-13 | |
| | | |\ \ \ \ | ||||
| | | * | | | | | 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 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 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/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-13 | |
| |\| | | | | | | | | ||||
| | * | | | | | | | | Bug Fixes | Jose Antonio Marquez | 2012-02-13 | |
| | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IKNINJA-1101 IKNINJA-1079 IKNINJA-1144 | |||
| * | | | | | | | | Save 'code' view files | Jose Antonio Marquez | 2012-02-13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added functionality (temp) to save files in code view. | |||
| * | | | | | | | | File Save (with CSS styles) | Jose Antonio Marquez | 2012-02-12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Temp fix for saving styles in <style> of HTML document. | |||
| * | | | | | | | | File Save (HTML only) | Jose Antonio Marquez | 2012-02-12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the ability to save an HTML file from design view, need to add CSS detection and saving (of styles in <style> only). Also need to add 'Save All' for all file attached to the HTML file. | |||
| * | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-11 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html | |||
| | * | | | | | | | 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 | |
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||