aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| * | | | | | | | | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-23
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | switch html document - re-initialize draw-utils and snap-manager on opening a...Ananya Sen2012-02-23
* | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-24
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge pull request #69 from mayhewinator/WorkingBranchmayhewinator2012-02-24
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| | * | | | | | | | | Removing tabs permissions until we make a final decision on whether or not we...John Mayhew2012-02-24
| |/ / / / / / / / /
| * | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-02-24
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge pull request #68 from mqg734/ToolFixesValerio Virgillito2012-02-24
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | / / / | | | | |_|_|_|/ / / | | | |/| | | | | |
| | | * | | | | | | Marking inkbottle as the final tool in the set.Nivesh Rajbhandari2012-02-24
| | | * | | | | | | Adding back Ink Bottle tool in the tool bar so QE can test ink bottle functio...Nivesh Rajbhandari2012-02-24
| | | * | | | | | | Javascript does not evaluate a return with its expression in a new line. The ...Nivesh Rajbhandari2012-02-24
| | | * | | | | | | Removing duplicate get/setElementPlanes method.Nivesh Rajbhandari2012-02-24
| | |/ / / / / / /
| * / / / / / / / Adding some missing copyrightsValerio Virgillito2012-02-24
| |/ / / / / / /
* | | | / / / / Added import/export of RDGE dataJose Antonio Marquez2012-02-24
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-23
|\| | | | | |
| * | | | | | Merge pull request #67 from ntfx47/PullRequest-TimelineValerio Virgillito2012-02-23
| |\ \ \ \ \ \
| | * | | | | | Timeline : Fix for the split and element model errorKruti Shah2012-02-23
| * | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-02-23
| |\ \ \ \ \ \ \
| * | | | | | | | Fixing the selection tool properties icons.Valerio Virgillito2012-02-23
* | | | | | | | | Merge pull request #17 from ericmueller/integrationJose Antonio Marquez Russo2012-02-23
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into int...hwc4872012-02-23
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | GL save and reload.hwc4872012-02-22
| * | | | | | | | Runtime classeshwc4872012-02-22
| * | | | | | | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into integrationhwc4872012-02-22
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into int...hwc4872012-02-22
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | Added all materials back inhwc4872012-02-22
| * | | | | | | | | Adding all the shaders back inhwc4872012-02-22
| * | | | | | | | | Adding bug fixes.hwc4872012-02-22
| * | | | | | | | | Merge branch 'WebGLMaterials' of github.com:mqg734/ninja-internal into integr...hwc4872012-02-21
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-23
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge pull request #65 from mqg734/NiveshColorValerio Virgillito2012-02-23
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| | * | | | | | | | | Fix to read back colors when re-opening files.Nivesh Rajbhandari2012-02-23
* | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-23
|\| | | | | | | | | |
| * | | | | | | | | | Fixing app mode check.Valerio Virgillito2012-02-23
| * | | | | | | | | | fixing the tools shortcuts - IKNINJA 1199Valerio Virgillito2012-02-23
| |/ / / / / / / / /
| * | | | | | | | | Merge pull request #64 from imix23ways/TimelineValerio Virgillito2012-02-23
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | * | | | | | | | Remove selection calls from timelinepanel.jsJonathan Duran2012-02-23
| | | |_|_|_|/ / / | | |/| | | | | |
| | * | | | | | | Fix for tween repetition arrays getting overwritten on file openJonathan Duran2012-02-23
| | * | | | | | | Timeline: Reopen Doc Restore TimeLineJonathan Duran2012-02-23
| | * | | | | | | New DocJonathan Duran2012-02-23
| | * | | | | | | Timeline Track Open docJonathan Duran2012-02-23
| | * | | | | | | Timeline:Open Doc in TimelinePanel.jsJonathan Duran2012-02-23
| | * | | | | | | Timeline: Create new PropertyTrack subcomponent, and use it in the TimelineTr...Jonathan Duran2012-02-23
| | * | | | | | | Unterminated linesJonathan Duran2012-02-23
| | * | | | | | | Redo timeline resize codeJonathan Duran2012-02-23
| | * | | | | | | Timeline Reset to clean Master branch. Code scrub.Jonathan Duran2012-02-23
| |/ / / / / / /
* | | | | | | / Fixing document mode checkJose Antonio Marquez2012-02-23
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-23
|\| | | | | |
| * | | | | | Fixing the breadcrumb button - removing toolbutton class since it is not a to...Valerio Virgillito2012-02-23
| * | | | | | Merge pull request #60 from mqg734/WebGLMaterialsValerio Virgillito2012-02-23
| |\ \ \ \ \ \
| | * | | | | | Updating textfield to only use nj-skinned class and updating input-group to c...Nivesh Rajbhandari2012-02-22