aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| * | | | | | | | | | | | | | Merge pull request #27 from ericguzman/TreeComponentsValerio Virgillito2012-02-08
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Tree Components - css fixesEric Guzman2012-02-08
| |/ / / / / / / / / / / / /
| | | | | | | | | | | | | * 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
* | | | | | | | | | | | | | Undoing experimental changes from the basic webgl shaders.Nivesh Rajbhandari2012-02-09
* | | | | | | | | | | | | | Removing image assets that were being used by deleted WebGL materials.Nivesh Rajbhandari2012-02-09
* | | | | | | | | | | | | | Removed unused materials.Nivesh Rajbhandari2012-02-09
* | | | | | | | | | | | | | Merging WebGL changes that allow users to modify different shape instances. A...Nivesh Rajbhandari2012-02-09
| |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-08
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #25 from mayhewinator/WorkingBranchmayhewinator2012-02-08
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor...John Mayhew2012-02-08
| | |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Added manifest.json, and image file required for being a packaged chrome appl...John Mayhew2012-02-08
* | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-08
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #23 from joseeight/SCSSValerio Virgillito2012-02-08
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | adding new scss folderJose Antonio Marquez2012-02-08
| | * | | | | | | | | | | delete _scss directoryJose Antonio Marquez2012-02-08
| |/ / / / / / / / / / /
| * | | | | | | | | | | Merge pull request #21 from mencio/pi_bugsValerio Virgillito2012-02-08
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | IKNINJA - 1084: Fixing the custom tag.Valerio Virgillito2012-02-07
| | * | | | | | | | | | | IKNINJA-616 - Drag and drop images fix for the PI and sourceValerio Virgillito2012-02-07
| | * | | | | | | | | | | IKNINJA-964 - Fixed inconsistent element name in PI/CSS panel.Valerio Virgillito2012-02-07
| * | | | | | | | | | | | Merge pull request #22 from ericguzman/StylesControllerUpdatesValerio Virgillito2012-02-08
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Styles Controller - Added array of dirty stylesheets and event dispatch when ...Eric Guzman2012-02-08
| | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| * | | | | | | | | | | Merge pull request #20 from mqg734/ToolFixesValerio Virgillito2012-02-08
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | updated montage v.0.6 to the latest changes.Valerio Virgillito2012-02-07
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge pull request #19 from ericguzman/TreeComponentsValerio Virgillito2012-02-07
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Tree Components - Added copyright commentsEric Guzman2012-02-07
| |/ / / / / / / / / /
* | | | | | | | | | | 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
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Added ability to toggle combobox's visibility so we can show/hide materials c...Nivesh Rajbhandari2012-02-07
* | | | | | | | | | id's must start with a letter, so our workaround for using uuid for RDGE canv...Nivesh Rajbhandari2012-02-07
* | | | | | | | | | Fixing some typos and undeclared variables in GLRectangle and ShapesController.Nivesh Rajbhandari2012-02-07
* | | | | | | | | | Supporting switching materials in the PI. Also, moved makeFillMaterial and ma...Nivesh Rajbhandari2012-02-07
* | | | | | | | | | Fixed PI to support WebGL materials.Nivesh Rajbhandari2012-02-07
* | | | | | | | | | Updated tools and PI to get/set materials by binding to appModel's materials ...Nivesh Rajbhandari2012-02-07
* | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-07
|\| | | | | | | | |
| * | | | | | | | | Merge pull request #18 from ericguzman/StylesControllerUpdatesValerio Virgillito2012-02-06
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into StylesControllerUpdatesEric Guzman2012-02-06
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge pull request #17 from joseeight/SnapFixValerio Virgillito2012-02-06
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Attempt to fix initialization bug for snap-managerJose Antonio Marquez2012-02-06
| |/ / / / / / / / / /
| * | | | | | | | | | Merge pull request #16 from ericguzman/TreeComponentsValerio Virgillito2012-02-06
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | TreeController - moving the tree controller to the components directoryEric Guzman2012-02-06
| | * | | | | | | | | | Tree Components - Adding the tree componentsEric Guzman2012-02-06
| | * | | | | | | | | | Tree Controller - Clean out unused codeEric Guzman2012-02-06
| | * | | | | | | | | | Tree Controller - Initial addEric Guzman2012-02-06
| | | * | | | | | | | | Attempt to fix initialization bug for snap-managerJose Antonio Marquez2012-02-06
| | | * | | | | | | | | TreeController - moving the tree controller to the components directoryEric Guzman2012-02-06
| | | * | | | | | | | | Tree Components - Adding the tree componentsEric Guzman2012-02-06