aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Squashed commit of the following:Jonathan Duran2012-02-09
* Merge branch 'refs/heads/NINJAmaster' into TimelineJonathan Duran2012-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
| | |\ | | |/ | |/|
| * | 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
| |/ / / /
| | | | * 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 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
| | * | | 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
| | |\| |
| | * | | Force layout canvas and SelectionController to update their info when a 2d ca...Nivesh Rajbhandari2012-02-06
| | * | | Support toggling between 2d and 3d canvas context. This requires us to create...Nivesh Rajbhandari2012-02-06
| | * | | Add enabled property for ComboBox to support enabling/disabling materials dro...Nivesh Rajbhandari2012-02-06
| | * | | Allow users to switch between 2d and webGL mode. Note that this doesn't curre...Nivesh Rajbhandari2012-02-06
| | * | | Support use WebGL checkbox in the PI.Nivesh Rajbhandari2012-02-06
| * | | | 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
| |/ /
* | | Fixes for animation element assignmentJonathan Duran2012-02-09
* | | CleanupJonathan Duran2012-02-09
* | | Cleaning up more code and adding more models for timelineJonathan Duran2012-02-09
* | | Squashed commit of the following:Jonathan Duran2012-02-08
* | | Display time reading above layers and code clean upJonathan Duran2012-02-08
* | | Merge branch 'refs/heads/Timeline_updated' into TimelineJonathan Duran2012-02-08
|\ \ \
| * | | Numbering of layers between different selectedContainers starts from 1Kruti Shah2012-02-08