Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | don't use colorToHex function because it only works for 3D color (needs a ↵ | Pushkar Joshi | 2012-02-07 |
| | | | | fix to colorToHex) | ||
* | Merge branch 'working' of c:/Code/github/emueller/ninja-internal/ into pentool | Pushkar Joshi | 2012-02-02 |
|\ | |||
| * | Removed a console log and set the Plasma material to animating. | hwc487 | 2012-02-01 |
| | | |||
| * | Fixed plane orientations for view orientations other than front. | hwc487 | 2012-02-01 |
| | | |||
| * | listen for the appMouseUp event in the Pan tool | hwc487 | 2012-02-01 |
| | | |||
| * | factor in the zoom factor when drawing the stage compass. | hwc487 | 2012-02-01 |
| | | |||
| * | Fix for a marquee zoom bug. | hwc487 | 2012-02-01 |
| | | |||
| * | mouse wheel for zoom tool | hwc487 | 2012-02-01 |
| | | |||
| * | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into working | hwc487 | 2012-02-01 |
| |\ | |||
| | * | Fixing 3d section of the PI. | Nivesh Rajbhandari | 2012-01-31 |
| | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Support stage in PI's 3d section. | Nivesh Rajbhandari | 2012-01-31 |
| | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | changes to allow minimal rendering ofnon-animated materials. | hwc487 | 2012-02-01 |
| | | | |||
| * | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into working | hwc487 | 2012-01-31 |
| |\| | | | | | | | | | | | | | Conflicts: js/stage/stage.reel/stage.js | ||
| | * | Merging Jose's colorchip change. | Nivesh Rajbhandari | 2012-01-31 |
| | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Adding browser check for Chrome and redirect page. | Valerio Virgillito | 2012-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 Virgillito | 2012-01-31 |
| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <rmwh84@motorola.com> | ||
| | * | Code cleanup - Removed extra log. | Valerio Virgillito | 2012-01-31 |
| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <rmwh84@motorola.com> | ||
| | * | Adding a version json object to Ninja | Valerio Virgillito | 2012-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 Mayhew | 2012-01-31 |
| | | | | | | | | | | | | for shaders. | ||
| | * | CSSPanel Updates - Add new original CSS error icon | Eric Guzman | 2012-01-30 |
| | | | |||
| | * | Removing unused file from assets/images. This file should not have been ↵ | John Mayhew | 2012-01-30 |
| | | | | | | | | | | | | committed initially. | ||
| | * | Forgot to remove a require in previous checkin. | Nivesh Rajbhandari | 2012-01-30 |
| | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Removing unused Properties3D file since those values are now saved with the ↵ | Nivesh Rajbhandari | 2012-01-30 |
| | | | | | | | | | | | | | | | | | | models. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Fixed issue with elements not drawing in the correct plane. | Nivesh Rajbhandari | 2012-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 Rajbhandari | 2012-01-30 |
| | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Syncing stage view when rotating stage. | Nivesh Rajbhandari | 2012-01-30 |
| | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Checkbox and Combobox change/changing events were not setting wasSetByCode ↵ | Nivesh Rajbhandari | 2012-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 ↵ | hwc487 | 2012-01-31 |
| |\ \ | | | | | | | | | | | | | working | ||
| * | | | Renderer startup handling of non-animated materials. | hwc487 | 2012-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 ↵ | hwc487 | 2012-01-30 |
| |\ \ \ | | | | | | | | | | | | | | | | working | ||
| | * \ \ | Merge pull request #5 from joseeight/Color | Valerio Virgillito | 2012-01-30 |
| | |\ \ \ | | | | | | | | | | | | | IKNINJA-1083 | ||
| | | * | | | IKNINJA-1083 | Jose Antonio Marquez | 2012-01-30 |
| | |/ / / | | | | | | | | | | | | | | | | Fixing minor bug with no color breaking on null alpha value. | ||
| * | | | | updated from old repo | hwc487 | 2012-01-27 |
| | | | | | |||
* | | | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-02-02 |
|\ \ \ \ \ | |||
| * | | | | | IKNINJA-1083 | Jose Antonio Marquez | 2012-02-01 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixing minor bug with no color breaking on null alpha value. | ||
| * | | | | | Merge pull request #9 from jreid01/pullrequest | Valerio Virgillito | 2012-01-31 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Added skin for html buttons. | ||
| | * | | | | | Added skin for html buttons. | Jon Reid | 2012-01-31 |
| | | | | | | | |||
| * | | | | | | Fixing the bread-crumb background | Valerio Virgillito | 2012-01-31 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CSS cleanup added a background to the bottom panel container which broke the bread-crumb background. Fixing by adding the background directly to the bread-crumb component. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | | | | | make GLAnchorPoint functions as part of its prototype | Pushkar Joshi | 2012-02-01 |
| | | | | | | |||
* | | | | | | avoid overriding GlGeomObj translate method | Pushkar Joshi | 2012-02-01 |
| | | | | | | |||
* | | | | | | when selecting anchor points, first check if the selected anchor position is ↵ | Pushkar Joshi | 2012-02-01 |
| | | | | | | | | | | | | | | | | | | | | | | | | close enough | ||
* | | | | | | performance improvement: add most of the GLSubpath functions to its prototype | Pushkar Joshi | 2012-02-01 |
| | | | | | | |||
* | | | | | | handle the case of proper redraw when the alt key is held down even after ↵ | Pushkar Joshi | 2012-01-31 |
| | | | | | | | | | | | | | | | | | | | | | | | | mouse up | ||
* | | | | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-01-31 |
|\| | | | | | |||
| * | | | | | Checkbox and Combobox change/changing events were not setting wasSetByCode ↵ | Nivesh Rajbhandari | 2012-02-01 |
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | 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 | Valerio Virgillito | 2012-01-30 |
| |\ \ \ \ | |||
| | * \ \ \ | Merge pull request #7 from mayhewinator/WorkingBranch | mayhewinator | 2012-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 Mayhew | 2012-01-30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | for shaders. | ||
| * | | | | | | Merge branch 'core' of https://github.com/mencio/ninja-internal into mencio-core | Valerio Virgillito | 2012-01-30 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: index.html Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | Adding browser check for Chrome and redirect page. | Valerio Virgillito | 2012-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> |