aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Normalize HTML DOCTYPEKris Kowal2012-07-09
| | | | | | | Was lower-case. Now upper-case. Also fixed BOMs, trailing white-space, DOS line terminators. Did not expand tabs to spaces.
* Merge branch 'refs/heads/Ninja-Internal' into AnalyticsJose Antonio Marquez2012-07-09
|\ | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Merge pull request #376 from kriskowal/bsdValerio Virgillito2012-07-09
| |\ | | | | | | BSD License
| | * BSD LicenseKris Kowal2012-07-09
| |/
* / Adding Google AnalyticsJose Antonio Marquez2012-07-09
|/ | | | | | | Conflicts: index.html js/ninja.reel/ninja.html
* Merge branch 'normalize' of https://github.com/kriskowal/ninja-internalValerio Virgillito2012-07-09
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/gradientpicker.reel/gradientpicker.js js/components/tools-properties/text-properties.reel/text-properties.js js/document/views/base.js js/document/views/design.js js/helper-classes/3D/StageLine.js js/helper-classes/3D/draw-utils.js js/lib/drawing/world.js js/lib/geom/circle.js js/lib/geom/line.js js/lib/geom/rectangle.js js/lib/geom/shape-primitive.js js/lib/rdge/materials/bump-metal-material.js js/lib/rdge/materials/flag-material.js js/lib/rdge/materials/fly-material.js js/lib/rdge/materials/julia-material.js js/lib/rdge/materials/keleidoscope-material.js js/lib/rdge/materials/mandel-material.js js/lib/rdge/materials/material.js js/lib/rdge/materials/plasma-material.js js/lib/rdge/materials/pulse-material.js js/lib/rdge/materials/radial-gradient-material.js js/lib/rdge/materials/taper-material.js js/lib/rdge/materials/twist-vert-material.js js/lib/rdge/materials/water-material.js js/panels/Materials/materials-library-panel.reel/materials-library-panel.html js/panels/Materials/materials-library-panel.reel/materials-library-panel.js js/panels/Materials/materials-popup.reel/materials-popup.html js/panels/Materials/materials-popup.reel/materials-popup.js js/tools/LineTool.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Normalize HTML doctypeKris Kowal2012-07-06
| |
| * Remove byte order markers (BOM)Kris Kowal2012-07-06
| |
| * Remove trailing spacesKris Kowal2012-07-06
| |
| * Normalize to unix line terminatorsKris Kowal2012-07-06
| |
| * Remove trailing spacesKris Kowal2012-07-06
| |
| * Expand tabsKris Kowal2012-07-06
| |
* | Merge branch 'GIO-TextTool' of https://github.com/dhg637/ninja-internalValerio Virgillito2012-07-09
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: js/components/tools-properties/text-properties.reel/text-properties.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * \ Merge branch 'refs/heads/master' into GIO-TextToolArmen Kesablyan2012-07-03
| |\ \
| | * \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-07-03
| | |\ \
| * | | | Text Tool 2Armen Kesablyan2012-07-03
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | Merge branch 'refs/heads/master' into GIO-TextToolArmen Kesablyan2012-07-02
| |\| | |
| | * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-07-02
| | |\ \ \
| * | | | | Bug: Font Name & Size not updating text toolArmen Kesablyan2012-07-02
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-28
| |\ \ \ \
* | \ \ \ \ Merge branch 'Taper' of https://github.com/ericmueller/ninja-internalValerio Virgillito2012-07-09
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/lib/geom/circle.js js/lib/rdge/materials/linear-gradient-material.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | 'V' texture map coordinate was inverted in some cases.hwc4872012-06-29
| | | | | | |
| * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Taperhwc4872012-06-29
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Taperhwc4872012-06-28
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| * | | | | | | Added capability to split a mesh into multiiple parts to avoid buffer ↵hwc4872012-06-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | overflow situations.
* | | | | | | | Merge pull request #375 from mencio/manifestValerio Virgillito2012-07-09
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | updating the manifest
| * | | | | | | | updating the manifestValerio Virgillito2012-07-09
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | Merge pull request #372 from mencio/youtube-fixValerio Virgillito2012-07-09
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Removing the youtube hack now that we have the proper fix from montage
| * | | | | | | | Removing the youtube hack now that we have the proper fix from montageValerio Virgillito2012-07-03
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing the saved instance of the component when opening a file containing the youtube component. Montage made the fix where the instance is now serialized property. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | Merge pull request #371 from ananyasen/menu-bug-fixValerio Virgillito2012-07-09
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | fixed IKNINJA-1877 : Clicking on a menu item should commit on mouse up a...
| * | | | | | | | fixed IKNINJA-1877 : Clicking on a menu item should commit on mouse up and ↵Ananya Sen2012-07-03
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not on mouse down. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | | | | Merge pull request #368 from mqg734/CopyPasteWebGLValerio Virgillito2012-07-09
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | IKNinja-1736 and IKNinja-1802 - Copy paste WebGL bugs.
| * | | | | | | | IKNinja-1736 and IKNinja-1802 - Copy paste WebGL bugs.Nivesh Rajbhandari2012-07-02
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | | Merge pull request #366 from joseeight/ColorValerio Virgillito2012-07-09
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix: IKNINJA-1634
| * | | | | | | | Fix: IKNINJA-1634Jose Antonio Marquez2012-07-02
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Fixing reference error for gradient stops on click.
* | | | | | | | Merge pull request #364 from ananyasen/bugfix-masterValerio Virgillito2012-07-09
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fixed IKNINJA-1763, IKNINJA-1807 - refresh stage after loading image/svg
| * | | | | | | | removing unnecessary variableAnanya Sen2012-06-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | | Fixed IKNINJA-1763, IKNINJA-1807 - refresh stage after loading is done for ↵Ananya Sen2012-06-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | image and svg Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | | | | | Merge pull request #357 from ericmueller/GridFixesValerio Virgillito2012-07-09
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fixes for incorrect line/polygon intersections.
| * | | | | | | | | Fixes a bug in rectangle containment test.hwc4872012-06-29
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-29
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | GridFixes
| * | | | | | | | | Fixes for incorrect line/polygon intersections.hwc4872012-06-28
| | | | | | | | | |
* | | | | | | | | | Merge pull request #346 from mqg734/MaterialsUIValerio Virgillito2012-07-09
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | UI support for preview, edit, duplicate and delete of WebGL Materials.
| * | | | | | | | | Merge branch 'refs/heads/ninja-internal' into MaterialsUINivesh Rajbhandari2012-07-09
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Materials/materials-library-panel.reel/materials-library-panel.css js/panels/Materials/materials-popup.reel/materials-popup.css Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | | | | adding missing copyright to the feed reader.Valerio Virgillito2012-07-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | | | Merge pull request #373 from kriskowal/bsdValerio Virgillito2012-07-06
|\ \ \