aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Collapse)AuthorAge
...
| * | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-04
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures
| * | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-04
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures
| * | | | | | | | | | | | | | | | | Correction for texture paths.hwc4872012-06-01
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-05-31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures Conflicts: js/io/system/ninjalibrary.json
| * | | | | | | | | | | | | | | | | | Parameters for twistVertex materialhwc4872012-05-25
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Editable material propertieshwc4872012-05-22
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-05-17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures
| * | | | | | | | | | | | | | | | | | Exposing parameters in Water Materialhwc4872012-05-16
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-05-11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures Conflicts: js/lib/geom/geom-obj.js js/lib/geom/rectangle.js js/tools/TagTool.js
| * | | | | | | | | | | | | | | | | | Material editorhwc4872012-05-02
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-04-27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures
| * | | | | | | | | | | | | | | | | | | Update materials to the new texture model.hwc4872012-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create local world for deleted source canvases
* | | | | | | | | | | | | | | | | | | | Fixing binding of alpha slider/hottext in popup with panelJose Antonio Marquez2012-06-18
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | More cleaning upJose Antonio Marquez2012-06-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Controller will need a review and refactoring.
* | | | | | | | | | | | | | | | | | | | Fixed slider/hottext bindingsJose Antonio Marquez2012-06-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also cleaning up, however, needs much refactoring.
* | | | | | | | | | | | | | | | | | | | Fixing apply 'no color'Jose Antonio Marquez2012-06-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should fix canvas and standard DOM elements including the root (body or template wrapper).
* | | | | | | | | | | | | | | | | | | | Cleaning up referencesJose Antonio Marquez2012-06-14
| |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Still need to do more cleaning up.
* | | | | | | | | | | | | | | | | | | Fix: IKNINJA-1608Jose Antonio Marquez2012-06-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing icon, seems low res and improper size, should be hi-res PNG for future reference, using negative space offset to better display.
* | | | | | | | | | | | | | | | | | | Clean upJose Antonio Marquez2012-06-13
| |_|_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixesNivesh Rajbhandari2012-06-13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |