aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'montage-integration' of ↵hwc4872012-03-24
|\ | | | | | | github.com:Motorola-Mobility/ninja-internal into Textures
| * Merge pull request #140 from ericmueller/integrationValerio Virgillito2012-03-23
| |\ | | | | | | Integration
| | * Fixed a problem switching from 3D to 2D and back to 3D.hwc4872012-03-23
| | |
| | * Merge branch 'montage-integration' of ↵hwc4872012-03-23
| | |\ | | |/ | |/| | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into integration Conflicts: js/io/system/ninjalibrary.json
| * | Merge pull request #138 from joseeight/FileIO-Montage-ComponentsValerio Virgillito2012-03-23
| |\ \ | | | | | | | | I/O Fixes
| | * \ Merge branch 'refs/heads/Ninja-Montage-Integration' into ↵Jose Antonio Marquez2012-03-23
| | |\ \ | | | | | | | | | | | | | | | FileIO-Montage-Components
| | * | | Removing m-js components I/O and fix for webGLJose Antonio Marquez2012-03-23
| | | | | | | | | | | | | | | | | | | | Removed saving m-js components as new components broke I/O when present. Also made a fix for checking length of webGL array since first item now is non-user data. (That is to be removed)
| | * | | Merge branch 'refs/heads/Ninja-Montage-Integration' into ↵Jose Antonio Marquez2012-03-22
| | |\ \ \ | | | | | | | | | | | | | | | | | | FileIO-Montage-Components
| | * | | | Adding Ninja URL method to io-mediatorJose Antonio Marquez2012-03-22
| | | | | |
| | * | | | Merge branch 'refs/heads/Ninja-Montage-Integration' into ↵Jose Antonio Marquez2012-03-22
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | FileIO-Montage-Components
| | * \ \ \ \ Merge branch 'refs/heads/Ninja-Montage-Integration' into ↵Jose Antonio Marquez2012-03-22
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | FileIO-Montage-Components
| | * | | | | | Adding firstDraw event to components addedJose Antonio Marquez2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow us to re-parse the document for styles added dynamically.
| | * | | | | | Merge branch 'refs/heads/Ninja-Montage-Integration' into ↵Jose Antonio Marquez2012-03-21
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | FileIO-Montage-Components
| | * \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Montage-Integration' into ↵Jose Antonio Marquez2012-03-21
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FileIO-Montage-Components
| | * \ \ \ \ \ \ \ 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
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | Preset Heading - "3D" to "2D"
| | * | | | | | | | | Presets - fixed preset group name ("2D")Eric Guzman2012-03-23
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'montage-integration' of github.com:ericguzman/ninja-internal ↵Valerio Virgillito2012-03-23
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into montage-integration
| | * | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | We have to add a flag in GLWorld so that any changes in geometry that forces a render will only render once.
| | * | | | | | | | | Respect play/pause WebGL animation when saving files and re-rendering caused ↵Nivesh Rajbhandari2012-03-23
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by geometry changes. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | | Merge pull request #134 from mqg734/WebGL-Animation-CheckBoxValerio Virgillito2012-03-22
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Adding enabled/disabled support for PI"s checkbox controls, and using that capability for WebGL animate checkbox.
| | * | | | | | | | | Adding enabled/disabled support for PI's checkbox control.Nivesh Rajbhandari2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | | | Merge pull request #133 from mqg734/WebGL-Animation-CheckBoxValerio Virgillito2012-03-22
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Web gl animation check box
| | * | | | | | | | | Start WebGL animation during live preview. And set WebGL animation back to ↵Nivesh Rajbhandari2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | user preference when closing live preview. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | | | | Adding checkbox in PI to start/stop WebGL animation preview.Nivesh Rajbhandari2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | | | Merge branch 'montage-integration' of ↵Valerio Virgillito2012-03-22
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into montage-integration
| | * | | | | | | | | Merge branch 'montage-integration' of ↵Valerio Virgillito2012-03-22
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into montage-integration
| * | | | | | | | | | Merge branch 'montage-integration' of ↵Valerio Virgillito2012-03-22
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| / / / / / / / / | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into montage-integration Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | | | fixing the shape properties border bindings.Valerio Virgillito2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | | fixing the shape properties border bindings.Valerio Virgillito2012-03-22
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | Squashed commit of the following GL integrationValerio Virgillito2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | Fixed the lock button for the shape properties barValerio Virgillito2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | Adding a select for the feed reader display modeValerio Virgillito2012-03-22
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Valerio Virgillito2012-03-22
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | montage-integration
| | * | | | | | Update Youtube Channel to work in Chrome BetaStuart Knightley2012-03-22
| | | | | | | |
| | * | | | | | Add scale animation back to youtube channelStuart Knightley2012-03-21
| | | | | | | | | | | | | | | | | | | | | |