Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'refs/heads/FileIO-jose' into FileIO | Ananya Sen | 2012-02-23 |
|\ | |||
| * | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-23 |
| |\ | |||
| | * | Merge pull request #67 from ntfx47/PullRequest-Timeline | Valerio Virgillito | 2012-02-23 |
| | |\ | |||
| | | * | Timeline : Fix for the split and element model error | Kruti Shah | 2012-02-23 |
| | * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Valerio Virgillito | 2012-02-23 |
| | |\ \ | |||
| | * | | | Fixing the selection tool properties icons. | Valerio Virgillito | 2012-02-23 |
| * | | | | Merge pull request #17 from ericmueller/integration | Jose Antonio Marquez Russo | 2012-02-23 |
| |\ \ \ \ | |||
| | * \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into int... | hwc487 | 2012-02-23 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||
| | * | | | | GL save and reload. | hwc487 | 2012-02-22 |
| | * | | | | Runtime classes | hwc487 | 2012-02-22 |
| | * | | | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into integration | hwc487 | 2012-02-22 |
| | |\ \ \ \ | |||
| | * \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into int... | hwc487 | 2012-02-22 |
| | |\ \ \ \ \ | |||
| | * | | | | | | Added all materials back in | hwc487 | 2012-02-22 |
| | * | | | | | | Adding all the shaders back in | hwc487 | 2012-02-22 |
| | * | | | | | | Adding bug fixes. | hwc487 | 2012-02-22 |
| | * | | | | | | Merge branch 'WebGLMaterials' of github.com:mqg734/ninja-internal into integr... | hwc487 | 2012-02-21 |
| | |\ \ \ \ \ \ | |||
| * | \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-23 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | | |||
| | * | | | | | | | Merge pull request #65 from mqg734/NiveshColor | Valerio Virgillito | 2012-02-23 |
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | |||
| | | * | | | | | | Fix to read back colors when re-opening files. | Nivesh Rajbhandari | 2012-02-23 |
| * | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-23 |
| |\| | | | | | | | |||
| | * | | | | | | | Fixing app mode check. | Valerio Virgillito | 2012-02-23 |
| | * | | | | | | | fixing the tools shortcuts - IKNINJA 1199 | Valerio Virgillito | 2012-02-23 |
| | |/ / / / / / | |||
| | * | | | | | | Merge pull request #64 from imix23ways/Timeline | Valerio Virgillito | 2012-02-23 |
| | |\ \ \ \ \ \ | |||
| | | * | | | | | | Remove selection calls from timelinepanel.js | Jonathan Duran | 2012-02-23 |
| | | | |_|_|_|/ | | | |/| | | | | |||
| | | * | | | | | Fix for tween repetition arrays getting overwritten on file open | Jonathan Duran | 2012-02-23 |
| | | * | | | | | Timeline: Reopen Doc Restore TimeLine | Jonathan Duran | 2012-02-23 |
| | | * | | | | | New Doc | Jonathan Duran | 2012-02-23 |
| | | * | | | | | Timeline Track Open doc | Jonathan Duran | 2012-02-23 |
| | | * | | | | | Timeline:Open Doc in TimelinePanel.js | Jonathan Duran | 2012-02-23 |
| | | * | | | | | Timeline: Create new PropertyTrack subcomponent, and use it in the TimelineTr... | Jonathan Duran | 2012-02-23 |
| | | * | | | | | Unterminated lines | Jonathan Duran | 2012-02-23 |
| | | * | | | | | Redo timeline resize code | Jonathan Duran | 2012-02-23 |
| | | * | | | | | Timeline Reset to clean Master branch. Code scrub. | Jonathan Duran | 2012-02-23 |
| | |/ / / / / | |||
| * | | | | | | Fixing document mode check | Jose Antonio Marquez | 2012-02-23 |
* | | | | | | | refresh draw-utils, snap-manager, view-utils for html document stitching | Ananya Sen | 2012-02-23 |
* | | | | | | | Merge branch 'refs/heads/FileIO-jose' into FileIO | Ananya Sen | 2012-02-23 |
|\| | | | | | | |||
| * | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-23 |
| |\| | | | | | |||
| | * | | | | | Fixing the breadcrumb button - removing toolbutton class since it is not a to... | Valerio Virgillito | 2012-02-23 |
| | * | | | | | Merge pull request #60 from mqg734/WebGLMaterials | Valerio Virgillito | 2012-02-23 |
| | |\ \ \ \ \ | |||
| | | * | | | | | Updating textfield to only use nj-skinned class and updating input-group to c... | Nivesh Rajbhandari | 2012-02-22 |
| | | * | | | | | Adding back the local storage check in the cloudpopup. | Nivesh Rajbhandari | 2012-02-22 |
| | | * | | | | | Buttons in the rectangle properties in the tools options need to float left. | Nivesh Rajbhandari | 2012-02-22 |
| | | * | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterials | Nivesh Rajbhandari | 2012-02-22 |
| | | |\ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||
| | | * | | | | | Merge branch 'refs/heads/ToolFixes' into WebGLMaterials | Nivesh Rajbhandari | 2012-02-22 |
| | | |\ \ \ \ \ | |||
| | | | * | | | | | Removing unused method that was using snapManager. | Nivesh Rajbhandari | 2012-02-22 |
| | | | * | | | | | Integrating Zoom tool fixes. | Nivesh Rajbhandari | 2012-02-22 |
| | | | | |_|_|/ | | | | |/| | | | |||
| | | | * | | | | Merge branch 'refs/heads/ninja-internal' into ToolFixes | Nivesh Rajbhandari | 2012-02-22 |
| | | | |\ \ \ \ | | | | | | |_|/ | | | | | |/| | | |||
| | | | * | | | | Fixing eyedropper tool to get color from image data. This required us to work... | Nivesh Rajbhandari | 2012-02-22 |
| | | | * | | | | Some more tweaks to not being able to select elements in top/side view. | Nivesh Rajbhandari | 2012-02-20 |
| | | * | | | | | PulseMaterial and RadialBlurMaterial had typos in their import code. | Nivesh Rajbhandari | 2012-02-22 |