aboutsummaryrefslogtreecommitdiff
path: root/js/components
Commit message (Expand)AuthorAge
* Merge branch 'master' into pentoolPushkar Joshi2012-03-14
|\
| * Some code cleanup - removing unused assignments.Valerio Virgillito2012-03-13
| * Merge pull request #112 from ericguzman/PresetsPanelValerio Virgillito2012-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 hover state to ninja-leafEric Guzman2012-03-13
| * | Gradient stop logicJose Antonio Marquez2012-03-13
* | | PI for pen and brush strokesPushkar Joshi2012-03-14
* | | Merge branch 'pentool' into brushtoolPushkar Joshi2012-03-13
|\| |
| * | Merge pull request #108 from pushkarjoshi/brushtoolValerio Virgillito2012-03-13
| |\ \
| * \ \ Merge pull request #105 from joseeight/FileIO-Build-CandidateValerio Virgillito2012-03-13
| |\ \ \ | | |_|/ | |/| |
| | * | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-09
| | |\ \
| | * | | updated file picker image iconsAnanya Sen2012-03-06
| * | | | Merge dhg637 DisabledState into master.Valerio Virgillito2012-03-12
| * | | | Committing Disabled states for tool-bar, tool-options, viewbar, breadcrumbArmen Kesablyan2012-03-12
| | |/ / | |/| |
* | | | Add a smoothing amount parameter, and hide options based on checkboxesPushkar Joshi2012-03-13
* | | | Merge branch 'master' into brushtoolPushkar Joshi2012-03-12
|\| | | | |_|/ |/| |
| * | Temp Gradient FixJose Antonio Marquez2012-03-09
| |/
* | bug fixes for spline interpolationPushkar Joshi2012-03-12
* | brush stroke options for calligraphic brush stylePushkar Joshi2012-03-08
* | implement stroke hardness such that it is percentage of the stroke width that...Pushkar Joshi2012-03-07
* | Merge branch 'master' into brushtoolPushkar Joshi2012-03-02
|\|
| * Merge branch 'NiveshColor' of https://github.com/mqg734/ninja-internal into i...Valerio Virgillito2012-02-29
| |\
| | * We need to remove color buttons from the color model when updating the PI for...Nivesh Rajbhandari2012-02-28
| * | Merge branch 'nested-selection' of https://github.com/mencio/ninja-internal i...Valerio Virgillito2012-02-28
| |\ \ | | |/ | |/|
| | * adding some margin to the bread crumb buttonsValerio Virgillito2012-02-28
| | * cleanup and fixing selecting each bread crumbValerio Virgillito2012-02-28
| | * breadcrumb cleanup and moving the resized on top of the timeline panelValerio Virgillito2012-02-27
* | | Catmull-Rom spline sampling for the brush stroke, and options for stroke size...Pushkar Joshi2012-03-02
|/ /
* | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-24
|\|
| * Adding some missing copyrightsValerio Virgillito2012-02-24
* | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-23
|\|
| * Fixing the breadcrumb button - removing toolbutton class since it is not a to...Valerio Virgillito2012-02-23
| * Updating textfield to only use nj-skinned class and updating input-group to c...Nivesh Rajbhandari2012-02-22
| * Buttons in the rectangle properties in the tools options need to float left.Nivesh Rajbhandari2012-02-22
| * Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-02-22
| |\
| * \ Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-02-22
| |\ \
| * | | Updated Materials Library and Materials Editor Popup to work with latest vers...mqg7342012-02-21
* | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-22
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'refs/heads/master' into new-tool-iconsArmen Kesablyan2012-02-22
| |\ \ \ | | | |/ | | |/|
| * | | Tool Button FixesArmen Kesablyan2012-02-16
| * | | New Icons: Last set had imperfectionsArmen Kesablyan2012-02-15
| * | | Tool Icons : New layoutArmen Kesablyan2012-02-15
* | | | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-22
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'nested-selection' of https://github.com/mencio/ninja-internal i...Valerio Virgillito2012-02-21
| |\ \ \
| | * | | cleanup of the breadcrumbValerio Virgillito2012-02-20
| | | |/ | | |/|
| * | | fixing the dirty flag and removing sass changesValerio Virgillito2012-02-21
* | | | - file picker - select file on double clickAnanya Sen2012-02-21
|/ / /
* | | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-17
|\| |
| * | Merge branch 'refs/heads/master' into PresetsPanelEric Guzman2012-02-16
| |\ \