aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge pull request #139 from dhg637/ResizersRefactoringValerio Virgillito2012-03-28
|\
| * minor glitch in calculations in snap codeArmen Kesablyan2012-03-23
| * Removing old codeArmen Kesablyan2012-03-23
| * Resizers updatedArmen Kesablyan2012-03-23
| * Merge branch 'refs/heads/master' into DataBindingArmen Kesablyan2012-03-22
| |\
| * | Updated Resizers for Panels and timelineArmen Kesablyan2012-03-22
| * | Merge branch 'refs/heads/master' into DataBindingArmen Kesablyan2012-03-19
| |\ \
| * | | Initial Data Binding MediatorArmen Kesablyan2012-03-15
* | | | Merge pull request #146 from mqg734/WebGLFileIOValerio Virgillito2012-03-27
|\ \ \ \
| * \ \ \ Merge branch 'refs/heads/ninja-internal' into WebGLFileIONivesh Rajbhandari2012-03-27
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #144 from mqg734/WebGLFileIOValerio Virgillito2012-03-27
|\ \ \ \ \
| | * | | | Reverting change for IKNinja-1355 because it is causing line tool to fail.Nivesh Rajbhandari2012-03-27
| | * | | | Check for webGLWorld before calling draw.Nivesh Rajbhandari2012-03-27
| |/ / / /
| * | | | Merge branch 'refs/heads/montage-integration' into WebGLFileIONivesh Rajbhandari2012-03-26
|/| | | |
| * | | | Fixed issue with WebGL materials not working after file-save or chrome-previe...Nivesh Rajbhandari2012-03-26
| * | | | Handle no-color/null.Nivesh Rajbhandari2012-03-26
| * | | | Updating EyeDropper tool to support new JSON data format for WebGL.Nivesh Rajbhandari2012-03-26
* | | | | 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
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| | | | | | | | | * | | | | Added Paris and Raiders materialshwc4872012-03-22
| | | | | | | | | * | | | | Synchronized material animation speed for pulse material between Ninja and ru...hwc4872012-03-21
| | | | | | | | | * | | | | fixes for Runtime line object.hwc4872012-03-21
| | | | | | | | | * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into int...hwc4872012-03-21
| | | | | | | | | |\ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Merge pull request #125 from ananyasen/IO-patch-ninja-internal-master-ananyaValerio Virgillito2012-03-21
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | fix for IKNINJA-1357 - Cannot create other file types such as css, json from ...Ananya Sen2012-03-16
| | | | | |_|_|_|_|_|_|_|/ | | | | |/| | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 18:03:15 +0000