Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-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. | hwc487 | 2012-05-18 |
| | | |||
| * | Linear & radial gradients for runtime fixes | hwc487 | 2012-05-17 |
| | | |||
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugs | hwc487 | 2012-05-11 |
| |\ | | | | | | | | | | | | | | | | Conflicts: js/lib/geom/circle.js js/lib/geom/rectangle.js | ||
| * | | WebGL linear gradients to match CSS | hwc487 | 2012-05-08 |
| | | | |||
| * | | Radial gradients to match CSS | hwc487 | 2012-05-08 |
| | | | |||
* | | | Editable parameters for flag, pulse, uber, and radial gradient materials. | hwc487 | 2012-05-22 |
| | | | |||
* | | | Editable material properties | hwc487 | 2012-05-22 |
| | | | |||
* | | | Exposing parameters for pulse and plasma materials | hwc487 | 2012-05-17 |
| | | | |||
* | | | Exposing parameters in Water Material | hwc487 | 2012-05-16 |
| | | | |||
* | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-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 Rajbhandari | 2012-05-10 |
| | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | Converting canvas runtime to use prototypes for geom obj, rectangle, oval ↵ | Nivesh Rajbhandari | 2012-05-03 |
| |/ | | | | | | | | | | | and line. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-05-01 |
|\| | | | | | | | Textures | ||
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-04-27 |
| |\ | | | | | | | | | | Canvas-interaction | ||
| * | | canvas interaction | hwc487 | 2012-04-26 |
| | | | |||
* | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-04-26 |
|\ \ \ | | |/ | |/| | | | | Textures | ||
| * | | Updating the canvas runtime files for gradient and rectangle radius fixes. | Nivesh Rajbhandari | 2012-04-25 |
| |/ | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-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 Rajbhandari | 2012-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 Rajbhandari | 2012-04-05 |
| | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | Undoing mistakes from auto-merge. | Nivesh Rajbhandari | 2012-04-05 |
| | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | Merge branch 'refs/heads/WebGLFileIO' into ToolFixes | Nivesh Rajbhandari | 2012-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 Rajbhandari | 2012-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 Mayhew | 2012-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 Mayhew | 2012-04-03 |
| | | | |||
| * | | Namespaced the canvas runtime file and updated all dependencies | John Mayhew | 2012-04-03 |
| | | | |||
| * | | updated the rdge compiled version and its runtime, incremented rdge library ↵ | John Mayhew | 2012-04-03 |
| |/ | | | | | | | version number | ||
| * | Fixed issue with WebGL materials not working after file-save or ↵ | Nivesh Rajbhandari | 2012-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 integration | Valerio Virgillito | 2012-03-22 |
| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-04-18 |
| | | | | | | | | | | | | | | | | | | | | Snapping_II Conflicts: js/tools/Rotate3DToolBase.js js/tools/RotateStage3DTool.js js/tools/Translate3DToolBase.js js/tools/modifier-tool-base.js | ||
* | | Cloud material | hwc487 | 2012-04-17 |
| | | |||
* | | Cloud material | hwc487 | 2012-04-16 |
| | | |||
* | | Cloud Material | hwc487 | 2012-04-15 |
| | | |||
* | | Cloud Material | hwc487 | 2012-04-13 |
| | | |||
* | | Cloud material | hwc487 | 2012-04-11 |
| | | |||
* | | Cloud material | hwc487 | 2012-04-10 |
| | | |||
* | | Re-added taper and twist-vert materials. | hwc487 | 2012-04-05 |
| | | |||
* | | added copyright info to flag frag shader | hwc487 | 2012-04-04 |
| | | |||
* | | Added Flag material | hwc487 | 2012-04-04 |
| | | |||
* | | started the flag material | hwc487 | 2012-04-03 |
| | | |||
* | | Added Paris and Raiders materials | hwc487 | 2012-03-22 |
| | | |||
* | | Synchronized material animation speed for pulse material between Ninja and ↵ | hwc487 | 2012-03-21 |
| | | | | | | | | runtime. | ||
* | | fixes for Runtime line object. | hwc487 | 2012-03-21 |
| | | |||
* | | Clear RDGE when an element is deleted and before registering the context. | hwc487 | 2012-03-21 |
| | | |||
* | | Runtime canvas & WebGL fixes. | hwc487 | 2012-03-20 |
| | | |||
* | | Supporting new and old GL data formats. | hwc487 | 2012-03-16 |
| | | |||
* | | Conversion to JSON based file IO for canvas2D and WebGL rendering | hwc487 | 2012-03-16 |
|/ | |||
* | Corrections for Uber shader IO | hwc487 | 2012-03-14 |
| | |||
* | Fixed BumpMetal material | hwc487 | 2012-03-13 |
| |