aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| | * | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-15
| | |\| | | | |
| * | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO-Build-CandidateJose Antonio Marquez2012-03-15
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge branch 'refs/heads/FileIO-Integration' into FileIO-Build-CandidateJose Antonio Marquez2012-03-15
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Merge pull request #34 from ericmueller/integrationJose Antonio Marquez Russo2012-03-15
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | | * | | | | Corrections for Uber shader IOhwc4872012-03-14
| | | * | | | | Fixed BumpMetal materialhwc4872012-03-13
| | | * | | | | Merge pull request #5 from joseeight/FileIO-IntegrationEric2012-03-13
| | | |\ \ \ \ \
| | | * | | | | | Uber material changes for IOhwc4872012-03-12
| | | * | | | | | Merge branch 'integration' of github.com:ericmueller/ninja-internal into inte...hwc4872012-03-12
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Merge pull request #4 from joseeight/FileIO-IntegrationEric2012-03-12
| | | | |\ \ \ \ \ \
| | | * | | | | | | | Merge branch 'integration' of github.com:ericmueller/ninja-internal into inte...hwc4872012-03-09
| | | |\| | | | | | |
| | | | * | | | | | | Merge pull request #3 from joseeight/FileIO-IntegrationEric2012-03-09
| | | | |\ \ \ \ \ \ \
| | | * | \ \ \ \ \ \ \ Merge branch 'FileIO-Integration' of github.com:joseeight/ninja-internal into...hwc4872012-03-09
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| * | / | | | | | | | | Adding Temp drag-drop I/O supportJose Antonio Marquez2012-03-15
| |/ / / / / / / / / /
* | | | | | | | | | | Fix layer order and selection on reopenJonathan Duran2012-03-16
* | | | | | | | | | | Merge branch 'refs/heads/Timeline-local' into TimelineDOMJonathan Duran2012-03-16
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'Timeline-local' into Timeline-local-2Jon Reid2012-03-16
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-localJon Reid2012-03-16
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / | | | |/| | | | | | | | |
| | * | | | | | | | | | | Timeline: Hook up data binding for changes on subproperties.Jon Reid2012-03-16
| | * | | | | | | | | | | Timeline: remove comment.Jon Reid2012-03-15
| | * | | | | | | | | | | Timeline: Remove selection timer on add new layer method.Jon Reid2012-03-15
| | * | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-localJon Reid2012-03-15
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Timeline: Fix for layer selection problems on file open and switch.Jon Reid2012-03-15
* | | | | | | | | | | | | | Consolidate conversion functionsJonathan Duran2012-03-16
* | | | | | | | | | | | | | CleanupJonathan Duran2012-03-16
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Bug fix and cleanupJonathan Duran2012-03-16
* | | | | | | | | | | | | Fix layer select on selection changeJonathan Duran2012-03-16
* | | | | | | | | | | | | Start enforcing one element per layerJonathan Duran2012-03-16
| |_|/ / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Timeline: remove comment.Jonathan Duran2012-03-15
* | | | | | | | | | | | Timeline: Fix for layer selection problems on file open and switch.Jonathan Duran2012-03-15
| |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | revert spaceJonathan Duran2012-03-15
* | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-03-15
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-03-15
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge pull request #116 from joseeight/ColorValerio Virgillito2012-03-14
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| | | * | | | | | | | Temp Fix for: IKNINJA-1078Jose Antonio Marquez2012-03-13
| * | | | | | | | | | Removing the backup-delete folder and the RDGE tools directory.Valerio Virgillito2012-03-15
| |/ / / / / / / / /
| * | | | | | | | | Removing the obsolete modalContainer div.Valerio Virgillito2012-03-14
| * | | | | | | | | Merge pull request #117 from mencio/layout-fixValerio Virgillito2012-03-14
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fixing the layout to only draw one level and stage resize when the panels are...Valerio Virgillito2012-03-13
| | * | | | | | | | | Some code cleanup - removing unused assignments.Valerio Virgillito2012-03-13
| * | | | | | | | | | Merge pull request #114 from mqg734/ToolFixesValerio Virgillito2012-03-13
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Fixed drawing of multiple selection bounds when in flat case.Nivesh Rajbhandari2012-03-13
| | * | | | | | | | | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-03-13
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-03-13
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fixing selection tool when moving multiple selection in 3d mode.Nivesh Rajbhandari2012-03-12
| | * | | | | | | | | | | Fixing snapping bugs in Selection, translate and rotate tools.Nivesh Rajbhandari2012-03-12
| | * | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-03-12
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-03-02
| | |\ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #112 from ericguzman/PresetsPanelValerio Virgillito2012-03-13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Presets Panel - Re-add dbl-click activationEric Guzman2012-03-13