| Commit message (Collapse) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| * | | | | | | | | | 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-12 | |
| | | | | | | | | | | ||||
| * | | | | | | | | | Cloud material | hwc487 | 2012-04-11 | |
| | | | | | | | | | | ||||
| * | | | | | | | | | Cloud material | hwc487 | 2012-04-11 | |
| | | | | | | | | | | ||||
| * | | | | | | | | | Cloud material | hwc487 | 2012-04-10 | |
| | | | | | | | | | | ||||
| * | | | | | | | | | Clouds | hwc487 | 2012-04-08 | |
| | | | | | | | | | | ||||
| * | | | | | | | | | texture notifications | hwc487 | 2012-04-06 | |
| | | | | | | | | | | ||||
| * | | | | | | | | | Re-added taper and twist-vert materials. | hwc487 | 2012-04-05 | |
| | | | | | | | | | | ||||
| * | | | | | | | | | Added Flag material | hwc487 | 2012-04-04 | |
| | | | | | | | | | | ||||
| * | | | | | | | | | started the flag material | hwc487 | 2012-04-03 | |
| | | | | | | | | | | ||||
| * | | | | | | | | | texture abstraction | hwc487 | 2012-04-02 | |
| | | | | | | | | | | ||||
| * | | | | | | | | | texture abstraction | hwc487 | 2012-04-02 | |
| | | | | | | | | | | ||||
| * | | | | | | | | | converted materials to new texture structure | hwc487 | 2012-03-30 | |
| | | | | | | | | | | ||||
| * | | | | | | | | | linked textures | hwc487 | 2012-03-29 | |
| | | | | | | | | | | ||||
| * | | | | | | | | | added a notification procedure to worlds. | hwc487 | 2012-03-28 | |
| | | | | | | | | | | ||||
| * | | | | | | | | | texture abstraction integration | hwc487 | 2012-03-27 | |
| | | | | | | | | | | ||||
| * | | | | | | | | | Integrated texture wrapper into pulse and bump-metal materials. | hwc487 | 2012-03-27 | |
| | | | | | | | | | | ||||
| * | | | | | | | | | 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</ | |||