aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Cloud Materialhwc4872012-04-13
|
* Cloud materialhwc4872012-04-12
|
* Cloud materialhwc4872012-04-11
|
* Cloud materialhwc4872012-04-11
|
* Cloud materialhwc4872012-04-10
|
* Cloudshwc4872012-04-08
|
* texture notificationshwc4872012-04-06
|
* Re-added taper and twist-vert materials.hwc4872012-04-05
|
* added copyright info to flag frag shaderhwc4872012-04-04
|
* Added Flag materialhwc4872012-04-04
|
* started the flag materialhwc4872012-04-03
|
* texture abstractionhwc4872012-04-02
|
* texture abstractionhwc4872012-04-02
|
* converted materials to new texture structurehwc4872012-03-30
|
* linked textureshwc4872012-03-29
|
* added a notification procedure to worlds.hwc4872012-03-28
|
* texture abstraction integrationhwc4872012-03-27
|
* Integrated texture wrapper into pulse and bump-metal materials.hwc4872012-03-27
|
* Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-03-27
|\ | | | | | | Textures
| * Merge pull request #142 from joseeight/ColorValerio Virgillito2012-03-26
| |\ | | | | | | Color Bug Fix
| | * Fix: IKNINJA-1355Jose Antonio Marquez2012-03-26
| | |
| | * Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-03-26
| | |\
| | * | Fix: IKNINJA-1362Jose Antonio Marquez2012-03-26
| | | |
| * | | Merge pull request #141 from mqg734/WebGL-Animation-CheckBoxValerio Virgillito2012-03-24
| |\ \ \ | | | | | | | | | | Changing where we check for _previewAnimation flag.
| | * | | Check for a authortime animation setting in the draw routine for WebGL.Nivesh Rajbhandari2012-03-24
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | Merge branch 'refs/heads/montage-integration' into WebGL-Animation-CheckBoxNivesh Rajbhandari2012-03-24
| | |\ \ \ | | |/ / / | |/| | |
| | * | | Check for a authortime animation setting in the draw routine for WebGL.Nivesh Rajbhandari2012-03-23
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | WebGL & Canvas as data for texture maps.hwc4872012-03-26
| | | | |
* | | | | Merge branch 'montage-integration' of ↵hwc4872012-03-24
|\| | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into Textures
| * | | | Merge pull request #140 from ericmueller/integrationValerio Virgillito2012-03-23
| |\ \ \ \ | | | | | | | | | | | | Integration
| | * | | | Fixed a problem switching from 3D to 2D and back to 3D.hwc4872012-03-23
| | | | | |
| | * | | | Merge branch 'montage-integration' of ↵hwc4872012-03-23
| | |\ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into integration Conflicts: js/io/system/ninjalibrary.json
| * | | | | Merge pull request #138 from joseeight/FileIO-Montage-ComponentsValerio Virgillito2012-03-23
| |\ \ \ \ \ | | | | | | | | | | | | | | I/O Fixes
| | * \ \ \ \ Merge branch 'refs/heads/Ninja-Montage-Integration' into ↵Jose Antonio Marquez2012-03-23
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | FileIO-Montage-Components
| | * | | | | | Removing m-js components I/O and fix for webGLJose Antonio Marquez2012-03-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed saving m-js components as new components broke I/O when present. Also made a fix for checking length of webGL array since first item now is non-user data. (That is to be removed)
| | * | | | | | Merge branch 'refs/heads/Ninja-Montage-Integration' into ↵Jose Antonio Marquez2012-03-22
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | FileIO-Montage-Components
| | * | | | | | | Adding Ninja URL method to io-mediatorJose Antonio Marquez2012-03-22
| | | | | | | | |
| | * | | | | | | Merge branch 'refs/heads/Ninja-Montage-Integration' into ↵Jose Antonio Marquez2012-03-22
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FileIO-Montage-Components
| | * \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Montage-Integration' into ↵Jose Antonio Marquez2012-03-22
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FileIO-Montage-Components
| | * | | | | | | | | Adding firstDraw event to components addedJose Antonio Marquez2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow us to re-parse the document for styles added dynamically.
| | * | | | | | | | | Merge branch 'refs/heads/Ninja-Montage-Integration' into ↵Jose Antonio Marquez2012-03-21
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FileIO-Montage-Components
| | * \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Montage-Integration' into ↵Jose Antonio Marquez2012-03-21
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FileIO-Montage-Components
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into FileIO-Montage-ComponentsJose Antonio Marquez2012-03-21
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | |
| * | | | | | | | | | | | Merge pull request #137 from ericguzman/montage-integrationValerio Virgillito2012-03-23
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | Preset Heading - "3D" to "2D"
| | * | | | | | | | | | | Presets - fixed preset group name ("2D")Eric Guzman2012-03-23
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'montage-integration' of github.com:ericguzman/ninja-internal ↵Valerio Virgillito2012-03-23
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into montage-integration
| | * | | | | | | | | | | Feed Reader - Change default to timer so it matches componentEric Guzman2012-03-23
| | | | | | | | | | | | |
| | * | | | | | | | | | | Presets Panel - Add slide/fade out animationEric Guzman2012-03-23
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #135 from mqg734/WebGL-Animation-CheckBoxValerio Virgillito2012-03-23
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | / / | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | We have to add a flag in GLWorld so that any changes in geometry that forces a render will only render once.
| | * | | | | | | | | | Respect play/pause WebGL animation when saving files and re-rendering caused ↵Nivesh Rajbhandari2012-03-23
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by geometry changes. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>