aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* added a notification procedure to worlds.hwc4872012-03-28
* texture abstraction integrationhwc4872012-03-27
* Integrated texture wrapper into pulse and bump-metal materials.hwc4872012-03-27
* Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-03-27
|\
| * Merge pull request #142 from joseeight/ColorValerio Virgillito2012-03-26
| |\
| | * Fix: IKNINJA-1355Jose Antonio Marquez2012-03-26
| | * Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-03-26
| | |\
| | * | Fix: IKNINJA-1362Jose Antonio Marquez2012-03-26
| * | | Merge pull request #141 from mqg734/WebGL-Animation-CheckBoxValerio Virgillito2012-03-24
| |\ \ \
| | * | | Check for a authortime animation setting in the draw routine for WebGL.Nivesh Rajbhandari2012-03-24
| | * | | Merge branch 'refs/heads/montage-integration' into WebGL-Animation-CheckBoxNivesh Rajbhandari2012-03-24
| | |\ \ \ | | |/ / / | |/| | |
| | * | | Check for a authortime animation setting in the draw routine for WebGL.Nivesh Rajbhandari2012-03-23
* | | | | WebGL & Canvas as data for texture maps.hwc4872012-03-26
* | | | | Merge branch 'montage-integration' of github.com:Motorola-Mobility/ninja-inte...hwc4872012-03-24
|\| | | |
| * | | | Merge pull request #140 from ericmueller/integrationValerio Virgillito2012-03-23
| |\ \ \ \
| | * | | | Fixed a problem switching from 3D to 2D and back to 3D.hwc4872012-03-23
| | * | | | Merge branch 'montage-integration' of github.com:Motorola-Mobility/ninja-inte...hwc4872012-03-23
| | |\ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #138 from joseeight/FileIO-Montage-ComponentsValerio Virgillito2012-03-23
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'refs/heads/Ninja-Montage-Integration' into FileIO-Montage-Compo...Jose Antonio Marquez2012-03-23
| | |\ \ \ \ \
| | * | | | | | Removing m-js components I/O and fix for webGLJose Antonio Marquez2012-03-23
| | * | | | | | Merge branch 'refs/heads/Ninja-Montage-Integration' into FileIO-Montage-Compo...Jose Antonio Marquez2012-03-22
| | |\ \ \ \ \ \
| | * | | | | | | Adding Ninja URL method to io-mediatorJose Antonio Marquez2012-03-22
| | * | | | | | | Merge branch 'refs/heads/Ninja-Montage-Integration' into FileIO-Montage-Compo...Jose Antonio Marquez2012-03-22
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Montage-Integration' into FileIO-Montage-Compo...Jose Antonio Marquez2012-03-22
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Adding firstDraw event to components addedJose Antonio Marquez2012-03-22
| | * | | | | | | | | Merge branch 'refs/heads/Ninja-Montage-Integration' into FileIO-Montage-Compo...Jose Antonio Marquez2012-03-21
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Montage-Integration' into FileIO-Montage-Compo...Jose Antonio Marquez2012-03-21
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into FileIO-Montage-ComponentsJose Antonio Marquez2012-03-21
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | |
| * | | | | | | | | | | | Merge pull request #137 from ericguzman/montage-integrationValerio Virgillito2012-03-23
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Presets - fixed preset group name ("2D")Eric Guzman2012-03-23
| * | | | | | | | | | | | Merge branch 'montage-integration' of github.com:ericguzman/ninja-internal in...Valerio Virgillito2012-03-23
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Feed Reader - Change default to timer so it matches componentEric Guzman2012-03-23
| | * | | | | | | | | | | Presets Panel - Add slide/fade out animationEric Guzman2012-03-23
| * | | | | | | | | | | | Merge pull request #135 from mqg734/WebGL-Animation-CheckBoxValerio Virgillito2012-03-23
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | / / | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| | * | | | | | | | | | Respect play/pause WebGL animation when saving files and re-rendering caused ...Nivesh Rajbhandari2012-03-23
| |/ / / / / / / / / /
| * | | | | | | | | | Merge pull request #134 from mqg734/WebGL-Animation-CheckBoxValerio Virgillito2012-03-22
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Adding enabled/disabled support for PI's checkbox control.Nivesh Rajbhandari2012-03-22
| * | | | | | | | | | | Merge pull request #133 from mqg734/WebGL-Animation-CheckBoxValerio Virgillito2012-03-22
| |\| | | | | | | | | |
| | * | | | | | | | | | Start WebGL animation during live preview. And set WebGL animation back to us...Nivesh Rajbhandari2012-03-22
| | * | | | | | | | | | Adding checkbox in PI to start/stop WebGL animation preview.Nivesh Rajbhandari2012-03-22
| * | | | | | | | | | | Merge branch 'montage-integration' of github.com:Motorola-Mobility/ninja-inte...Valerio Virgillito2012-03-22
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge branch 'montage-integration' of github.com:Motorola-Mobility/ninja-inte...Valerio Virgillito2012-03-22
| | |\| | | | | | | | |
| * | | | | | | | | | | Merge branch 'montage-integration' of github.com:Motorola-Mobility/ninja-inte...Valerio Virgillito2012-03-22
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| / / / / / / / / / | | |/ / / / / / / / /
| | * | | | | | | | | fixing the shape properties border bindings.Valerio Virgillito2012-03-22
| * | | | | | | | | | fixing the shape properties border bindings.Valerio Virgillito2012-03-22
| |/ / / / / / / / /
| * | | | | | | | | Squashed commit of the following GL integrationValerio Virgillito2012-03-22
| * | | | | | | | | Fixed the lock button for the shape properties barValerio Virgillito2012-03-22
| * | | | | | | | | Adding a select for the feed reader display modeValerio Virgillito2012-03-22
| | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montag...Valerio Virgillito2012-03-22
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | Update Youtube Channel to work in Chrome BetaStuart Knightley2012-03-22