Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
* | | | | | | | | | | | | | | | Merge branch 'refs/heads/AnanyaFileIO' into FileIO | Jose Antonio Marquez | 2012-02-09 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | fixed templates descriptor, changed validation to on key up, fixed minor ui i... | Ananya Sen | 2012-02-09 | |
* | | | | | | | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-09 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | Merge pull request #29 from mayhewinator/WorkingBranch | Valerio Virgillito | 2012-02-09 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | removed null characters at the end of this file that made GIT treat it as a b... | John Mayhew | 2012-02-09 | |
| | * | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor... | John Mayhew | 2012-02-09 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | Implemented final splash screen, the credits page and the license page | John Mayhew | 2012-02-09 | |
| | * | | | | | | | | | | | | | | fixed error with initializing and accessing the ninja version object from the... | John Mayhew | 2012-02-09 | |
| | * | | | | | | | | | | | | | | Updated fav icon to the final image | John Mayhew | 2012-02-09 | |
| | | |_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | New File | Jose Antonio Marquez | 2012-02-09 | |
| |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | Fixing URI for templates, need UI to use correct data | Jose Antonio Marquez | 2012-02-09 | |
* | | | | | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-08 | |
|\| | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | Merge pull request #24 from mencio/pi_bugs | Valerio Virgillito | 2012-02-08 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | | | | Correcting the PI lock for height which had a bug in the original pull request. | Valerio Virgillito | 2012-02-08 | |
| | * | | | | | | | | | | | | | Merge branch 'refs/heads/master' into pi_bugs | Valerio Virgillito | 2012-02-08 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | Fix for the PI Lock button. | Valerio Virgillito | 2012-02-08 | |
* | | | | | | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-08 | |
|\| | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | Updating the sass file. | Valerio Virgillito | 2012-02-08 | |
| * | | | | | | | | | | | | | | Merge pull request #27 from ericguzman/TreeComponents | Valerio Virgillito | 2012-02-08 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | Tree Components - css fixes | Eric Guzman | 2012-02-08 | |
| |/ / / / / / / / / / / / / | ||||
* | | | | | | | | | | | | | | Adding a purge library method | Jose Antonio Marquez | 2012-02-08 | |
* | | | | | | | | | | | | | | Merge pull request #3 from ananyasen/FileIO | Jose Antonio Marquez Russo | 2012-02-08 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO | Ananya Sen | 2012-02-08 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-08 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | Merge pull request #25 from mayhewinator/WorkingBranch | mayhewinator | 2012-02-08 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor... | John Mayhew | 2012-02-08 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | Added manifest.json, and image file required for being a packaged chrome appl... | John Mayhew | 2012-02-08 | |
* | | | | | | | | | | | | | | | Setting up packaged app | Jose Antonio Marquez | 2012-02-08 | |
* | | | | | | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-08 | |
|\| | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | Merge pull request #23 from joseeight/SCSS | Valerio Virgillito | 2012-02-08 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | adding new scss folder | Jose Antonio Marquez | 2012-02-08 | |
| | * | | | | | | | | | | | | | delete _scss directory | Jose Antonio Marquez | 2012-02-08 | |
| |/ / / / / / / / / / / / / | ||||
* | | | | | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-08 | |
|\| | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | Merge pull request #21 from mencio/pi_bugs | Valerio Virgillito | 2012-02-08 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | | | | IKNINJA - 1084: Fixing the custom tag. | Valerio Virgillito | 2012-02-07 | |
| | * | | | | | | | | | | | | | IKNINJA-616 - Drag and drop images fix for the PI and source | Valerio Virgillito | 2012-02-07 | |
| | * | | | | | | | | | | | | | IKNINJA-964 - Fixed inconsistent element name in PI/CSS panel. | Valerio Virgillito | 2012-02-07 | |
| * | | | | | | | | | | | | | | Merge pull request #22 from ericguzman/StylesControllerUpdates | Valerio Virgillito | 2012-02-08 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | Styles Controller - Added array of dirty stylesheets and event dispatch when ... | Eric Guzman | 2012-02-08 | |
| | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | Merge pull request #20 from mqg734/ToolFixes | Valerio Virgillito | 2012-02-08 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | Added ability to toggle combobox's visibility so we can show/hide materials c... | Nivesh Rajbhandari | 2012-02-07 | |
| | * | | | | | | | | | | | | id's must start with a letter, so our workaround for using uuid for RDGE canv... | Nivesh Rajbhandari | 2012-02-07 | |
| | * | | | | | | | | | | | | Fixing some typos and undeclared variables in GLRectangle and ShapesController. | Nivesh Rajbhandari | 2012-02-07 | |
| | * | | | | | | | | | | | | Supporting switching materials in the PI. Also, moved makeFillMaterial and ma... | Nivesh Rajbhandari | 2012-02-07 | |
| | * | | | | | | | | | | | | Fixed PI to support WebGL materials. | Nivesh Rajbhandari | 2012-02-07 | |
| | * | | | | | | | | | | | | Updated tools and PI to get/set materials by binding to appModel's materials ... | Nivesh Rajbhandari | 2012-02-07 | |
| | * | | | | | | | | | |< |