aboutsummaryrefslogtreecommitdiff
<
Commit message (Expand)AuthorAge
...
| | | | | | * | | | | | | | | | | | | | | | Undoing bad auto-merge resize-composer.js.Nivesh Rajbhandari2012-04-05
| | | | | | * | | | | | | | | | | | | | | | Fixing curly brackets from auto-merge.Nivesh Rajbhandari2012-04-05
| | | | | | * | | | | | | | | | | | | | | | Changing .default to ["default"] to avoid WebStorm errors.Nivesh Rajbhandari2012-04-05
| | | | | | * | | | | | | | | | | | | | | | Undoing some minor spacing differences from auto-merge.Nivesh Rajbhandari2012-04-05
| | | | | | * | | | | | | | | | | | | | | | Undoing mistakes from auto-merge.Nivesh Rajbhandari2012-04-05
| | | | | | * | | | | | | | | | | | | | | | Removing unnecessary code element = element.Nivesh Rajbhandari2012-04-05
| | | | | | * | | | | | | | | | | | | | | | Commenting out console logs.Nivesh Rajbhandari2012-04-05
| | | | | | * | | | | | | | | | | | | | | | Merge branch 'refs/heads/ToolFixes' into WebGLMaterialsNivesh Rajbhandari2012-04-04
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/WebGLFileIO' into ToolFixesNivesh Rajbhandari2012-04-04
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | * | | | | | | | | | | | | | | | We should require VecUtils instead of referring to the global reference since...Nivesh Rajbhandari2012-04-04
| | | | | | | | * | | | | | | | | | | | | | | | Merge branch 'refs/heads/EricSnapping' into WebGLFileIONivesh Rajbhandari2012-04-04
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | |_|_|/ / / / / / / / / / / / | | | | | | | | | |/| | | | | | | | | | | | | |
| | | | | | | | | * | | | | | | | | | | | | | | Snapping fixes.hwc4872012-04-02
| | | | | | | | | * | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Sna...hwc4872012-03-29
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | |
| | | | | | | | | * | | | | | | | | | | | | | | merge from mainhwc4872012-03-29
| | | | |_|_|_|_|/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | |
| | | | | | | | * | | | | | | | | | | | | | | Adjusting line's width and height when changing stroke size.Nivesh Rajbhandari2012-04-04
| | | | | | | | * | | | | | | | | | | | | | | IKNinja-635 - Can't see 3d handles if div is red, green or blue color.Nivesh Rajbhandari2012-04-03
| | | | | | | | * | | | | | | | | | | | | | | Give user feedback about which element the Fill/InkBottle tools will act on.Nivesh Rajbhandari2012-04-03
| | | | | | | | * | | | | | | | | | | | | | | IKNinja-1375 - After WebGL conversion from PI, Selection tool gets deactivate...Nivesh Rajbhandari2012-04-03
| | | | | | | | * | | | | | | | | | | | | | | IKNinja-1392 - Unable to view Oval canvas2D with Inner Radius in the Chrome-P...Nivesh Rajbhandari2012-04-03
| | | | | | | | * | | | | | | | | | | | | | | IKNinja-1376 - 3D values reverted when using Selection tool to move the objec...Nivesh Rajbhandari2012-04-02
| | | | | | | | * | | | | | | | | | | | | | | IKNinja-1399 - [Eyedropper] Not sampling WebGL gradients after file open.Nivesh Rajbhandari2012-04-02
| | | | | | | | * | | | | | | | | | | | | | | Switching to Linear/RadialGradient materials will set the corresponding color...Nivesh Rajbhandari2012-04-02
| | | | | | | | * | | | | | | | | | | | | | | IKNinna-1409 - Should dirty document when changing shape properties. IKNinja-...Nivesh Rajbhandari2012-04-02
| | | | | | | | * | | | | | | | | | | | | | | IKNinja-1410 - Inner Radius should be restricted to 99%.Nivesh Rajbhandari2012-04-02
| | | | | | | | * | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLFileIONivesh Rajbhandari2012-04-02
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | |_|_|/ / / / / / / / / / / | | | | | | | | | |/| | | | | | | | | | | | |
| | | | | | | | * | | | | | | | | | | | | | | Update PI and Color Panel to reflect default LinearGradient and RadialGradien...Nivesh Rajbhandari2012-03-30
| | | | | | | | * | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLFileIONivesh Rajbhandari2012-03-30
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | |
| | | | | | | | * | | | | | | | | | | | | | | Updated shapes to always check for its stroke and fill colors and materials i...Nivesh Rajbhandari2012-03-29
| | | | | | | | * | | | | | | | | | | | | | | We shouldn't set z to 0 for translate tool snapping because user may want to ...Nivesh Rajbhandari2012-03-29
| | | | |_|_|_|/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | |
| | | | | | | * | | | | | | | | | | | | | | Styling PI's Materials edit button.Nivesh Rajbhandari2012-04-04
| | | | | | | * | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-04-04
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #156 from mayhewinator/WorkingBranchValerio Virgillito2012-04-04
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor...John Mayhew2012-04-04
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | removed unnecessary call to exportMaterials from init(). this call should not...John Mayhew2012-04-04
| * | | | | | | | | | | | | | | | | | | | | Removed the dependence on an "assets" directory for the RDGE runtime. Now Nin...John Mayhew2012-04-03
| * | | | | | | | | | | | | | | | | | | | | removed old unused import and export functions.John Mayhew2012-04-03
| * | | | | | | | | | | | | | | | | | | | | Namespaced the canvas runtime file and updated all dependenciesJohn Mayhew2012-04-03
| * | | | | | | | | | | | | | | | | | | | | updated the rdge compiled version and its runtime, incremented rdge library v...John Mayhew2012-04-03
| * | | | | | | | | | | | | | | | | | | | | fixed remaining namespace bugs ensuring the use of the RDGE namespace everywh...John Mayhew2012-04-03
| * | | | | | | | | | | | | | | | | | | | | removed unnecessary files from the RDGE build.John Mayhew2012-04-03
| * | | | | | | | | | | | | | | | | | | | | added the Closure compiler to the gitignore file so we wouldn't track it in s...John Mayhew2012-04-03
| * | | | | | | | | | | | | | | | | | | | | Made use of semicolons consistent and updated new files to use the new RDGE n...John Mayhew2012-04-03
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor...