aboutsummaryrefslogtreecommitdiff
path: root/js/preloader/Preloader.js
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-11
|\ | | | | | | | | Conflicts: js/ninja.reel/ninja.html
| * Removed unused materials.Nivesh Rajbhandari2012-02-09
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-09
|\ \
| * | Merge branch 'master' into pentoolPushkar Joshi2012-02-08
| |\| | | | | | | | | | | | | | | | Conflicts: js/helper-classes/RDGE/GLWorld.js js/helper-classes/RDGE/MaterialsLibrary.js
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-01-31
| |\ \ | | | | | | | | | | | | working
| * | | updated from old repohwc4872012-01-27
| | | |
* | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-08
|\ \ \ \ | | |_|/ | |/| |
| * | | Support toggling between 2d and 3d canvas context. This requires us to ↵Nivesh Rajbhandari2012-02-06
| | | | | | | | | | | | | | | | | | | | | | | | create a new canvas with all the same values as the canvas being replaced and copying over all the shape data. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | Code cleanup - Removed extra log.Valerio Virgillito2012-01-30
| |/ / | | | | | | | | | Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>
* | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-01-30
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: _scss/compass_app_log.txt _scss/imports/scss/_Stage.scss
| * | Code cleanup - Removed extra log.Valerio Virgillito2012-01-31
| |/ | | | | | | Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>
* / Merged old FileIOJose Antonio Marquez2012-01-27
|/
* First commit of Ninja to ninja-internalPierre Frisch2012-01-27
Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>