aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/ninja-internal' into IKNinja_1671Nivesh Rajbhandari2012-06-20
|\
| * Merge pull request #313 from mqg734/GIO_FixesValerio Virgillito2012-06-20
| |\ | | | | | | IKNINJA-1519 - Transform tool does not transform objects correctly in 3D space or in Top/Side view.
| | * Merge branch 'refs/heads/ninja-internal' into GIO_FixesNivesh Rajbhandari2012-06-19
| | |\
| | * | IKNINJA-1519 - Transform tool does not transform objects correctly in 3D ↵Nivesh Rajbhandari2012-06-19
| | | | | | | | | | | | | | | | | | | | | | | | space or in Top/Side view. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | Merge pull request #312 from joseeight/ColorValerio Virgillito2012-06-20
| |\ \ \ | | | | | | | | | | Fixing logic to close color panel popup
| | * | | 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 branch 'IKNINJA-1754' of github.com:mencio/ninja-internalValerio Virgillito2012-06-19
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/menu/menu-entry.reel/menu-entry.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | IKNINJA 1754 menu not opening on hoverValerio Virgillito2012-06-19
| | |/ / | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Merge branch 'bugfix-master' of github.com:ananyasen/ninja-internalValerio Virgillito2012-06-19
| |\ \ \ | | |/ / | |/| |
| | * | Reverting last change since this is is being made in a different pull request.Ananya Sen2012-06-19
| | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | Fix for IKNINJA-1754 (CLONE) - Menu Component: Hovering over another main ↵Ananya Sen2012-06-19
| | | | | | | | | | | | | | | | | | | | | | | | menu does not work when a main menu drop down is already displayed. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | Fixed - IKNINJA-1313 - File menu drop down should close when New File dialog ↵Ananya Sen2012-06-18
| | | | | | | | | | | | | | | | | | | | | | | | is opened Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | IKNINJA-1671 - GIO: 3D rotate widget is offset from the object when rotated ↵Nivesh Rajbhandari2012-06-19
|/ / / | | | | | | | | | | | | | | | | | | | | | in negative space. I fixed this temporarily by disabling the auto stage scroll calculations when we modify matrices. The correct fix will be to update any matrices and local2Global caches if we update the stage's padding (which I'm doing in a separate fix for a single draw cycle for the stage, but that fix is not ready yet). Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | Merge pull request #298 from ericmueller/TexturesValerio Virgillito2012-06-19
|\ \ \ | | | | | | | | Textures
| * | | Removed Flat material from the materials libraryhwc4872012-06-15
| | | |
| * | | Fixed a canvas 2D rendering problem.hwc4872012-06-15
| | | |
| * | | Fixed a problem with Uber shader where new values were getting clobbered by ↵hwc4872012-06-15
| | | | | | | | | | | | | | | | old values.
| * | | Runtime change for Paris material.hwc4872012-06-15
| | | |
| * | | Re-added Raiders materialhwc4872012-06-15
| | | |
| * | | Re-added Paris materialhwc4872012-06-15
| | | |
| * | | Fix for setting the specular map in the Uber shader.hwc4872012-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
| * | | | Fixed alphabetization of material names.hwc4872012-06-14
| | | | | | | | | | | | | | | | | | | | | | | | | Removed console output. Removed texture map field from Mandel material editor.
| * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-14
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Textures
| * | | | | Fixes for runtime Taper materialhwc4872012-06-13
| | | | | |
| * | | | | Oval stroke and fill material were stored in inverted order.hwc4872012-06-13
| | | | | |
| * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-13
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Textures
| * | | | | | Material bug fixes - reset texture array.hwc4872012-06-13
| | | | | | |
| * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-13
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures Conflicts: js/io/system/ninjalibrary.json
| * | | | | | | Removed a console message.hwc4872012-06-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed cloud material from the pulldown.
| * | | | | | | Removed references to NJUtilshwc4872012-06-12
| | | | | | | |
| * | | | | | | Moved Flat material to the top of the drop down.hwc4872012-06-12
| | | | | | | |
| * | | | | | | Incremented RDGE library numberhwc4872012-06-12
| | | | | | | |
| * | | | | | | 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.
| * | | | | | | | Runtime material fixeshwc4872012-06-12
| | | | | | | | |
| * | | | | | | | Material cleanup & bug fixes.hwc4872012-06-12
| | | | | | | | |
| * | | | | | | | Material cleanuphwc4872012-06-07
| | | | | | | | |
| * | | | | | | | material cleanup and rearchitecturehwc4872012-06-06
| | | | | | | | |
| * | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-05
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures
| * | | | | | | | | Fixed RDGE render tree when PI changes causes node changes.hwc4872012-06-04
| | | | | | | | | |
| * | | | | | | | | Avoid throwing shader errors in the console for 'color' property at a base ↵hwc4872012-06-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | class level.
| * | | | | | | | | 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
| * | | | | | | | | | | | Added the flag shader to the runtime.hwc4872012-05-31
| | | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 13:06:07 +0000