aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
* 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>
| * | | | | | | | | Fixed bad merge in FlatMaterials.Nivesh Rajbhandari2012-02-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | | Merge branch 'refs/heads/ninja-internal' into SnapManagerFixesNivesh Rajbhandari2012-02-09
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/helper-classes/RDGE/Materials/FlatMaterial.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * \ \ \ \ \ \ \ \ Merge pull request #26 from pushkarjoshi/pentoolValerio Virgillito2012-02-09
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Pentool
| | | * | | | | | | | | fill all paths even if they are openPushkar Joshi2012-02-08
| | | | | | | | | | | |
| | | * | | | | | | | | Merge branch 'master' into pentoolPushkar Joshi2012-02-08
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/helper-classes/RDGE/GLWorld.js js/helper-classes/RDGE/MaterialsLibrary.js
| | | * | | | | | | | | bug fixes for better anchor point rotation and removing snapping on hover ↵Pushkar Joshi2012-02-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and mouse down
| | | * | | | | | | | | some minor bug fixes and code cleanupPushkar Joshi2012-02-07
| | | | | | | | | | | |
| | | * | | | | | | | | Merge branch 'master' into pentoolPushkar Joshi2012-02-07
| | | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | don't use colorToHex function because it only works for 3D color (needs a ↵Pushkar Joshi2012-02-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix to colorToHex)
| | | * | | | | | | | | | Merge branch 'working' of c:/Code/github/emueller/ninja-internal/ into pentoolPushkar Joshi2012-02-02
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / | | | | |/| | | | | | | |
| | | | * | | | | | | | | Removed a console log and set the Plasma material to animating.hwc4872012-02-01
| | | | | | | | | | | | |
| | | | * | | | | | | | | Fixed plane orientations for view orientations other than front.hwc4872012-02-01
| | | | | | | | | | | | |
| | | | * | | | | | | | | listen for the appMouseUp event in the Pan toolhwc4872012-02-01
| | | | | | | | | | | | |
| | | | * | | | | | | | | factor in the zoom factor when drawing the stage compass.hwc4872012-02-01
| | | | | | | | | | | | |
| | | | * | | | | | | | | Fix for a marquee zoom bug.hwc4872012-02-01
| | | | | | | | | | | | |
| | | | * | | | | | | | | mouse wheel for zoom toolhwc4872012-02-01
| | | | | | | | | | | | |
| | | | * | | | | | | | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into workinghwc4872012-02-01
| | | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | changes to allow minimal rendering ofnon-animated materials.hwc4872012-02-01
| | | | | | | | | | | | | |
| | | | * | | | | | | | | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into workinghwc4872012-01-31
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/stage/stage.reel/stage.js
| | | | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-01-31
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |