| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Adding all the shaders back in | hwc487 | 2012-02-22 |
| | | |||
| * | Adding bug fixes. | hwc487 | 2012-02-22 |
| | | |||
| * | Merge branch 'WebGLMaterials' of github.com:mqg734/ninja-internal into ↵ | hwc487 | 2012-02-21 |
| |\ | | | | | | | integration | ||
| | * | Updated Materials Library and Materials Editor Popup to work with latest ↵ | mqg734 | 2012-02-21 |
| | | | | | | | | | | | | | | | | | version of Montage. We had to change our css to not use id's. Also, updated the popup to use Montage's Popup component. It looks like bump material has a bug. So loading that material results in a runtime error. | ||
| | * | Merge branch 'refs/heads/ninja-internal' into ToolFixes | Nivesh Rajbhandari | 2012-02-20 |
| | |\ | |||
| | * | | Fix for not being able to select an element in Top/Side view. | Nivesh Rajbhandari | 2012-02-14 |
| | | | | | | | | | | | | | | | | | | | Fall back to use SnapManager code if elementFromPoint returns the viewport. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | Merge branch 'refs/heads/ninja-internal' into ToolFixes | Nivesh Rajbhandari | 2012-02-14 |
| | |\ \ | |||
| | * | | | Get color under mouse point from image or canvas. | Nivesh Rajbhandari | 2012-02-14 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | Get color from canvas and images. | Nivesh Rajbhandari | 2012-02-14 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | Merge branch 'refs/heads/ninja-internal' into ToolFixes | Nivesh Rajbhandari | 2012-02-14 |
| | |\ \ \ | |||
| | * | | | | Check if eyedropper is over border or background. | Nivesh Rajbhandari | 2012-02-13 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | Fixed issue with tools not drawing their handles when mousing up. | Nivesh Rajbhandari | 2012-02-13 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | Working around inconsistent color object when getting/setting WebGL values. | Nivesh Rajbhandari | 2012-02-13 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | Fixed eyedropper tool to use new color routines. | Nivesh Rajbhandari | 2012-02-13 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | Updated ink bottle tool to use new setColor routine in the mediator and ↵ | Nivesh Rajbhandari | 2012-02-13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | controllers. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | | Cloud URL localStorage Fix | Jose Antonio Marquez | 2012-02-20 |
| | |_|_|/ |/| | | | | | | | | | | | Fixed logic to remember and display the previously used URL for local cloud if not started on Ninja load. | ||
| * | | | | Merge pull request #55 from mencio/nested-selection | Valerio Virgillito | 2012-02-17 |
| |\ \ \ \ | | | | | | | | | | | Re-adding stage mouse wheel scrolling | ||
| | * | | | | Re-adding stage mouse wheel scrolling | Valerio Virgillito | 2012-02-17 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | Chrome Preview | Jose Antonio Marquez | 2012-02-17 |
| | | | | | | |||
| * | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-17 |
| |\ \ \ \ \ | |||
| | * | | | | | Fixing the getStageWorldToGlobalMatrix bug | Valerio Virgillito | 2012-02-16 |
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | removing the snapManager reference in viewUtils Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | Adding webRequest redirects for iFrame templates | Jose Antonio Marquez | 2012-02-17 |
| | | | | | | |||
| * | | | | | Adding Chrome webRequest intercept | Jose Antonio Marquez | 2012-02-17 |
| | | | | | | | | | | | | | | | | | | | | | Need to add logic to resolve file's actual URL dynamically. | ||
| * | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-16 |
| |\| | | | | |||
| | * | | | | Fixing the selectInput and finishing the textinput | Valerio Virgillito | 2012-02-16 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | Merge branch 'refs/heads/master' into components | Valerio Virgillito | 2012-02-16 |
| | |\ \ \ \ | |||
| | | * \ \ \ | Merge pull request #50 from mencio/canvas-data | Valerio Virgillito | 2012-02-16 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | Adding canvas data attributes | ||
| | | | * | | | | Adding a data-RDGE-id attribute to each canvas to save/load canvas data | Valerio Virgillito | 2012-02-16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | | * | | | | Support for data attributes and adding a random string generator | Valerio Virgillito | 2012-02-16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | | Merge branch 'refs/heads/master' into components | Valerio Virgillito | 2012-02-15 |
| | |\ \ \ \ \ \ | |||
| | * | | | | | | | Adding more components pi | Valerio Virgillito | 2012-02-15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added rest of the components pi. Missing text-input and select Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | | | Adding the button and the dropdown control. | Valerio Virgillito | 2012-02-15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | | | fixing the controller to handle all properties | Valerio Virgillito | 2012-02-14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | | | Completing the anchor element | Valerio Virgillito | 2012-02-14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | | | Adding all the components to the panel | Valerio Virgillito | 2012-02-14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | | | Merge branch 'refs/heads/master' into components | Valerio Virgillito | 2012-02-14 |
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||
| * | | | | | | | | Moving Ninja iFrame templates | Jose Antonio Marquez | 2012-02-16 |
| | | | | | | | | | |||
| * | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-16 |
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||
| | * | | | | | | | Fixing the preset panel undefined property for the menu model. | Valerio Virgillito | 2012-02-16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-16 |
| |\| | | | | | | | |||
| | * | | | | | | | Merge pull request #46 from ericguzman/PresetsPanel | Valerio Virgillito | 2012-02-16 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Presets panel initial merge into master | ||
| | | * | | | | | | | Presets Panel - Move to bottom, add to menu | Eric Guzman | 2012-02-16 |
| | | | | | | | | | | |||
| | | * | | | | | | | Merge branch 'refs/heads/master' into PresetsPanel | Eric Guzman | 2012-02-16 |
| | | |\ \ \ \ \ \ \ | |||
| | | * | | | | | | | | Presets - Minor CSS text-shadow work-around for Windows Chrome | Eric Guzman | 2012-02-16 |
| | | | | | | | | | | | |||
| | | * | | | | | | | | Merge branch 'refs/heads/master' into PresetsPanel | Eric Guzman | 2012-02-16 |
| | | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | | | |||
| | | * | | | | | | | | Merge branch 'refs/heads/TreeComponents' into PresetsPanel | Eric Guzman | 2012-02-16 |
| | | |\ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | | Presets - Get/set active tab from local storage + other improvements | Eric Guzman | 2012-02-15 |
| | | | | | | | | | | | | |||
| | | * | | | | | | | | | Presets - Modify application of preset classes for new json structure | Eric Guzman | 2012-02-15 |
| | | | | | | | | | | | | |||
| | | * | | | | | | | | | Presets - Modify structure of preset data | Eric Guzman | 2012-02-15 |
| | | | | | | | | | | | | |||
| | | * | | | | | | | | | Presets - Add external json file with transition data | Eric Guzman | 2012-02-15 |
| | | | | | | | | | | | | |||