aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/master' into StylesControllerUpdatesEric Guzman2012-02-13
|\ | | | | | | | | Conflicts: js/controllers/styles-controller.js
| * Merge branch 'refs/heads/master' into stage-colorValerio Virgillito2012-02-13
| |\
| | * Merge pull request #34 from ericguzman/TreeComponentsValerio Virgillito2012-02-13
| | |\ | | | | | | | | Tree components - updating the ninja branch/leaf
| | | * Ninja leaf - remove console lotEric Guzman2012-02-13
| | | |
| | | * Merge branch 'refs/heads/master' into TreeComponentsEric Guzman2012-02-13
| | | |\
| | | * | Tree Components - Change the way delegate methods are calledEric Guzman2012-02-13
| | | | |
| * | | | Merge branch 'refs/heads/master' into stage-colorValerio Virgillito2012-02-13
| |\| | |
| | * | | Bug FixesJose Antonio Marquez2012-02-13
| | | |/ | | |/| | | | | | | | | | | | | | | | | IKNINJA-1101 IKNINJA-1079 IKNINJA-1144
| * | | Cleaning up the stage background color chip.Valerio Virgillito2012-02-13
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵Valerio Virgillito2012-02-12
| |\| | | | | | | | | | | | | | stage-color
| | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵John Mayhew2012-02-10
| | |\ \ | | | | | | | | | | | | | | | WorkingBranch
| | | * \ Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-02-10
| | | |\ \
| | | * | | Support export/import of GLLine data.Nivesh Rajbhandari2012-02-10
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | Removing some console logs. I kept in the ones that signify error cases.Nivesh Rajbhandari2012-02-09
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | Fixed switching between webGL and canvas 2d modes.Nivesh Rajbhandari2012-02-09
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | Updated linear and radial gradient materials import/export routines.Nivesh Rajbhandari2012-02-09
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | Merging changes for rectangle drawing.Nivesh Rajbhandari2012-02-09
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | | * | | Changed the rendering for canvas 2D rectangle.hwc4872012-02-08
| | | | | | |
| | | | * | | Reversed the orientation of one of the triangles for WebGL rendering.hwc4872012-02-08
| | | | | | |
| | | | * | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into workinghwc4872012-02-08
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/helper-classes/RDGE/Materials/FlatMaterial.js
| | | | * \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-02-08
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | working
| | | | * | | | | Removed unused rdge files from the compiler.hwc4872012-02-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | switched the preloader to use the compiled version of rdge Updated the rdge binary.
| | | | * | | | | Fixed context switching problems in rdgehwc4872012-02-08
| | | | | | | | |
| | | | * | | | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into workinghwc4872012-02-07
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/helper-classes/RDGE/GLRectangle.js js/helper-classes/RDGE/GLWorld.js js/helper-classes/RDGE/MaterialsLibrary.js
| | | | * | | | | | test code for deformation shaderhwc4872012-02-07
| | | | | | | | | |
| | | | * | | | | | Enhanced the overlap test for the selection tool marquee select.hwc4872012-02-06
| | | | | | | | | |
| | | | * | | | | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into workinghwc4872012-02-06
| | | | |\ \ \ \ \ \
| | | | * | | | | | | Removed an unnecessary (and incorrect) snapping calculation.hwc4872012-02-06
| | | | | | | | | | |
| | | | * | | | | | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into workinghwc4872012-02-03
| | | | |\ \ \ \ \ \ \
| | | | * | | | | | | | Added a counter to the renderer that tracks the number of unloaded texture maps.hwc4872012-02-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Started vertex deformations.
| | | | * | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-02-03
| | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | working
| | | | * \ \ \ \ \ \ \ \ Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into workinghwc4872012-02-02
| | | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Added the 'animate' flag to the pulse materialhwc4872012-02-02
| | | | | | | | | | | | | |
| | | | * | | | | | | | | | added some additional shadershwc4872012-02-02
| | | | | | | | | | | | | |
| | | * | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-02-09
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/helper-classes/RDGE/GLMaterial.js js/helper-classes/RDGE/GLRectangle.js js/helper-classes/RDGE/GLWorld.js js/helper-classes/RDGE/Materials/FlatMaterial.js js/helper-classes/RDGE/Materials/IridescentScalesMaterial.js js/helper-classes/RDGE/Materials/JuliaMaterial.js js/helper-classes/RDGE/Materials/KeleidoscopeMaterial.js js/helper-classes/RDGE/Materials/MandelMaterial.js js/helper-classes/RDGE/Materials/PlasmaMaterial.js js/helper-classes/RDGE/Materials/PulseMaterial.js js/helper-classes/RDGE/Materials/RadialBlurMaterial.js js/helper-classes/RDGE/Materials/RadialGradientMaterial.js js/helper-classes/RDGE/Materials/TunnelMaterial.js js/helper-classes/RDGE/Materials/TwistMaterial.js js/helper-classes/RDGE/rdge-compiled.js js/helper-classes/RDGE/src/core/script/renderer.js js/panels/Materials/Materials.xml Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | | | | | | | | | | Removed unused materials.Nivesh Rajbhandari2012-02-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | | | | | | | | | | Merging WebGL changes that allow users to modify different shape instances. ↵Nivesh Rajbhandari2012-02-09
| | | | |_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, merging in changes that improve rendering performance by not updating static materials. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵John Mayhew2012-02-10
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_