| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Normalize HTML doctype | Kris Kowal | 2012-07-06 |
| | | |||
| * | Remove byte order markers (BOM) | Kris Kowal | 2012-07-06 |
| | | |||
| * | Remove trailing spaces | Kris Kowal | 2012-07-06 |
| | | |||
| * | Remove trailing spaces | Kris Kowal | 2012-07-06 |
| | | |||
| * | Expand tabs | Kris Kowal | 2012-07-06 |
| | | |||
| * | Update copyright boilerplate | Kris Kowal | 2012-07-06 |
| | | |||
| * | Removed Flat material from the materials library | hwc487 | 2012-06-15 |
| | | |||
| * | Re-added Raiders material | hwc487 | 2012-06-15 |
| | | |||
| * | Re-added Paris material | hwc487 | 2012-06-15 |
| | | |||
| * | Added correct 'Cancel' behavior to the material editor | hwc487 | 2012-06-15 |
| | | |||
| * | Material changes through the popup editor can effect multiple material ↵ | hwc487 | 2012-06-15 |
| | | | | | instances within a single object. | ||
| * | Fix for line color. | hwc487 | 2012-06-14 |
| | | | | | Name change for all materials | ||
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-06-13 |
| |\ | | | | | | | Textures | ||
| | * | adding more missing properties to the serialization | Valerio Virgillito | 2012-06-12 |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | first iteration of adding serializable to ninja plus other changes to run ↵ | Valerio Virgillito | 2012-06-06 |
| | | | | | | | | | | | | | the latest montage Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | Disabled the add, copy, and delete buttons in the material library panel. ↵ | hwc487 | 2012-06-12 |
| | | | | | | | | | Also removed the Custom Materials section. | ||
| * | | material cleanup and rearchitecture | hwc487 | 2012-06-06 |
| | | | |||
| * | | Correction for texture paths. | hwc487 | 2012-06-01 |
| | | | |||
| * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-05-31 |
| |\| | | | | | | | | | | | | | Textures Conflicts: js/io/system/ninjalibrary.json | ||
| | * | Fixed Materials Popup to work with new changes to repetition bindings. | Nivesh Rajbhandari | 2012-05-18 |
| | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Squashed master into dom-architecture | Valerio Virgillito | 2012-05-16 |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | Parameters for twistVertex material | hwc487 | 2012-05-25 |
| | | | |||
| * | | Editable material properties | hwc487 | 2012-05-22 |
| | | | |||
| * | | Exposing parameters in Water Material | hwc487 | 2012-05-16 |
| | | | |||
| * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-05-11 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Textures Conflicts: js/lib/geom/geom-obj.js js/lib/geom/rectangle.js js/tools/TagTool.js | ||
| | * | | Removing outdated tree-controller. | Nivesh Rajbhandari | 2012-05-11 |
| | |/ | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Updating id to data-montage-id (and associated CSS, if necessary) in some of ↵ | Nivesh Rajbhandari | 2012-04-30 |
| | | | | | | | | | | | | | our custom ui controls (such as hottest, slider, etc.), materials panels and three-d section of the PI. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | Material editor | hwc487 | 2012-05-02 |
| | | | |||
| * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-04-27 |
| |\| | | | | | | | Textures | ||
| | * | Removing all "module" declarations and replaced with "prototype" in ↵ | John Mayhew | 2012-04-26 |
| | | | | | | | | | preparation for montage converting to the new "prototype" format fully | ||
| * | | Update materials to the new texture model. | hwc487 | 2012-04-26 |
| |/ | | | | Create local world for deleted source canvases | ||
| * | Fixed materials editor popup not refreshing correctly. | Nivesh Rajbhandari | 2012-04-16 |
| | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | Tweaking some styles in the materials popup. | Nivesh Rajbhandari | 2012-03-23 |
| | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | Deleting unused Materials.xml file since we converted to JSON. | Nivesh Rajbhandari | 2012-03-20 |
| | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | Support button control in Properties Panel and use them for edit fill and ↵ | Nivesh Rajbhandari | 2012-03-20 |
| | | | | | | | stroke material. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | Use new tree control in Materials panel. | Nivesh Rajbhandari | 2012-03-19 |
| | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | Replacing old button component with montage button component in our UI. | Nivesh Rajbhandari | 2012-03-19 |
| | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | 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> | ||
| * | Integrating canvas-2d and WebGL drawing fixes. Also adding back WebGL materials. | Nivesh Rajbhandari | 2012-02-22 |
| | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | Revert "Integrating canvas-2d drawing and WebGL fixes, including adding back ↵ | Nivesh Rajbhandari | 2012-02-22 |
| | | | | | | | WebGL materials." This reverts commit 96a0a8c916533eb5625816192ed38488f639326d. | ||
| * | Integrating canvas-2d drawing and WebGL fixes, including adding back WebGL ↵ | Nivesh Rajbhandari | 2012-02-22 |
| | | | | | | | materials. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | Updated Materials Library and Materials Editor Popup to work with latest ↵ | mqg734 | 2012-02-21 |
| | | | | | | | | | version of Montage. We had to change our css to not use id's. Also, updated the popup to use Montage's Popup component. It looks like bump material has a bug. So loading that material results in a runtime error. | ||
| * | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-11 |
| |\ | | | | | | | | | Conflicts: js/ninja.reel/ninja.html | ||
| | * | Merge branch 'refs/heads/ninja-internal' into WebGLFixes | Nivesh Rajbhandari | 2012-02-09 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/helper-classes/RDGE/GLMaterial.js js/helper-classes/RDGE/GLRectangle.js js/helper-classes/RDGE/GLWorld.js js/helper-classes/RDGE/Materials/FlatMaterial.js js/helper-classes/RDGE/Materials/IridescentScalesMaterial.js js/helper-classes/RDGE/Materials/JuliaMaterial.js js/helper-classes/RDGE/Materials/KeleidoscopeMaterial.js js/helper-classes/RDGE/Materials/MandelMaterial.js js/helper-classes/RDGE/Materials/PlasmaMaterial.js js/helper-classes/RDGE/Materials/PulseMaterial.js js/helper-classes/RDGE/Materials/RadialBlurMaterial.js js/helper-classes/RDGE/Materials/RadialGradientMaterial.js js/helper-classes/RDGE/Materials/TunnelMaterial.js js/helper-classes/RDGE/Materials/TwistMaterial.js js/helper-classes/RDGE/rdge-compiled.js js/helper-classes/RDGE/src/core/script/renderer.js js/panels/Materials/Materials.xml Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | Removed unused materials. | Nivesh Rajbhandari | 2012-02-09 |
| | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-09 |
| |\ \ \ | | |/ | |/| | |||
| | * | | updated from old repo | hwc487 | 2012-01-27 |
| | |/ | |||
| * / | 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> | |||