Commit message (Collapse) | Author | Age | ||
---|---|---|---|---|
... | ||||
| | * | | | | | | WebGL needs to have 3d styles to render. | Nivesh Rajbhandari | 2012-03-22 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | * | | | | | | Do not set webkit-transform styles on elements unless 3d is used on them. | Nivesh Rajbhandari | 2012-03-21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | * | | | | | | Get matrix and perspective distance from styles controller. | Nivesh Rajbhandari | 2012-03-21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | * | | | | | | IKNINJA-1370 - Toggle WebGL on/off is no longer working in the PI. | Nivesh Rajbhandari | 2012-03-20 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This bug was injected by some changes in GLWorld.import. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
* | | | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-04-05 | |
|\| | | | | | | | ||||
| * | | | | | | | Merge pull request #155 from ericguzman/PresetsPI | Valerio Virgillito | 2012-04-05 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Presets controller - update for "_element" removal in selection objects | |||
| | * | | | | | | | Presets Controller - Update to not use "_element" property of selection. | Eric Guzman | 2012-04-04 | |
| | | |_|_|/ / / | | |/| | | | | | ||||
| * | | | | | | | Merge pull request #153 from mencio/components | Valerio Virgillito | 2012-04-05 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Components panel cleanup and displaying only simple properties. | |||
| | * | | | | | | | Merge branch 'refs/heads/master' into components | Valerio Virgillito | 2012-04-04 | |
| | |\| | | | | | | ||||
| | * | | | | | | | Merge branch 'refs/heads/master' into components | Valerio Virgillito | 2012-03-30 | |
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | ||||
| | * | | | | | | | Merge branch 'refs/heads/master' into components | Valerio Virgillito | 2012-03-28 | |
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | ||||
| | * | | | | | | | removed trace statement | Valerio Virgillito | 2012-03-27 | |
| | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| * | | | | | | | [CR] Keep Save related menu items always enabled, if there is an open document | Ananya Sen | 2012-04-04 | |
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | |||
* | | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-04-04 | |
|\| | | | | | | ||||
| * | | | | | | Merge branch 'refs/heads/master' into PresetsPI | Eric Guzman | 2012-04-04 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/presets-controller.js | |||
| * | | | | | | | Animation Presets - Only combine animations if pre-existing animations exist | Eric Guzman | 2012-04-02 | |
| | | | | | | | | ||||
| * | | | | | | | Presets Controller - Remove unused method call | Eric Guzman | 2012-03-30 | |
| | | | | | | | | ||||
| * | | | | | | | Merge branch 'refs/heads/master' into PresetsPI | Eric Guzman | 2012-03-29 | |
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | ||||
| * | | | | | | | Presets - Remove style transition when transition doesn't start. Also added ↵ | Eric Guzman | 2012-03-29 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | temporary fix for aggregating animations (from timeline/presets) | |||
* | | | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-04-04 | |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | ||||
| * | | | | | | | Squashed commit of Preparing for the montage undo-manager: Architecture changes | Valerio Virgillito | 2012-04-04 | |
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reworked the add and remove elements into 1 function which can take 1 or more elements. Removed the _element from the selection array Many other changes related to those 2 changes Undo/Redo shortcuts are now using montage undo/redo manager. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
* | | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-04-02 | |
|\| | | | | | | ||||
| * | | | | | | Merge pull request #147 from pushkarjoshi/brushtool | Valerio Virgillito | 2012-03-29 | |
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | Brushtool | |||
| | * | | | | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-03-28 | |
| | |\ \ \ \ \ | ||||
| | * \ \ \ \ \ | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-03-27 | |
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | ||||
| | * | | | | | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-03-27 | |
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/shapes-controller.js | |||
| | * | | | | | | revert to using the angle without flipping its sign...fixing some minor bugs ↵ | Pushkar Joshi | 2012-03-20 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and code cleanup GOOD status before doing 3D unprojection step | |||
| | * | | | | | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-03-16 | |
| | |\ \ \ \ \ \ | ||||
| | * | | | | | | | update values in the PI from values of the selected brush stroke or pen tool ↵ | Pushkar Joshi | 2012-03-15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | path | |||
| | * | | | | | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-03-14 | |
| | |\ \ \ \ \ \ \ | ||||
| | * | | | | | | | | PI for pen and brush strokes | Pushkar Joshi | 2012-03-14 | |
| | | | | | | | | | | ||||
| * | | | | | | | | | Merge pull request #131 from ananyasen/integration-candidate | Valerio Virgillito | 2012-03-28 | |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | Pull request IKNINJA-1302, IKNINJA-1367, IKNINJA-1361, IKNINJA-1364, IKNINJA-1302, IKNINJA-1266 | |||
| | * | | | | | | | | - enable/disable save, saveAs, saveAll, close, closeAll as per documents open | Ananya Sen | 2012-03-22 | |
| | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added close file and close all menu items Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> Conflicts: js/helper-classes/3D/draw-utils.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | |||
| * | | | | | | | | Merge pull request #145 from ericguzman/PresetsPI | Valerio Virgillito | 2012-03-28 | |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | / | | | |_|_|_|_|/ | | |/| | | | | | Presets - Adding presets controller | |||
| | * | | | | | | Merge branch 'refs/heads/master' into PresetsPI | Eric Guzman | 2012-03-27 | |
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | ||||
| | * | | | | | | Presets Panel - Adding presets controller and removing functionality from ↵ | Eric Guzman | 2012-03-22 | |
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | panel code | |||
| * | | | | | | Reverting change for IKNinja-1355 because it is causing line tool to fail. | Nivesh Rajbhandari | 2012-03-27 | |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | | | | | Merge pull request #142 from joseeight/Color | Valerio Virgillito | 2012-03-26 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Color Bug Fix | |||
| | * | | | | | Fix: IKNINJA-1355 | Jose Antonio Marquez | 2012-03-26 | |
| | |/ / / / | ||||
| * |