aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes/3D
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/ToolFixes' into WebGLMaterialsNivesh Rajbhandari2012-04-04
|\
| * Adding replaceElement routine and event so Timeline can avoid removing and ad...Nivesh Rajbhandari2012-04-04
| * Need to set elementModel.isIn2DSnapCache flag to false when removing element ...Nivesh Rajbhandari2012-04-04
| * Squashed commit of Preparing for the montage undo-manager: Architecture changesValerio Virgillito2012-04-04
| * File IO for the brush stroke AND changing the data type of brush stroke from ...Pushkar Joshi2012-03-27
| * Merge branch 'master' into brushtoolPushkar Joshi2012-03-27
| |\
| * | Almost working version of brush tool that uses only local coordinates to stor...Pushkar Joshi2012-03-23
* | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-03-27
|\ \ \ | | |/ | |/|
| * | Merge branch 'refs/heads/master' into montage-integrationValerio Virgillito2012-03-21
| |\ \
| * | | Fixed snap-manager to stop snapping after first level children.Nivesh Rajbhandari2012-03-17
| | |/ | |/|
* | | Get matrix and perspective distance from styles controller.Nivesh Rajbhandari2012-03-21
| |/ |/|
* | Fixing error in drawUtils when closing document - should set _eltArray and _p...Nivesh Rajbhandari2012-03-20
|/
* Merge pull request #34 from ericmueller/integrationJose Antonio Marquez Russo2012-03-15
|\
| * Fixed BumpMetal materialhwc4872012-03-13
* | Fixed drawing of multiple selection bounds when in flat case.Nivesh Rajbhandari2012-03-13
* | Merge pull request #110 from mqg734/WebGLFixesValerio Virgillito2012-03-13
|\ \ | |/ |/|
| * Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-03-09
| |\
| | * IKNINJA-1270: fixed browser crashing when you close a document while playing ...Ananya Sen2012-03-08
| * | Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-03-06
| |\|
| * | Create drag plane parallel to working plane and offset by where the user clic...Nivesh Rajbhandari2012-03-06
* | | Merge pull request #30 from ananyasen/FileIO-ananyaJose Antonio Marquez Russo2012-03-08
|\ \ \
| * | | null the arrays on all documents closed, so that they get garbage collectedAnanya Sen2012-03-08
| * | | IKNINJA-1270: fixed browser crashing when you close a document while playing ...Ananya Sen2012-03-06
| | |/ | |/|
* | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into int...hwc4872012-03-06
|\| |
| * | Squashed commit of preload-fix into MasterValerio Virgillito2012-03-06
| |/
| * Fix for jumping issue when moving items that have any 3d on them.Nivesh Rajbhandari2012-03-02
| * Fix for elements flying off into space when moving elements that overlap.Nivesh Rajbhandari2012-03-01
| * SnapManager fixes for sag tags.Nivesh Rajbhandari2012-02-29
* | Merge branch 'TimelineUber' of github.com:imix23ways/ninja-internal into inte...hwc4872012-03-06
|\ \
| * | Squashed commit of the following:Jonathan Duran2012-02-29
| |/
* / File IOhwc4872012-03-06
|/
* Merge pull request #19 from ananyasen/FileIOJose Antonio Marquez Russo2012-02-24
|\
| * - added closeDocument event for timelineAnanya Sen2012-02-24
| * Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-23
| |\
| * \ 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
|\ \ \ \ | |_|_|/ |/| | |
| * | | 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
* | | | Merge pull request #17 from ericmueller/integrationJose Antonio Marquez Russo2012-02-23
|\ \ \ \ | |_|_|/ |/| | |
| * | | Adding bug fixes.hwc4872012-02-22
| | |/ | |/|
* | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-23
|\ \ \ | | |/ | |/|
| * | Removing unused method that was using snapManager.Nivesh Rajbhandari2012-02-22
| * | Integrating Zoom tool fixes.Nivesh Rajbhandari2012-02-22
| |/
* / renaming makeElementModel2 to makeModelFromElementValerio Virgillito2012-02-23
|/
* Fixing the getStageWorldToGlobalMatrix bugValerio Virgillito2012-02-16
* Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-09
|\
| * Merge branch 'refs/heads/ninja-internal' into SnapManagerFixesNivesh 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