| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'Snapping' of github.com:ericmueller/ninja-internal into ↵ | hwc487 | 2012-04-05 |
| |\ | | | | | | | Snapping_II | ||
| | * | translate3DObject tool fixes. | hwc487 | 2012-04-05 |
| | | | |||
| | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-04-04 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | Snapping Conflicts: js/panels/presets/animations-presets.reel/animations-presets.js js/panels/presets/style-presets.reel/style-presets.js js/panels/presets/transitions-presets.reel/transitions-presets.js | ||
| | * | | Cap fix for vecUtils. | hwc487 | 2012-04-04 |
| | | | | |||
| | * | | turned off translation handles during a multi-object drag. | hwc487 | 2012-04-04 |
| | | | | |||
| | * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-04-03 |
| | |\ \ | | | | | | | | | | | | | Snapping | ||
| | * | | | Translate 3D fix for multi-selection Z translation | hwc487 | 2012-04-02 |
| | | | | | |||
| | * | | | Snapping fixes. | hwc487 | 2012-04-02 |
| | | | | | |||
| | * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-03-29 |
| | |\ \ \ | | | | | | | | | | | | | | | | Snapping | ||
| | * | | | | merge from main | hwc487 | 2012-03-29 |
| | | | | | | |||
| * | | | | | Merge pull request #155 from ericguzman/PresetsPI | Valerio Virgillito | 2012-04-05 |
| |\ \ \ \ \ | | | | | | | | | | | | | Presets controller - update for "_element" removal in selection objects | ||
| | * \ \ \ \ | Merge branch 'refs/heads/master' into PresetsPI | Eric Guzman | 2012-04-04 |
| | |\ \ \ \ \ | |||
| | * | | | | | | Presets Controller - Update to not use "_element" property of selection. | Eric Guzman | 2012-04-04 |
| | | | | | | | | |||
| * | | | | | | | Merge pull request #158 from ananyasen/integration-candidate | Valerio Virgillito | 2012-04-05 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | - disable ok when text box is cleared using backspace and cross, for fil... | ||
| | * | | | | | | | - disable ok when text box is cleared using backspace and cross, for file ↵ | Ananya Sen | 2012-04-04 |
| | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | name and directory location, in New file and save as dialog Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | | | | | | Merge pull request #153 from mencio/components | Valerio Virgillito | 2012-04-05 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Components panel cleanup and displaying only simple properties. | ||
| | * | | | | | | fixing the number fields to not have units. | Valerio Virgillito | 2012-04-04 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | | Merge branch 'refs/heads/master' into components | Valerio Virgillito | 2012-04-04 |
| | |\ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ | Merge branch 'refs/heads/master' into components | Valerio Virgillito | 2012-04-04 |
| | |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | |||
| | * | | | | | | | completing the component simple pi | Valerio Virgillito | 2012-03-30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | | | IKNINJA-1191 - Fixed the order of the components | Valerio Virgillito | 2012-03-30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Components now appear in alphabetical order. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | | | 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> | ||
| | * | | | | | | | Cleanup of the components panel | Valerio Virgillito | 2012-03-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed to naming convention. Deleted un-used file. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | | | | Merge pull request #157 from ananyasen/ninja-internal-master-patch1 | Valerio Virgillito | 2012-04-04 |
| |\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | [CR] Keep Save related menu items always enabled, if there is an open do... | ||
| | * | | | | | | | [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 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | John Mayhew | 2012-04-04 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WorkingBranch Conflicts: js/lib/drawing/world.js | ||
| | * | | | | | | Merge pull request #154 from mqg734/ToolFixes | Valerio Virgillito | 2012-04-04 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Need to set elementModel.isIn2DSnapCache flag to false when removing element from SnapManager's cache. | ||
| | | * | | | | | | Need to set elementModel.isIn2DSnapCache flag to false when removing element ↵ | Nivesh Rajbhandari | 2012-04-04 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from SnapManager's cache. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | | | | Merge pull request #149 from dhg637/BugFixes | Valerio Virgillito | 2012-04-04 |
| | |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | Bug fixes | ||
| | | * | | | | | | Merge branch 'refs/heads/master' into BugFixes | Armen Kesablyan | 2012-04-04 |
| | | |\| | | | | | |||
| | | * | | | | | | Bug Fix: Height and width of panels not be kept | Armen Kesablyan | 2012-03-29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | | | | Resizing Bugs | Armen Kesablyan | 2012-03-29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | | | | Bug #1073: Panels interact with hottest drag drop | Armen Kesablyan | 2012-03-28 |
| | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | * | | | | | | Merge branch 'refs/heads/master' into PresetsPI | Eric Guzman | 2012-04-04 |
| | |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/presets-controller.js | ||
| | | * | | | | | 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> | ||
| | * | | | | | 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) | ||
| * | | | | | | removed unnecessary call to exportMaterials from init(). this call should ↵ | John Mayhew | 2012-04-04 |
| | | | | | | | | | | | | | | | | | | | | | | | | | not have been there. | ||
| * | | | | | | Removed the dependence on an "assets" directory for the RDGE runtime. Now ↵ | John Mayhew | 2012-04-03 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Ninja does not need to create duplicate files when it sets up the users Ninja Projects directory for RDGE support. | ||
| * | | | | | | removed old unused import and export functions. | John Mayhew | 2012-04-03 |
| | | | | | | | |||
| * | | | | | | Namespaced the canvas runtime file and updated all dependencies | John Mayhew | 2012-04-03 |
| | | | | | | | |||
| * | | | | | | updated the rdge compiled version and its runtime, incremented rdge library ↵ | John Mayhew | 2012-04-03 |
| | | | | | | | | | | | | | | | | | | | | | | | | | version number | ||
| * | | | | | | fixed remaining namespace bugs ensuring the use of the RDGE namespace ↵ | John Mayhew | |