aboutsummaryrefslogtreecommitdiff
path: root/assets/shaders
Commit message (Collapse)AuthorAge
* Renamed Raiders material to Dark Blur, and Paris to Blue Sky.hwc4872012-07-19
|
* Merge branch 'master' of github.com:Motorola-Mobility/ninja into GridFixeshwc4872012-07-11
|\ | | | | | | | | Conflicts: assets/shaders/radialBlur.frag.glsl
| * 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
|/
* BSD LicenseKris Kowal2012-07-09
|
* 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>
| * Remove trailing spacesKris Kowal2012-07-06
| |
| * Expand tabsKris Kowal2012-07-06
| |
* | 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>
| * Added capability to split a mesh into multiiple parts to avoid buffer ↵hwc4872012-06-28
| | | | | | | | overflow situations.
* | Update copyright boilerplateKris Kowal2012-07-06
|/
* Material cleanup & bug fixes.hwc4872012-06-12
|
* Material cleanuphwc4872012-06-07
|
* material cleanup and rearchitecturehwc4872012-06-06
|
* Parameters for twistVertex materialhwc4872012-05-25
|
* Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-05-22
|\ | | | | | | | | | | | | | | Textures Conflicts: js/lib/geom/shape-primitive.js js/lib/rdge/materials/linear-gradient-material.js
| * WebGL linear gradients to match CSShwc4872012-05-08
| |
| * Radial gradients to match CSShwc4872012-05-08
| |
* | Editable parameters for flag, pulse, uber, and radial gradient materials.hwc4872012-05-22
| |
* | Editable material propertieshwc4872012-05-22
| |
* | Exposing parameters for pulse and plasma materialshwc4872012-05-17
| |
* | Exposing parameters in Water Materialhwc4872012-05-16
| |
* | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-04-19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures Conflicts: js/lib/drawing/world.js js/lib/geom/geom-obj.js js/lib/rdge/materials/cloud-material.js js/lib/rdge/materials/deform-material.js js/lib/rdge/materials/flat-material.js js/lib/rdge/materials/material.js js/lib/rdge/materials/pulse-material.js js/lib/rdge/materials/relief-tunnel-material.js js/lib/rdge/materials/square-tunnel-material.js js/lib/rdge/materials/star-material.js js/lib/rdge/materials/taper-material.js js/lib/rdge/materials/tunnel-material.js js/lib/rdge/materials/twist-material.js js/lib/rdge/materials/twist-vert-material.js js/lib/rdge/materials/uber-material.js js/lib/rdge/materials/water-material.js js/lib/rdge/materials/z-invert-material.js
| * Squashed commit of the following GL integrationValerio Virgillito2012-03-22
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-04-18
| | | | | | | | | | | | | | | | | | | | Snapping_II Conflicts: js/tools/Rotate3DToolBase.js js/tools/RotateStage3DTool.js js/tools/Translate3DToolBase.js js/tools/modifier-tool-base.js
* | Cloud materialhwc4872012-04-17
| |
* | Cloud materialhwc4872012-04-16
| |
* | Cloud Materialhwc4872012-04-15
| |
* | Cloud Materialhwc4872012-04-13
| |
* | Cloud materialhwc4872012-04-11
| |
* | Cloud materialhwc4872012-04-10
| |
* | added copyright info to flag frag shaderhwc4872012-04-04
| |
* | Added Flag materialhwc4872012-04-04
| |
* | started the flag materialhwc4872012-04-03
| |
* | Added Paris and Raiders materialshwc4872012-03-22
|/
* Fixed a few problems with Plasma material.hwc4872012-03-07
|
* Added all materials back inhwc4872012-02-22
|
* Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-11
|\ | | | | | | | | Conflicts: js/ninja.reel/ninja.html
| * Undoing experimental changes from the basic webgl shaders.Nivesh Rajbhandari2012-02-09
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Removed unused materials.Nivesh Rajbhandari2012-02-09
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-09
|\ \
| * | removing shadersPushkar Joshi2012-02-09
| | |
| * | changes to allow minimal rendering ofnon-animated materials.hwc4872012-02-01
| | |
| * | updated from old repohwc4872012-01-27
| |/
* / Merged old FileIOJose Antonio Marquez2012-01-27
|/
* First commit of Ninja to ninja-internalPierre Frisch2012-01-27
Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 03:34:25 +0000