aboutsummaryrefslogtreecommitdiff
path: root/assets
Commit message (Collapse)AuthorAge
* Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-14
|\ | | | | | | Textures
| * fix bug #1704 where small paths/strokes with large stroke width caused a ↵Pushkar Joshi2012-06-13
| | | | | | | | flip of the gradient colors
* | Fixes for runtime Taper materialhwc4872012-06-13
| |
* | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-13
|\| | | | | | | | | | | | | Textures Conflicts: js/io/system/ninjalibrary.json
| * change the brush runtime to ignore hardness in case of strokewidth of 1Pushkar Joshi2012-06-12
| |
| * fix the brush tool runtime: update the brush coordinates to account for ↵Pushkar Joshi2012-06-11
| | | | | | | | change in bounding box due to smoothing
* | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-12
|\| | | | | | | | | | | | | | | | | Textures Conflicts: assets/canvas-runtime.js js/io/system/ninjalibrary.json js/mediators/element-mediator.js
| * fix compile error that was preventing non-gradient brush strokes from being ↵Pushkar Joshi2012-06-07
| | | | | | | | rendered in runtime
| * enable gradients for brush stroke (in authoring as well as runtime)Pushkar Joshi2012-06-06
| |
| * Merge branch 'pentool' into brushtoolPushkar Joshi2012-06-06
| |\ | | | | | | | | | | | | Conflicts: assets/canvas-runtime.js
| | * added gradients to pen path runtimePushkar Joshi2012-06-06
| | |
| * | removed repeated declarations in brush stroke runtime classPushkar Joshi2012-06-04
| | |
| * | runtime version of the brush stroke (similar to the pen paths, this seems to ↵Pushkar Joshi2012-05-31
| |/ | | | | | | not work unless we run it through the debugger)
| * somewhat working version of the canvas runtime for pen paths (the runtime ↵Pushkar Joshi2012-05-31
| | | | | | | | renders properly if we go through debugger)...also removed calls to getStageElement from pen tool
| * Merge branch 'master' into pentoolPushkar Joshi2012-05-31
| |\
| * | move all the subpath functions to its prototype, and first version of the ↵Pushkar Joshi2012-05-31
| | | | | | | | | | | | pen path runtime
* | | Runtime material fixeshwc4872012-06-12
| | |
* | | Material cleanup & bug fixes.hwc4872012-06-12
| | |
* | | Material cleanuphwc4872012-06-07
| | |
* | | 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>