aboutsummaryrefslogtreecommitdiff
path: root/js/lib/geom/geom-obj.js
Commit message (Expand)AuthorAge
* Merge branch 'normalize' of https://github.com/kriskowal/ninja-internalValerio Virgillito2012-07-09
|\
| * Remove trailing spacesKris Kowal2012-07-06
| * Expand tabsKris Kowal2012-07-06
* | Merge branch 'refs/heads/ninja-internal' into MaterialsUINivesh Rajbhandari2012-07-09
|\|
| * Update copyright boilerplateKris Kowal2012-07-06
* | PI, drawing and editing fixes for shapes and materials.Nivesh Rajbhandari2012-07-09
|/
* material cleanup and rearchitecturehwc4872012-06-06
* Fixed authortime & runtime for twist vertex shader.hwc4872012-05-29
* More merge problemshwc4872012-05-14
* Fixing merge issueshwc4872012-05-14
* Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-05-11
|\
| * Converting geom-obj to object literal notation.Nivesh Rajbhandari2012-05-02
* | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-05-01
|\|
| * Snapping tocontained objectshwc4872012-04-24
* | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-04-19
|\|
| * IKNinja-1477 - Cannot preflight Fill color if WebGL Line shape is selected.Nivesh Rajbhandari2012-04-17
| * Undoing mistakes from auto-merge.Nivesh Rajbhandari2012-04-05
| * Merge branch 'refs/heads/WebGLFileIO' into ToolFixesNivesh Rajbhandari2012-04-04
| |\
| | * IKNinna-1409 - Should dirty document when changing shape properties. IKNinja-...Nivesh Rajbhandari2012-04-02
| | * 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
| * | | removed old unused import and export functions.John Mayhew2012-04-03
| | |/ | |/|
| * | Merge branch 'master' into brushtoolPushkar Joshi2012-03-27
| |\|
| | * Fixed issue with WebGL materials not working after file-save or chrome-previe...Nivesh Rajbhandari2012-03-26
| * | File IO for the brush stroke AND changing the data type of brush stroke from ...Pushkar Joshi2012-03-27
| |/
* | started the flag materialhwc4872012-04-03
* | texture abstractionhwc4872012-04-02
|/
* Fixed a problem switching from 3D to 2D and back to 3D.hwc4872012-03-23
* Added Paris and Raiders materialshwc4872012-03-22
* Bug Fixes for Canvas & WebGL File IOhwc4872012-03-20
* Supporting new and old GL data formats.hwc4872012-03-16
* Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into int...hwc4872012-03-16
|\
| * Merge pull request #34 from ericmueller/integrationJose Antonio Marquez Russo2012-03-15
| |\
| * \ Merge pull request #110 from mqg734/WebGLFixesValerio Virgillito2012-03-13
| |\ \
| | * | Support import/export of gradient materials. This fixes the eyedropper not b...Nivesh Rajbhandari2012-03-12
| | * | Fix for stroke and fill gradients not being retained when drawing multiple sh...Nivesh Rajbhandari2012-03-07
| | * | preliminary support for setting gradients on webgl shapes.Nivesh Rajbhandari2012-03-07
* | | | Conversion to JSON based file IO for canvas2D and WebGL renderinghwc4872012-03-16
| |_|/ |/| |
* | | Uber material changes for IOhwc4872012-03-12
|/ /
* | Canvas IOhwc4872012-03-08
* | File IOhwc4872012-03-07
|/
* Squashed commit of preload-fix into MasterValerio Virgillito2012-03-06