aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into workinghwc4872012-01-31
|\ | | | | | | | | Conflicts: js/stage/stage.reel/stage.js
| * Merging Jose's colorchip change.Nivesh Rajbhandari2012-01-31
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Adding browser check for Chrome and redirect page.Valerio Virgillito2012-01-31
| | | | | | | | | | | | Adding a check for Google Chrome browser and a redirect page to download and install Chrome. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Adding the version to the main Ninja reel component.Valerio Virgillito2012-01-31
| | | | | | | | Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>
| * Code cleanup - Removed extra log.Valerio Virgillito2012-01-31
| | | | | | | | Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>
| * Adding a version json object to NinjaValerio Virgillito2012-01-31
| | | | | | | | | | | | | | Versions object to start keeping track of versions for Ninja, Montage and eventually other dependencies. Loaded before montage to use in the splash screen. Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>
| * Removed unused images and reduced the size of the larger image files used ↵John Mayhew2012-01-31
| | | | | | | | for shaders.
| * CSSPanel Updates - Add new original CSS error iconEric Guzman2012-01-30
| |
| * Removing unused file from assets/images. This file should not have been ↵John Mayhew2012-01-30
| | | | | | | | committed initially.
| * Forgot to remove a require in previous checkin.Nivesh Rajbhandari2012-01-30
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Removing unused Properties3D file since those values are now saved with the ↵Nivesh Rajbhandari2012-01-30
| | | | | | | | | | | | models. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Fixed issue with elements not drawing in the correct plane.Nivesh Rajbhandari2012-01-30
| | | | | | | | | | | | When first adding an element, force the 3d model to update with the element's webkit transform values. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Fixed grid not drawing bug when switching from front to top and side.Nivesh Rajbhandari2012-01-30
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Syncing stage view when rotating stage.Nivesh Rajbhandari2012-01-30
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Checkbox and Combobox change/changing events were not setting wasSetByCode ↵Nivesh Rajbhandari2012-01-30
| | | | | | | | | | | | property correctly, causing our PI to dispatch events at improper times. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-01-31
|\ \ | | | | | | | | | working
| * \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-01-30
| |\ \
| | * \ Merge pull request #7 from mayhewinator/WorkingBranchmayhewinator2012-01-30
| | |\ \ | | | | | | | | | | Removed unused images and reduced the size of the larger image files
| | | * | Removed unused images and reduced the size of the larger image files used ↵John Mayhew2012-01-30
| | | | | | | | | | | | | | | | | | | | for shaders.
| * | | | Merge branch 'core' of https://github.com/mencio/ninja-internal into mencio-coreValerio Virgillito2012-01-30
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: index.html Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | Adding browser check for Chrome and redirect page.Valerio Virgillito2012-01-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding a check for Google Chrome browser and a redirect page to download and install Chrome. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | Adding the version to the main Ninja reel component.Valerio Virgillito2012-01-30
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>
| | * | | Code cleanup - Removed extra log.Valerio Virgillito2012-01-30
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>
| | * | | Adding a version json object to NinjaValerio Virgillito2012-01-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Versions object to start keeping track of versions for Ninja, Montage and eventually other dependencies. Loaded before montage to use in the splash screen. Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>
| * | | | Adding the version to the main Ninja reel component.Valerio Virgillito2012-01-31
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>
| * | | | Code cleanup - Removed extra log.Valerio Virgillito2012-01-31
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>
| * | | | Adding a version json object to NinjaValerio Virgillito2012-01-31
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Versions object to start keeping track of versions for Ninja, Montage and eventually other dependencies. Loaded before montage to use in the splash screen. Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>
* | | | Renderer startup handling of non-animated materials.hwc4872012-01-30
| | | | | | | | | | | | | | | | Changed zoom from the document bar to keep the location center of the viewable portion of the document fixed.
* | | | Merge branch 'staging' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-01-30
|\ \ \ \ | | | | | | | | | | | | | | | working
| * \ \ \ Merge pull request #5 from joseeight/ColorValerio Virgillito2012-01-30
| |\ \ \ \ | | |/ / / | |/| | | IKNINJA-1083
| | * | | IKNINJA-1083Jose Antonio Marquez2012-01-30
| |/ / / | | | | | | | | | | | | Fixing minor bug with no color breaking on null alpha value.
| * | | Merge pull request #4 from ericguzman/CSSPanelUpdatesValerio Virgillito2012-01-30
| |\ \ \ | | | | | | | | | | CSSPanel Updates - Add new original CSS error icon
| | * | | CSSPanel Updates - Add new original CSS error iconEric Guzman2012-01-30
| | | |/ | | |/|
| * | | Merge pull request #3 from mayhewinator/mastermayhewinator2012-01-30
| |\ \ \ | | |/ / | |/| / | | |/ Code cleanup. Removing unnecessary Thumbs.db file from our assets folder.
| | * Removing unused file from assets/images. This file should not have been ↵John Mayhew2012-01-30
| | | | | | | | | | | | committed initially.
| * | Merge pull request #2 from jreid01/pullrequestValerio Virgillito2012-01-27
| |\ \ | | |/ | |/| Fixes to radio button base styles. Comment clean-up.
| | * Fixes to radio button base styles. Comment clean-up.Jon Reid2012-01-27
| | |
* | | updated from old repohwc4872012-01-27
|/ /
* | Merge pull request #1 from mqg734/ToolFixesValerio Virgillito2012-01-27
|\ \ | |/ |/| Fixed canvas width/height bug.
| * Updated canvas controller to override setProperties so we don't set styles ↵Nivesh Rajbhandari2012-01-27
|/ | | | | | when updating width and height. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Adding excluded list of files to gitignore and removed cloud/config.xml file.Valerio Virgillito2012-01-27
| | | | Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>
* First commit of Ninja to ninja-internalPierre Frisch2012-01-27
| | | | Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>
* first commitPierre Frisch2011-12-22
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 13:19:14 +0000