aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| | | | | | | | | | | | | | | | | | | | | * | | | Merge branch 'master' into pentoolPushkar Joshi2012-04-03
| | | | | | | | | | | | | | | | | | | | | |\ \ \ \ | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | | | | | | | |/| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | * | | | working File I/O for pen tool created paths and some minor bug fixes (correct...Pushkar Joshi2012-04-03
| | | | | | | | | | | | | | | | | | | | | * | | | track the canvas top left position instead of the center position to figure o...Pushkar Joshi2012-04-03
| | | | | | | | | | | | | | | | | | | | | * | | | First attempt at preventing the drifting of the canvas due to floating point ...Pushkar Joshi2012-04-03
| | | | | | | | | | | | | | | | | | | | | * | | | render the pen path with local coordinates, but use stage world coordinates t...Pushkar Joshi2012-04-02
| | | | | | | | | | | | | | | | | | | | | * | | | adjust the position for the pen tool feedback cursor AND fix a bug where ever...Pushkar Joshi2012-03-28
| | | | | | | | | | | | | | | | | | | | | * | | | change cursors for pen tool realtime feedback....still need to position the c...Pushkar Joshi2012-03-28
| | | | | | | | | | | | | | | | | | | | | * | | | Merge branch 'brushtool' into pentoolPushkar Joshi2012-03-28
| | | | | | | | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | | | | | | * | | | | added cursors to the pen tool UI AND change cursor when the user hovers over ...Pushkar Joshi2012-03-27
| | | | | | | | | | | | | | | | | | | | | | | * | | Fixed materials editor popup not refreshing correctly.Nivesh Rajbhandari2012-04-16
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #162 from mqg734/BoundsCalculationValerio Virgillito2012-04-12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | / / / / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Fixing selection/tag layout drawing when canvas and image elements have borders.Nivesh Rajbhandari2012-04-12
| * | | | | | | | | | | | | | | | | | | | | | | Borders are not factored into offset calculations by the browser, so we have ...Nivesh Rajbhandari2012-04-12
| * | | | | | | | | | | | | | | | | | | | | | | offsets should be calculated on offsetParent instead of parentElement.Nivesh Rajbhandari2012-04-11
|/ / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #161 from mqg734/PerspectiveFixValerio Virgillito2012-04-11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into AllFixesNivesh Rajbhandari2012-04-09
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #159 from mqg734/WebGLMaterialsValerio Virgillito2012-04-09
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #160 from ananyasen/integration-candidateValerio Virgillito2012-04-09
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | block filenames and directories with all spaceAnanya Sen2012-04-06
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into bug...Ananya Sen2012-04-06
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #155 from ericguzman/PresetsPIValerio Virgillito2012-04-05
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-04-04
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Presets Controller - Update to not use "_element" property of selection.Eric Guzman2012-04-04
* | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #158 from ananyasen/integration-candidateValerio Virgillito2012-04-05
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #153 from mencio/componentsValerio Virgillito2012-04-05
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | fixing the number fields to not have units.Valerio Virgillito2012-04-04
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-04-04
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-04-04
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / /<