Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
| | * | | | | | | | | | | | | | Merge branch 'refs/heads/master' into PresetsPI | Eric Guzman | 2012-03-27 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | Presets Panel - Adding presets controller to serialization | Eric Guzman | 2012-03-22 | |
| | * | | | | | | | | | | | | | Presets Panel - Adding presets controller and removing functionality from pan... | Eric Guzman | 2012-03-22 | |
| | | |/ / / / / / / / / / / | | |/| | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | Merge pull request #139 from dhg637/ResizersRefactoring | Valerio Virgillito | 2012-03-28 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | minor glitch in calculations in snap code | Armen Kesablyan | 2012-03-23 | |
| | * | | | | | | | | | | | | Removing old code | Armen Kesablyan | 2012-03-23 | |
| | * | | | | | | | | | | | | Resizers updated | Armen Kesablyan | 2012-03-23 | |
| | * | | | | | | | | | | | | Merge branch 'refs/heads/master' into DataBinding | Armen Kesablyan | 2012-03-22 | |
| | |\| | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | Updated Resizers for Panels and timeline | Armen Kesablyan | 2012-03-22 | |
| | * | | | | | | | | | | | | Merge branch 'refs/heads/master' into DataBinding | Armen Kesablyan | 2012-03-19 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | | | | Initial Data Binding Mediator | Armen Kesablyan | 2012-03-15 | |
| | | |_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | ||||
* | / | | | | | | | | | | | | - Highlight Matching bracket | Ananya Sen | 2012-03-27 | |
|/ / / / / / / / / / / / / | ||||
* | | | | | | | | | | | | | Merge pull request #146 from mqg734/WebGLFileIO | Valerio Virgillito | 2012-03-27 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/ninja-internal' into WebGLFileIO | Nivesh Rajbhandari | 2012-03-27 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | Merge pull request #144 from mqg734/WebGLFileIO | Valerio Virgillito | 2012-03-27 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | / / / | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | ||||
| | * | | | | | | | | | | | Reverting change for IKNinja-1355 because it is causing line tool to fail. | Nivesh Rajbhandari | 2012-03-27 | |
| | * | | | | | | | | | | | Check for webGLWorld before calling draw. | Nivesh Rajbhandari | 2012-03-27 | |
| |/ / / / / / / / / / / | ||||
| * | | | | | | | | | | | Merge branch 'refs/heads/montage-integration' into WebGLFileIO | Nivesh Rajbhandari | 2012-03-26 | |
|/| | | | | | | | | | | | ||||
| * | | | | | | | | | | | Fixed issue with WebGL materials not working after file-save or chrome-previe... | Nivesh Rajbhandari | 2012-03-26 | |
| * | | | | | | | | | | | Handle no-color/null. | Nivesh Rajbhandari | 2012-03-26 | |
| * | | | | | | | | | | | Updating EyeDropper tool to support new JSON data format for WebGL. | Nivesh Rajbhandari | 2012-03-26 | |
* | | | | | | | | | | | | Merge pull request #142 from joseeight/Color | Valerio Virgillito | 2012-03-26 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||
| * | | | | | | | | | | | Fix: IKNINJA-1355 | Jose Antonio Marquez | 2012-03-26 | |
| * | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-03-26 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | ||||
| * | | | | | | | | | | | Fix: IKNINJA-1362 | Jose Antonio Marquez | 2012-03-26 | |
* | | | | | | | | | | | | Merge pull request #141 from mqg734/WebGL-Animation-CheckBox | Valerio Virgillito | 2012-03-24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | Check for a authortime animation setting in the draw routine for WebGL. | Nivesh Rajbhandari | 2012-03-24 | |
| * | | | | | | | | | | | | Merge branch 'refs/heads/montage-integration' into WebGL-Animation-CheckBox | Nivesh Rajbhandari | 2012-03-24 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | Merge pull request #140 from ericmueller/integration | Valerio Virgillito | 2012-03-23 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | Fixed a problem switching from 3D to 2D and back to 3D. | hwc487 | 2012-03-23 | |
| * | | | | | | | | | | | | | Merge branch 'montage-integration' of github.com:Motorola-Mobility/ninja-inte... | hwc487 | 2012-03-23 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | Merge pull request #138 from joseeight/FileIO-Montage-Components | Valerio Virgillito | 2012-03-23 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Montage-Integration' into FileIO-Montage-Compo... | Jose Antonio Marquez | 2012-03-23 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | Removing m-js components I/O and fix for webGL | Jose Antonio Marquez | 2012-03-23 | |
| * | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Montage-Integration' into FileIO-Montage-Compo... | Jose Antonio Marquez | 2012-03-22 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | | Adding Ninja URL method to io-mediator | Jose Antonio Marquez | 2012-03-22 | |
| * | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Montage-Integration' into FileIO-Montage-Compo... | Jose Antonio Marquez | 2012-03-22 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Montage-Integration' into FileIO-Montage-Compo... | Jose Antonio Marquez | 2012-03-22 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | | | | Adding firstDraw event to components added | Jose Antonio Marquez | 2012-03-22 | |
| * | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Montage-Integration' into FileIO-Montage-Compo... | Jose Antonio Marquez | 2012-03-21 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Montage-Integration' into FileIO-Montage-Compo... | Jose Antonio Marquez | 2012-03-21 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into FileIO-Montage-Components | Jose Antonio Marquez | 2012-03-21 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #137 from ericguzman/montage-integration | Valerio Virgillito | 2012-03-23 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | | | | | Presets - fixed preset group name ("2D") | Eric Guzman | 2012-03-23 | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'montage-integration' of github.com:ericguzman/ninja-internal in... | Valerio Virgillito | 2012-03-23 | |
|\| | | | | | | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | | | | | Feed Reader - Change default to timer so it matches component | Eric Guzman | 2012-03-23 | |
| * | | | | | | | | | | | |