aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'master' into brushtoolPushkar Joshi2012-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 pull request #26 from pushkarjoshi/pentoolValerio Virgillito2012-02-09
| |\ \
| * | | adding oneway to the 3d bindings to fix a bug where the stage was getting sel...Valerio Virgillito2012-02-09
| * | | Merge pull request #29 from mayhewinator/WorkingBranchValerio Virgillito2012-02-09
| |\ \ \
| | * | | removed null characters at the end of this file that made GIT treat it as a b...John Mayhew2012-02-09
| | * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor...John Mayhew2012-02-09
| | |\ \ \ | | |/ / / | |/| | |
| | * | | Implemented final splash screen, the credits page and the license pageJohn Mayhew2012-02-09
| | * | | fixed error with initializing and accessing the ninja version object from the...John Mayhew2012-02-09
| | * | | Updated fav icon to the final imageJohn Mayhew2012-02-09
| | | | * Merge branch 'refs/heads/ninja-internal' into SnapManagerFixesNivesh Rajbhandari2012-02-09
| | | | |\ | | |_|_|/ | |/| | |
| * | | | Merge pull request #24 from mencio/pi_bugsValerio Virgillito2012-02-08
| |\ \ \ \
| | * | | | Correcting the PI lock for height which had a bug in the original pull request.Valerio Virgillito2012-02-08
| | * | | | Merge branch 'refs/heads/master' into pi_bugsValerio Virgillito2012-02-08
| | |\ \ \ \
| | * | | | | Fix for the PI Lock button.Valerio Virgillito2012-02-08
| * | | | | | Updating the sass file.Valerio Virgillito2012-02-08
| * | | | | | 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
| | | | | * 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
* | | | | | Merge branch 'pentool' into brushtoolPushkar Joshi2012-02-09
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | removing shadersPushkar Joshi2012-02-09
* | | | | | first phase of simple resampling to prevent tiny segmentsPushkar Joshi2012-02-09
|/ / / / /
* | | | | fill all paths even if they are openPushkar Joshi2012-02-08
* | | | | Merge branch 'master' into pentoolPushkar Joshi2012-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
| | |\ \ \ | | |/ / / | |/| | |
| * | | | 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
| | | | * | Added manifest.json, and image file required for being a packaged chrome appl...John Mayhew2012-02-08
| | |_|/ / | |/| | |
| * | | | Merge pull request #20 from mqg734/ToolFixesValerio Virgillito2012-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