| Commit message (Collapse) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| | | | | | | | | | * | | | Presets - Remove style transition when transition doesn't start. Also added ↵ | Eric Guzman | 2012-03-29 | |
| | | | | | |_|_|_|/ / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | temporary fix for aggregating animations (from timeline/presets) | |||
| | | | | * | | | | | | | Text Tool - Remove inline style from user document | Eric Guzman | 2012-03-27 | |
| | | | | | | | | | | | | ||||
| | | | | * | | | | | | | Presets Controller - Removing test background from transition class | Eric Guzman | 2012-03-27 | |
| | | | | | | | | | | | | ||||
| | | | | * | | | | | | | 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 ↵ | Eric Guzman | 2012-03-22 | |
| | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | panel code | |||
| | | | | | | | | | * | IKNINJA-764 - The Local/Global options are not in synced with both 3D object ↵ | Nivesh Rajbhandari | 2012-03-27 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rotate tool and 3D object translate tool. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | | | | | | | | | * | IKNINJA-1378 - Line Tool's drawing preview changes tool canvas's line style. | Nivesh Rajbhandari | 2012-03-27 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | | | | | | | | | * | Merge branch 'refs/heads/ninja-internal' into WebGLMaterials | Nivesh Rajbhandari | 2012-03-27 | |
| | | | | | | | | | |\ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | ||||
| * | | | | | | | | | | Merge pull request #146 from mqg734/WebGLFileIO | Valerio Virgillito | 2012-03-27 | |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Fixes for Line Tool and EyeDropper tool runtime error. | |||
| | * \ \ \ \ \ \ \ \ \ | 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 | |
| |\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | WebGL Fixes and Minor EyeDropper Tool Fixes. | |||
| | | * | | | | | | | | | Reverting change for IKNinja-1355 because it is causing line tool to fail. | Nivesh Rajbhandari | 2012-03-27 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | | * | | | | | | | | | Check for webGLWorld before calling draw. | Nivesh Rajbhandari | 2012-03-27 | |
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | | | | | | | | | * | Check for Viewport case in StageController styles lookup. | Nivesh Rajbhandari | 2012-03-27 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | | | | | | | | | * | Build elements' properties3d values on file open. | Nivesh Rajbhandari | 2012-03-27 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | | | | | | | | | * | Merge branch 'refs/heads/WebGLFileIO' into WebGLMaterials | 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 ↵ | Nivesh Rajbhandari | 2012-03-26 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | chrome-preview. Also fixed Raiders material not showing in the PI or working during Chrome Preview. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | * | | | | | | | | | Handle no-color/null. | Nivesh Rajbhandari | 2012-03-26 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | * | | | | | | | | | Updating EyeDropper tool to support new JSON data format for WebGL. | Nivesh Rajbhandari | 2012-03-26 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | | | | | | | | | * | Merge branch 'refs/heads/ninja-internal' into WebGLMaterials | Nivesh Rajbhandari | 2012-03-27 | |
| | | | | | | | | | |\ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | | | | | | | | | | Merge pull request #142 from joseeight/Color | Valerio Virgillito | 2012-03-26 | |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | Color Bug Fix | |||
| | * | | | | | | | | | 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 | |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Changing where we check for _previewAnimation flag. | |||
| | * | | | | | | | | | | Check for a authortime animation setting in the draw routine for WebGL. | Nivesh Rajbhandari | 2012-03-24 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | * | | | | | | | | | | 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 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Integration | |||
| | * | | | | | | | | | | | Fixed a problem switching from 3D to 2D and back to 3D. | hwc487 | 2012-03-23 | |
| | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | Merge branch 'montage-integration' of ↵ | hwc487 | 2012-03-23 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into integration Conflicts: js/io/system/ninjalibrary.json | |||
| * | | | | | | | | | | | | Merge pull request #138 from joseeight/FileIO-Montage-Components | Valerio Virgillito | 2012-03-23 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | I/O Fixes | |||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Montage-Integration' into ↵ | Jose Antonio Marquez | 2012-03-23 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||