aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* 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
| | * | | | | Adding back the local storage check in the cloudpopup.Nivesh Rajbhandari2012-02-22
| | * | | | | Buttons in the rectangle properties in the tools options need to float left.Nivesh Rajbhandari2012-02-22
| | * | | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-02-22
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Merge branch 'refs/heads/ToolFixes' into WebGLMaterialsNivesh Rajbhandari2012-02-22
| | |\ \ \ \ \
| | | * | | | | Removing unused method that was using snapManager.Nivesh Rajbhandari2012-02-22
| | | * | | | | Integrating Zoom tool fixes.Nivesh Rajbhandari2012-02-22
| | | | |_|_|/ | | | |/| | |
| | | * | | | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-22
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | * | | | Fixing eyedropper tool to get color from image data. This required us to work...Nivesh Rajbhandari2012-02-22
| | | * | | | Some more tweaks to not being able to select elements in top/side view.Nivesh Rajbhandari2012-02-20
| | * | | | | PulseMaterial and RadialBlurMaterial had typos in their import code.Nivesh Rajbhandari2012-02-22
| | * | | | | Integrating canvas-2d and WebGL drawing fixes. Also adding back WebGL materials.Nivesh Rajbhandari2012-02-22
| | * | | | | Do not use color object for stage's border since we don't allow users to modi...Nivesh Rajbhandari2012-02-22
| | * | | | | Revert "Integrating canvas-2d drawing and WebGL fixes, including adding back ...Nivesh Rajbhandari2012-02-22