aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge pull request #6 from ananyasen/FileIOJose Antonio Marquez Russo2012-02-10
|\
| * hide iframeContainer if we want to open code view as the first document after...Ananya Sen2012-02-10
| * removed temporary test to open ninja without default document, since it is br...Ananya Sen2012-02-10
| * Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIOAnanya Sen2012-02-10
| |\ | |/ |/|
* | Adding download cloud app UIJose Antonio Marquez2012-02-09
* | New/Open HTML document parsingJose Antonio Marquez2012-02-09
* | Merge pull request #5 from mencio/file-ioJose Antonio Marquez Russo2012-02-09
|\ \
| * | disabling the auto open of a document on load. Temporary using the new projec...Valerio Virgillito2012-02-09
|/ /
| * file open and file new integrated againAnanya Sen2012-02-10
|/
* Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-09
|\
| * Merge pull request #28 from mqg734/SnapManagerFixesValerio Virgillito2012-02-09
| |\
| | * Fixed bad merge in FlatMaterials.Nivesh Rajbhandari2012-02-09
| | * Merge branch 'refs/heads/ninja-internal' into SnapManagerFixesNivesh Rajbhandari2012-02-09
| | |\ | | |/ | |/|
| | * Merge branch 'refs/heads/ninja-internal' into SnapManagerFixesNivesh Rajbhandari2012-02-09
| | |\
| | * | Changed the rendering for canvas 2D rectangle.Nivesh Rajbhandari2012-02-09
| | * | Reversed the orientation of one of the triangles for WebGL rendering.Nivesh Rajbhandari2012-02-09
| | * | Fixed runtime error when using 3d tools without any items selected.Nivesh Rajbhandari2012-02-09
| | * | Merging snap manager fix for infinite projection errors when stage view is ch...Nivesh Rajbhandari2012-02-08
| | * | Merging fix for marquee selection that accounts for 3d values.Nivesh Rajbhandari2012-02-08
| | * | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-08
| | |\ \
| | * \ \ Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-08
| | |\ \ \
| | * | | | Fixed several typos in Materials import/export code to support toggling betwe...Nivesh Rajbhandari2012-02-08
| | * | | | Fixed radio button to update 3d values when switching from local to global an...Nivesh Rajbhandari2012-02-08
* | | | | | File OpenJose Antonio Marquez2012-02-09
* | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-09
|\| | | | |
| * | | | | Merge pull request #26 from pushkarjoshi/pentoolValerio Virgillito2012-02-09
| |\ \ \ \ \
| | * | | | | removing shadersPushkar Joshi2012-02-09
| | * | | | | fill all paths even if they are openPushkar Joshi2012-02-08
| | * | | | | Merge branch 'master' into pentoolPushkar Joshi2012-02-08
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | * | | | | bug fixes for better anchor point rotation and removing snapping on hover and...Pushkar Joshi2012-02-08
| | * | | | | some minor bug fixes and code cleanupPushkar Joshi2012-02-07
| | * | | | | Merge branch 'master' into pentoolPushkar Joshi2012-02-07
| | |\ \ \ \ \
| | * | | | | | don't use colorToHex function because it only works for 3D color (needs a fix...Pushkar Joshi2012-02-07
| | * | | | | | Merge branch 'working' of c:/Code/github/emueller/ninja-internal/ into pentoolPushkar Joshi2012-02-02
| | |\ \ \ \ \ \
| | | * | | | | | Removed a console log and set the Plasma material to animating.hwc4872012-02-01
| | | * | | | | | Fixed plane orientations for view orientations other than front.hwc4872012-02-01
| | | * | | | | | listen for the appMouseUp event in the Pan toolhwc4872012-02-01
| | | * | | | | | factor in the zoom factor when drawing the stage compass.hwc4872012-02-01
| | | * | | | | | Fix for a marquee zoom bug.hwc4872012-02-01
| | | * | | | | | mouse wheel for zoom toolhwc4872012-02-01
| | | * | | | | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into workinghwc4872012-02-01
| | | |\ \ \ \ \ \
| | | * | | | | | | changes to allow minimal rendering ofnon-animated materials.hwc4872012-02-01
| | | * | | | | | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into workinghwc4872012-01-31
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into wor...hwc4872012-01-31
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | Renderer startup handling of non-animated materials.hwc4872012-01-30
| | | * | | | | | | | | Merge branch 'staging' of github.com:Motorola-Mobility/ninja-internal into wo...hwc4872012-01-30
| | | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | updated from old repohwc4872012-01-27
| | * | | | | | | | | | | Merge branch 'master' into pentoolPushkar Joshi2012-02-02
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | make GLAnchorPoint functions as part of its prototypePushkar Joshi2012-02-01
| | * | | | | | | | | | | | avoid overriding GlGeomObj translate methodPushkar Joshi2012-02-01