Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'refs/heads/ToolFixes' into WebGLMaterials | Nivesh Rajbhandari | 2012-04-04 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/templates/montage-html/default_html.css js/mediators/element-mediator.js js/panels/properties.reel/properties.js js/tools/BrushTool.js js/tools/LineTool.js js/tools/PenTool.js js/tools/SelectionTool.js js/tools/ShapeTool.js js/tools/TranslateObject3DTool.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | Give user feedback about which element the Fill/InkBottle tools will act on. | Nivesh Rajbhandari | 2012-04-03 |
| | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | Presets Controller - Removing test background from transition class | Eric Guzman | 2012-03-27 |
| | | |||
| * | Presets Panel - Adding presets controller and removing functionality from ↵ | Eric Guzman | 2012-03-22 |
| | | | | | | | | panel code | ||
* | | Adding logic for flatten checkbox in PI. | Nivesh Rajbhandari | 2012-03-24 |
|/ | | | | | | | | This requires minor modifications to both StageController and ComponentController. Also removing unused global3DSettings CSS. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | Moving Ninja iFrame templates | Jose Antonio Marquez | 2012-02-16 |