aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Timeline: Remove selection timer on add new layer method.Jon Reid2012-03-15
|
* Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-localJon Reid2012-03-15
|\
| * revert spaceJonathan Duran2012-03-15
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-03-15
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/selection-controller.js js/helper-classes/RDGE/src/tools/rdge-compiled.js js/helper-classes/backup-delete/GLBrushStroke.js js/helper-classes/backup-delete/GLCircle.js js/helper-classes/backup-delete/GLGeomObj.js js/helper-classes/backup-delete/GLRectangle.js js/helper-classes/backup-delete/GLSubpath.js js/helper-classes/backup-delete/GLWorld.js js/helper-classes/backup-delete/Materials/BumpMetalMaterial.js js/helper-classes/backup-delete/Materials/DeformMaterial.js js/helper-classes/backup-delete/Materials/FlatMaterial.js js/helper-classes/backup-delete/Materials/FlyMaterial.js js/helper-classes/backup-delete/Materials/JuliaMaterial.js js/helper-classes/backup-delete/Materials/KeleidoscopeMaterial.js js/helper-classes/backup-delete/Materials/LinearGradientMaterial.js js/helper-classes/backup-delete/Materials/MandelMaterial.js js/helper-classes/backup-delete/Materials/PlasmaMaterial.js js/helper-classes/backup-delete/Materials/PulseMaterial.js js/helper-classes/backup-delete/Materials/RadialBlurMaterial.js js/helper-classes/backup-delete/Materials/RadialGradientMaterial.js js/helper-classes/backup-delete/Materials/ReliefTunnelMaterial.js js/helper-classes/backup-delete/Materials/SquareTunnelMaterial.js js/helper-classes/backup-delete/Materials/StarMaterial.js js/helper-classes/backup-delete/Materials/TaperMaterial.js js/helper-classes/backup-delete/Materials/TunnelMaterial.js js/helper-classes/backup-delete/Materials/TwistMaterial.js js/helper-classes/backup-delete/Materials/TwistVertMaterial.js js/helper-classes/backup-delete/Materials/UberMaterial.js js/helper-classes/backup-delete/Materials/WaterMaterial.js js/helper-classes/backup-delete/Materials/ZInvertMaterial.js js/lib/drawing/world.js js/preloader/Preloader.js js/stage/layout.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-03-15
| | |\
| | | * Merge pull request #116 from joseeight/ColorValerio Virgillito2012-03-14
| | | |\ | | | | | | | | | | Temp Fix for: IKNINJA-1078
| | | | * Temp Fix for: IKNINJA-1078Jose Antonio Marquez2012-03-13
| | | | |
| | * | | Removing the backup-delete folder and the RDGE tools directory.Valerio Virgillito2012-03-15
| | |/ / | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | Removing the obsolete modalContainer div.Valerio Virgillito2012-03-14
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | Merge pull request #117 from mencio/layout-fixValerio Virgillito2012-03-14
| | |\ \ | | | | | | | | | | Layout Fixes and Canvas sized when panels are collapsed
| | | * | Fixing the layout to only draw one level and stage resize when the panels ↵Valerio Virgillito2012-03-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | are collapsed. Fixing the following bugs: IKNINJA-1068 Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | Some code cleanup - removing unused assignments.Valerio Virgillito2012-03-13
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | Merge pull request #114 from mqg734/ToolFixesValerio Virgillito2012-03-13
| | |\ \ \ | | | |/ / | | |/| | Fixed selection rectangle for multiple selection case.
| | | * | Fixed drawing of multiple selection bounds when in flat case.Nivesh Rajbhandari2012-03-13
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-03-13
| | | |\ \
| | | * \ \ Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-03-13
| | | |\ \ \
| | | * | | | Fixing selection tool when moving multiple selection in 3d mode.Nivesh Rajbhandari2012-03-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | | Fixing snapping bugs in Selection, translate and rotate tools.Nivesh Rajbhandari2012-03-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should show snap marker on mouse move for selection tool prior to mousing down as well. We should create drag plane parallel to the view and where the user moused down. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-03-12
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-03-02
| | | |\ \ \ \ \
| | * | \ \ \ \ \ Merge pull request #112 from ericguzman/PresetsPanelValerio Virgillito2012-03-13
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Presets panel - Ninja-leaf hover state
| | | * | | | | | | Presets Panel - Re-add dbl-click activationEric Guzman2012-03-13
| | | | | | | | | |
| | | * | | | | | | Presets Panel - Remove :active pseudo class from ninja-leafEric Guzman2012-03-13
| | | | | | | | | |
| | | * | | | | | | Presets Panel - Add :active pseudo class for ninja-treeEric Guzman2012-03-13
| | | | | | | | | |
| | | * | | | | | | Presets Panel - Adding single-click activationEric Guzman2012-03-13
| | | | | | | | | |
| | | * | | | | | | Presets Panel - Adding hover state to ninja-leafEric Guzman2012-03-13
| | | | |_|_|/ / / | | | |/| | | | |
| | * | | | | | | Merge pull request #115 from joseeight/ColorValerio Virgillito2012-03-13
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | Color folder rename
| | | * | | | | | Deleting temp folderJose Antonio Marquez2012-03-13
| | | | | | | | |
| | | * | | | | | Renaming folderJose Antonio Marquez2012-03-13
| | | | | | | | |
| | * | | | | | | Merge pull request #113 from joseeight/ColorValerio Virgillito2012-03-13
| | |\| | | | | | | | | |_|_|_|_|/ | | |/| | | | | Gradient stop logic
| | | * | | | | Gradient stop logicJose Antonio Marquez2012-03-13
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | Made logic changes to allow for a minimum number of gradients to remain at 2 at all times and not apply default colors.
| | * | | | | Merge pull request #109 from imix23ways/TimelineUberValerio Virgillito2012-03-13
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Timeline uber
| | * \ \ \ \ \ Merge pull request #111 from pushkarjoshi/pentoolValerio Virgillito2012-03-13
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Pentool
| | | * \ \ \ \ \ Merge branch 'master' into pentoolPushkar Joshi2012-03-13
| | | |\ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Merge pull request #110 from mqg734/WebGLFixesValerio Virgillito2012-03-13
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Gradient Support for Shapes and Eyedropper support for gradients. Also fixed 3d bug when moving multiple selections in 3d using the Selection Tool
| | | * | | | | | | Support import/export of gradient materials. This fixes the eyedropper not ↵Nivesh Rajbhandari2012-03-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | being able to sample gradient colors from WebGL shapes. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | | | | | Fixed element mediator, PI, and eye-dropper to handle different borders ↵Nivesh Rajbhandari2012-03-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sides and gradients. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | | | | | Adding gradientMode value in defaultGradient object.Nivesh Rajbhandari2012-03-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-03-09
| | | |\ \ \ \ \ \ \ | | | | | |_|_|_|_|/ | | | | |/| | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-03-09
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | Fixing selection tool when moving multiple selection in 3d mode.Nivesh Rajbhandari2012-03-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | | | | | | Fixing radial gradient for rectangle.Nivesh Rajbhandari2012-03-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | | | | | | Fixing radial gradients for line and circle.Nivesh Rajbhandari2012-03-09
| | | | | | | | | | | | | | | | | | | | | | | | |