aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #389 from ericmueller/GridFixesValerio Virgillito2012-07-12
|\ | | | | Grid fixes
| * Merge branch 'master' of github.com:Motorola-Mobility/ninja into GridFixeshwc4872012-07-11
| |\ | |/ |/| | | | | Conflicts: assets/shaders/radialBlur.frag.glsl
* | Update masterSan Khong2012-07-11
| |
* | Update masterSan Khong2012-07-11
| |
* | Update masterSan Khong2012-07-11
| |
* | Merge pull request #388 from mayhewinator/masterValerio Virgillito2012-07-10
|\ \ | | | | | | final updates for Chrome App store release
| * | Fix for incorrect doctype in last commitJohn Mayhew2012-07-10
| | |
| * | final updates for Chrome App store releaseJohn Mayhew2012-07-10
|/ /
* | Updating the Readme.Valerio Virgillito2012-07-10
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Merge pull request #385 from ericmueller/ShadersRemovedValerio Virgillito2012-07-10
|\ \ | | | | | | Removed the shaders that we do not have rights to.
| * | Removed the shaders that we do not have rights to.hwc4872012-07-10
|/ /
| * re-wrote the radial blur shader. Changed tolerances in the deformation shaders.hwc4872012-07-11
| |
| * Tweak to an edge case in grid drawing.hwc4872012-07-10
| |
| * Grid drawing changeshwc4872012-07-10
| |
| * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-07-10
| |\ | |/ |/| | | GridFixes
* | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-07-09
|\ \
| * \ Merge pull request #384 from mayhewinator/masterValerio Virgillito2012-07-09
| |\ \ | | | | | | | | removed company name from app name in credits and license files
| | * | removed unnecessary company string in app name for license and creditsJohn Mayhew2012-07-09
| | | |
* | | | Add some <li> to the copyright noticeValerio Virgillito2012-07-09
|/ / / | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Merge pull request #382 from mayhewinator/masterValerio Virgillito2012-07-09
|\| | | | | | | | fixed remaining copyrights and fixed capitalization for doctype tag
| * | fixed incorrect capitalization for DOCTYPE htmlJohn Mayhew2012-07-09
| | |
| * | cleaned up remaining copyrights for releaseJohn Mayhew2012-07-09
| | |
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalJohn Mayhew2012-07-09
| |\ \ | |/ / |/| |
* | | Merge pull request #381 from kriskowal/normalizeValerio Virgillito2012-07-09
|\ \ \ | | | | | | | | Normalize HTML DOCTYPE
| * | | 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 'master' of github.com:Motorola-Mobility/ninja-internalJohn Mayhew2012-07-09
| | |\ \ | |_|/ / |/| | | | | | | | | | | Conflicts: manifest.json
* | | | Merge pull request #380 from ananyasen/codemirror-custom-theme-removalValerio Virgillito2012-07-09
|\ \ \ \ | |/ / / |/| | | Codemirror custom theme removal
| * | | Merge branch 'refs/heads/ninja-internal-master' into ↵Ananya Sen2012-07-09
| |\ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | codemirror-custom-theme-removal Conflicts: js/code-editor/codemirror-ninja/theme/lesser-dark-ninja.css js/code-editor/codemirror-ninja/theme/xq-dark-ninja.css Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | 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
| * | | removed unnecessary todo commentsAnanya Sen2012-07-09
| | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | Removed the customized xq-dark and lesser-dark themes temporarily until ↵Ananya Sen2012-07-09
| | | | | | | | | | | | | | | | | | | | | | | | copyright legalities determined Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalJohn Mayhew2012-07-09
| | |\ \ | | |/ / | |/| |
| | * | Merge branch 'master' of github.com:mayhewinator/ninja-internalJohn Mayhew2012-07-03
| | |\ \
| | * | | Updated manifest.json for alpha buildJohn Mayhew2012-07-03
| | | | |
| | | | * Grid drawing fixeshwc4872012-07-10
| | | | |
| | | | * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-07-09
| | | | |\ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | GridFixes Conflicts: js/helper-classes/3D/StageLine.js
* | | | | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 22:59:54 +0000