Commit message (Collapse) | Author | Age | ||
---|---|---|---|---|
... | ||||
| * | | | | | | | | | | Merge branch 'refs/heads/WebGLFileIO' into WebGLMaterials | Nivesh Rajbhandari | 2012-03-27 | |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | | | ||||
| | * | | | | | | | | | 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> | |||
| * | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterials | Nivesh Rajbhandari | 2012-03-27 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | | | | | | | | | Do not set webkit-transform styles on elements unless 3d is used on them. | Nivesh Rajbhandari | 2012-03-21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | | | | | | | | | Get matrix and perspective distance from styles controller. | Nivesh Rajbhandari | 2012-03-21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | | | | | | | | | IKNINJA-1370 - Toggle WebGL on/off is no longer working in the PI. | Nivesh Rajbhandari | 2012-03-20 | |
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This bug was injected by some changes in GLWorld.import. Signed-off-by: Nivesh Rajbhandari <mqg734@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-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 | |
| | | | | | | | | | ||||
| * | | | | | | | |