aboutsummaryrefslogtreecommitdiff
path: root/assets
Commit message (Collapse)AuthorAge
* material cleanup and rearchitecturehwc4872012-06-06
|
* Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-05-31
|\ | | | | | | | | | | | | Textures Conflicts: js/io/system/ninjalibrary.json
| * Merge branch 'refs/heads/master' into dom-architectureValerio Virgillito2012-05-22
| |\ | | | | | | | | | | | | | | | | | | Conflicts: js/io/system/ninjalibrary.json Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Modifying Canvas Data I/OJose Antonio Marquez2012-05-21
| | | | | | | | | | | | Changing methods to save all data to external files, this will be optional for the user. Currently save will only save to external files, but UI will allow user to save in file. Need to implement loading data on file open for external file, only works for in file currently. Modified the Runtime file to load all data itself to not bulk up the user document.
| * | Squashed master into dom-architectureValerio Virgillito2012-05-16
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Added the flag shader to the runtime.hwc4872012-05-31
| | |
* | | Fixed authortime & runtime for twist vertex shader.hwc4872012-05-29
| | |
* | | 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
| * | Updates for WebGL/Canvas 2D authortime and runtime gradients.hwc4872012-05-18
| | |
| * | Linear & radial gradients for runtime fixeshwc4872012-05-17
| | |
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugshwc4872012-05-11
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: js/lib/geom/circle.js js/lib/geom/rectangle.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-05-11
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | Textures Conflicts: js/lib/geom/geom-obj.js js/lib/geom/rectangle.js js/tools/TagTool.js
| * | Updating canvas-runtime to use object literal notation.Nivesh Rajbhandari2012-05-10
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Converting canvas runtime to use prototypes for geom obj, rectangle, oval ↵Nivesh Rajbhandari2012-05-03
| |/ | | | | | | | | | | and line. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-05-01
|\| | | | | | | Textures
| * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-04-27
| |\ | | | | | | | | | Canvas-interaction
| * | canvas interactionhwc4872012-04-26
| | |
* | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-04-26
|\ \ \ | | |/ | |/| | | | Textures
| * | Updating the canvas runtime files for gradient and rectangle radius fixes.Nivesh Rajbhandari2012-04-25
| |/ | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | 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
| * Updated canvas-runtime.js to support gradients for rectangle and oval in ↵Nivesh Rajbhandari2012-04-05
| | | | | | | | | | | | canvas2d shape mode. Also fixed some typos. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Changing .default to ["default"] to avoid WebStorm errors.Nivesh Rajbhandari2012-04-05
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Undoing mistakes from auto-merge.Nivesh Rajbhandari2012-04-05
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Merge branch 'refs/heads/WebGLFileIO' into ToolFixesNivesh Rajbhandari2012-04-04
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: assets/canvas-runtime.js js/controllers/elements/shapes-controller.js js/lib/drawing/world.js js/lib/geom/geom-obj.js js/lib/geom/line.js js/mediators/element-mediator.js js/panels/presets/animations-presets.reel/animations-presets.js js/panels/presets/style-presets.reel/style-presets.js js/panels/presets/transitions-presets.reel/transitions-presets.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * IKNinja-1392 - Unable to view Oval canvas2D with Inner Radius in the ↵Nivesh Rajbhandari2012-04-03
| | | | | | | | | | | | | | | | | | | | | | | | Chrome-Preview. Any shapes object are drawn after will not shown in Chrome-Preview. Vector.create should be replaced with [ ] notation. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Removed the dependence on an "assets" directory for the RDGE runtime. Now ↵John Mayhew2012-04-03
| | | | | | | | | | | | Ninja does not need to create duplicate files when it sets up the users Ninja Projects directory for RDGE support.
| * | 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 ↵John Mayhew2012-04-03
| |/ | | | | | | version number
| * Fixed issue with WebGL materials not working after file-save or ↵Nivesh Rajbhandari2012-03-26
| | | | | | | | | | | | chrome-preview. Also fixed Raiders material not showing in the PI or working during Chrome Preview. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * 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
| |
* | Re-added taper and twist-vert materials.hwc4872012-04-05
| |
* | 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
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 22:57:03 +0000