| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/master' into montage-v11-integration | Valerio Virgillito | 2012-06-20 |
| |\ | | | | | | | | | | | | | Conflicts: js/io/system/ninjalibrary.json Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | Merge branch 'IKNINJA-1754' of github.com:mencio/ninja-internal | Valerio Virgillito | 2012-06-19 |
| | |\ | | | | | | | | | | | | | | | | | | | Conflicts: js/components/menu/menu-entry.reel/menu-entry.js Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | IKNINJA 1754 menu not opening on hover | Valerio Virgillito | 2012-06-19 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | Merge branch 'bugfix-master' of github.com:ananyasen/ninja-internal | Valerio Virgillito | 2012-06-19 |
| | |\ \ | | |/ | |/| | |||
| | | * | Reverting last change since this is is being made in a different pull request. | Ananya Sen | 2012-06-19 |
| | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | * | Fix for IKNINJA-1754 (CLONE) - Menu Component: Hovering over another main ↵ | Ananya Sen | 2012-06-19 |
| | | | | | | | | | | | | | | | | | | | menu does not work when a main menu drop down is already displayed. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | * | Fixed - IKNINJA-1313 - File menu drop down should close when New File dialog ↵ | Ananya Sen | 2012-06-18 |
| | | | | | | | | | | | | | | | | | | | is opened Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | Merge pull request #298 from ericmueller/Textures | Valerio Virgillito | 2012-06-19 |
| | |\ \ | | | | | | | | | Textures | ||
| | | * | | Removed Flat material from the materials library | hwc487 | 2012-06-15 |
| | | | | | |||
| | | * | | Fixed a canvas 2D rendering problem. | hwc487 | 2012-06-15 |
| | | | | | |||
| | | * | | Fixed a problem with Uber shader where new values were getting clobbered by ↵ | hwc487 | 2012-06-15 |
| | | | | | | | | | | | | | | | | | old values. | ||
| | | * | | Runtime change for Paris material. | hwc487 | 2012-06-15 |
| | | | | | |||
| | | * | | Re-added Raiders material | hwc487 | 2012-06-15 |
| | | | | | |||
| | | * | | Re-added Paris material | hwc487 | 2012-06-15 |
| | | | | | |||
| | | * | | Fix for setting the specular map in the Uber shader. | 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. | ||
| | | * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-06-14 |
| | | |\ \ | | | | | | | | | | | | | | | | Textures | ||
| | | * | | | Fix for line color. | hwc487 | 2012-06-14 |
| | | | | | | | | | | | | | | | | | | | | | Name change for all materials | ||
| | | * | | | Fixed alphabetization of material names. | hwc487 | 2012-06-14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | Removed console output. Removed texture map field from Mandel material editor. | ||
| | | * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-06-14 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | Textures | ||
| | | * | | | | Fixes for runtime Taper material | hwc487 | 2012-06-13 |
| | | | | | | | |||
| | | * | | | | Oval stroke and fill material were stored in inverted order. | hwc487 | 2012-06-13 |
| | | | | | | | |||
| | | * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-06-13 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Textures | ||
| | | * | | | | | Material bug fixes - reset texture array. | hwc487 | 2012-06-13 |
| | | | | | | | | |||
| | | * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-06-13 |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures Conflicts: js/io/system/ninjalibrary.json | ||
| | | * | | | | | | Removed a console message. | hwc487 | 2012-06-13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed cloud material from the pulldown. | ||
| | | * | | | | | | Removed references to NJUtils | hwc487 | 2012-06-12 |
| | | | | | | | | | |||
| | | * | | | | | | Moved Flat material to the top of the drop down. | hwc487 | 2012-06-12 |
| | | | | | | | | | |||
| | | * | | | | | | Incremented RDGE library number | hwc487 | 2012-06-12 |
| | | | | | | | | | |||
| | | * | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-06-12 |
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures Conflicts: assets/canvas-runtime.js js/io/system/ninjalibrary.json js/mediators/element-mediator.js | ||
| | | * | | | | | | | Disabled the add, copy, and delete buttons in the material library panel. ↵ | hwc487 | 2012-06-12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also removed the Custom Materials section. | ||
| | | * | | | | | | | Runtime material fixes | hwc487 | 2012-06-12 |
| | | | | | | | | | | |||
| | | * | | | | | | | Material cleanup & bug fixes. | hwc487 | 2012-06-12 |
| | | | | | | | | | | |||
| | | * | | | | | | | Material cleanup | hwc487 | 2012-06-07 |
| | | | | | | | | | | |||
| | | * | | | | | | | material cleanup and rearchitecture | hwc487 | 2012-06-06 |
| | | | | | | | | | | |||
| | | * | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-06-05 |
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures | ||
| | | * | | | | | | | | Fixed RDGE render tree when PI changes causes node changes. | hwc487 | 2012-06-04 |
| | | | | | | | | | | | |||
| | | * | | | | | | | | Avoid throwing shader errors in the console for 'color' property at a base ↵ | hwc487 | 2012-06-04 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | class level. | ||
| | | * | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-06-04 |
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures | ||
| | | * \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-06-04 |
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures | ||
| | | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-06-01 |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures | ||
| | | * | | | | | | | | | | | 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 | ||
| | | * | | | | | | | | | | | | Added the flag shader to the runtime. | hwc487 | 2012-05-31 |
| | | | | | | | | | | | | | | | |||
| | | * | | | | | | | | | | | | Fixed authortime & runtime for twist vertex shader. | hwc487 | 2012-05-29 |
| | | | | | | | | | | | | | | | |||
| | | * | | | | | | | | | | | | Added mesh refinement to circles. | hwc487 | 2012-05-25 |
| | | | | | | | | | | | | | | | |||
| | | * | | | | | | | | | | | | Parameters for twistVertex material | hwc487 | 2012-05-25 |
| | | | | | | | | | | | | | | | |||
| | | * | | | | | | | | | | | | New functions on shape primitives. | hwc487 | 2012-05-25 |
| | | | | | | | | | | | | | | | |||
| | | * | | | | | | | | | | | | Fixed merge problems | hwc487 | 2012-05-23 |
| | | | | | | | | | | | | |||