aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Collapse)AuthorAge
* Fixing logic to close color panel popupJose Antonio Marquez2012-06-19
| | | | This resolves closing the color panel popup when a user make a click outside the popup area or resizes the Ninja window. This should be tested prior to merging.
* Merge pull request #298 from ericmueller/TexturesValerio Virgillito2012-06-19
|\ | | | | Textures
| * Removed Flat material from the materials libraryhwc4872012-06-15
| |
| * Re-added Raiders materialhwc4872012-06-15
| |
| * Re-added Paris materialhwc4872012-06-15
| |
| * Added correct 'Cancel' behavior to the material editorhwc4872012-06-15
| |
| * Material changes through the popup editor can effect multiple material ↵hwc4872012-06-15
| | | | | | | | instances within a single object.
| * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-14
| |\ | | | | | | | | | Textures
| * | Fix for line color.hwc4872012-06-14
| | | | | | | | | | | | Name change for all materials
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-13
| |\ \ | | | | | | | | | | | | Textures
| * \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-13
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures Conflicts: js/io/system/ninjalibrary.json
| * \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-12
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures Conflicts: assets/canvas-runtime.js js/io/system/ninjalibrary.json js/mediators/element-mediator.js
| * | | | | Disabled the add, copy, and delete buttons in the material library panel. ↵hwc4872012-06-12
| | | | | | | | | | | | | | | | | | | | | | | | Also removed the Custom Materials section.
| * | | | | material cleanup and rearchitecturehwc4872012-06-06
| | | | | |
| * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-05
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Textures
| * \ \ \ \ \ 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
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/properties.reel/sections/position-size.reel/position-size.html Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-12
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| * | | | | | | | | | | remove serializable from custom sectionValerio Virgillito2012-06-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | | | | adding more missing properties to the serializationValerio Virgillito2012-06-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |