aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes
Commit message (Collapse)AuthorAge
...
| * | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-23
| |\ \ \ \ \ \
| * | | | | | | renaming makeElementModel2 to makeModelFromElementValerio Virgillito2012-02-23
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-02-27
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | integration
| * | | | | | Javascript does not evaluate a return with its expression in a new line. The ↵Nivesh Rajbhandari2012-02-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | return expression must begin on the same line as the return keyword. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | Removing duplicate get/setElementPlanes method.Nivesh Rajbhandari2012-02-24
| | |/ / / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | Color fix for line shapes.hwc4872012-02-27
| | | | | |
* | | | | | Changed the hardcoded publish setting for a PI fix.hwc4872012-02-27
| | | | | |
* | | | | | Fixed various rendering bugs.hwc4872012-02-27
| | | | | |
* | | | | | bug fixes for canvas 2d shape drawing.hwc4872012-02-23
| |_|/ / / |/| | | |
* | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-02-23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | integration Conflicts: js/helper-classes/RDGE/GLWorld.js js/helper-classes/RDGE/Materials/PulseMaterial.js js/helper-classes/RDGE/Materials/RadialBlurMaterial.js js/helper-classes/RDGE/src/tools/rdge-compiled.js js/preloader/Preloader.js
| * | | | Merge branch 'refs/heads/ToolFixes' into WebGLMaterialsNivesh Rajbhandari2012-02-22
| |\ \ \ \
| | * | | | Removing unused method that was using snapManager.Nivesh Rajbhandari2012-02-22
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | Integrating Zoom tool fixes.Nivesh Rajbhandari2012-02-22
| | |/ / / | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | PulseMaterial and RadialBlurMaterial had typos in their import code.Nivesh Rajbhandari2012-02-22
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | Integrating canvas-2d and WebGL drawing fixes. Also adding back WebGL materials.Nivesh Rajbhandari2012-02-22
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | Revert "Integrating canvas-2d drawing and WebGL fixes, including adding back ↵Nivesh Rajbhandari2012-02-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebGL materials." This reverts commit 96a0a8c916533eb5625816192ed38488f639326d.
| * | | | Integrating canvas-2d drawing and WebGL fixes, including adding back WebGL ↵Nivesh Rajbhandari2012-02-22
| |/ / / | | | | | | | | | | | | | | | | | | | | materials. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | GL save and reload.hwc4872012-02-22
| | | |
* | | | Runtime classeshwc4872012-02-22
| | | |
* | | | Added all materials back inhwc4872012-02-22
| | | |
* | | | Adding all the shaders back inhwc4872012-02-22
| | | |
* | | | Adding bug fixes.hwc4872012-02-22
|/ / /
* | | Fixing the getStageWorldToGlobalMatrix bugValerio Virgillito2012-02-16
| | | | | | | | | | | | | | | | | | removing the snapManager reference in viewUtils Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-11
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html
| * \ \ 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>
| * | | | 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
| | * | | | | 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
| | | | | | | |
| | * | | | | | 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>
| * |