| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-03-27 |
| |\ | | | | | | | Textures | ||
| | * | Check for a authortime animation setting in the draw routine for WebGL. | Nivesh Rajbhandari | 2012-03-24 |
| | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Merge branch 'refs/heads/montage-integration' into WebGL-Animation-CheckBox | Nivesh Rajbhandari | 2012-03-24 |
| | |\ | |||
| | * | | Check for a authortime animation setting in the draw routine for WebGL. | Nivesh Rajbhandari | 2012-03-23 |
| | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | WebGL & Canvas as data for texture maps. | hwc487 | 2012-03-26 |
| | | | | |||
| * | | | Merge branch 'montage-integration' of ↵ | hwc487 | 2012-03-24 |
| |\ \ \ | | |/ | |/| | | | | github.com:Motorola-Mobility/ninja-internal into Textures | ||
| | * | | Fixed a problem switching from 3D to 2D and back to 3D. | hwc487 | 2012-03-23 |
| | |/ | |||
| | * | Respect play/pause WebGL animation when saving files and re-rendering caused ↵ | Nivesh Rajbhandari | 2012-03-23 |
| | | | | | | | | | | | | | by geometry changes. 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> | ||
| | * | Fixing the selection issues | Valerio Virgillito | 2012-03-20 |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | textures | hwc487 | 2012-03-23 |
| | | | |||
| * | | textures | hwc487 | 2012-03-23 |
| | | | |||
| * | | Merge branch 'integration' of github.com:ericmueller/ninja-internal into ↵ | hwc487 | 2012-03-22 |
| |\ \ | | | | | | | | | | Textures | ||
| | * | | Added Paris and Raiders materials | hwc487 | 2012-03-22 |
| | | | | |||
| | * | | Synchronized material animation speed for pulse material between Ninja and ↵ | hwc487 | 2012-03-21 |
| | | | | | | | | | | | | | runtime. | ||
| | * | | Added material library data to the canvas data. | hwc487 | 2012-03-21 |
| | | | | |||
| | * | | Clear RDGE when an element is deleted and before registering the context. | hwc487 | 2012-03-21 |
| | | | | |||
| | * | | Bug Fixes for Canvas & WebGL File IO | hwc487 | 2012-03-20 |
| | | | | |||
| | * | | removing dead code | hwc487 | 2012-03-16 |
| | | | | |||
| | * | | Supporting new and old GL data formats. | hwc487 | 2012-03-16 |
| | | | | |||
| | * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-03-16 |
| | |\| | | | | | | | | | | integration | ||
| | * | | Conversion to JSON based file IO for canvas2D and WebGL rendering | hwc487 | 2012-03-16 |
| | | | | |||
| * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-03-22 |
| | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Texture Conflicts: assets/shaders/plasma.frag.glsl js/helper-classes/RDGE/GLLine.js js/helper-classes/RDGE/MaterialsLibrary.js js/lib/drawing/world.js js/lib/geom/circle.js js/lib/geom/rectangle.js js/lib/rdge/materials/flat-material.js js/lib/rdge/materials/material.js js/panels/Materials/Materials.xml js/panels/Materials/materials-popup.reel/materials-popup.js js/preloader/Preloader.js | ||
| * | | Merge pull request #34 from ericmueller/integration | Jose Antonio Marquez Russo | 2012-03-15 |
| |\| | | | | | Integration | ||
| | * | Corrections for Uber shader IO | hwc487 | 2012-03-14 |
| | | | |||
| | * | Uber material changes for IO | hwc487 | 2012-03-12 |
| | | | |||
| * | | Some code cleanup - removing unused assignments. | Valerio Virgillito | 2012-03-13 |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-03-13 |
| |\ \ | |||
| | * \ | Merge pull request #110 from mqg734/WebGLFixes | Valerio Virgillito | 2012-03-13 |
| | |\ \ | | | | | | | | | Gradient Support for Shapes and Eyedropper support for gradients. Also fixed 3d bug when moving multiple selections in 3d using the Selection Tool | ||
| | | * | | Support import/export of gradient materials. This fixes the eyedropper not ↵ | Nivesh Rajbhandari | 2012-03-12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | being able to sample gradient colors from WebGL shapes. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | Fixing radial gradient for rectangle. | Nivesh Rajbhandari | 2012-03-09 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | Fixing radial gradients for line and circle. | Nivesh Rajbhandari | 2012-03-09 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | Eyedropper support for getting color value from webgl shapes. | Nivesh Rajbhandari | 2012-03-09 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | gradient support for canvas-2d shapes. | Nivesh Rajbhandari | 2012-03-07 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | Change linear gradient to go from left to right instead of top-left to ↵ | Nivesh Rajbhandari | 2012-03-07 |
| | | | | | | | | | | | | | | | | | | | | | | | | | bottom-right. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | Gradient support for canvas-2d rectangle. | Nivesh Rajbhandari | 2012-03-07 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | Fix for stroke and fill gradients not being retained when drawing multiple ↵ | Nivesh Rajbhandari | 2012-03-07 |
| | | | | | | | | | | | | | | | | | | | | | | | | | shapes and switching between them. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | preliminary support for setting gradients on webgl shapes. | Nivesh Rajbhandari | 2012-03-07 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | Merge pull request #108 from pushkarjoshi/brushtool | Valerio Virgillito | 2012-03-13 |
| | |\ \ \ | | |_|/ | |/| | | Brushtool | ||
| | * | | | Removing duplicate file | Jose Antonio Marquez | 2012-03-09 |
| | | | | | |||
| | * | | | Merge pull request #32 from ericmueller/integration | Jose Antonio Marquez Russo | 2012-03-09 |
| | |\ \ \ | | | | | | | | | | | Added asset folder replacement to runtime load. | ||
| | | * | | | Removed asset path replacement at authortime. | hwc487 | 2012-03-09 |
| | | | | | | |||
| | * | | | | Adding missing file for webGL, still need a fix for runtime | Jose Antonio Marquez | 2012-03-09 |
| | |/ / / | |||
| | * | | | Adding webGL I/O runtime functionality | Jose Antonio Marquez | 2012-03-09 |
| | | | | | | | | | | | | | | | | | There is a problem that needs to be resolved in the CanvasRuntime. | ||
| | * | | | Canvas IO | hwc487 | 2012-03-08 |
| | | | | | |||
| | * | | | removed an unused parameter to CanvasDataManager | hwc487 | 2012-03-08 |
| | | | | | |||
| | * | | | Fix for runtime Radial blur material | hwc487 | 2012-03-08 |
| | | | | | |||
| | * | | | Fixed a few problems with Plasma material. | hwc487 | 2012-03-07 |
| | | | | | |||
| | * | | | File IO | hwc487 | 2012-03-07 |
| | | | | | |||
| | * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-03-06 |
| | |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | integration Conflicts: js/preloader/Preloader.js | ||