aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| | | | * | | | | | | | | 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>
| | | * | | | | | | | | | | | | | Undoing experimental changes from the basic webgl shaders.Nivesh Rajbhandari2012-02-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | | | | | | | | | | | | Removing image assets that were being used by deleted WebGL materials.Nivesh Rajbhandari2012-02-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | |\ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WorkingBranch Conflicts: js/ninja.reel/ninja.html
| | | | | | | | | | | | | * | | | -Changed the capitalization of all main top level menus from all capsJohn Mayhew2012-02-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Added new main-menu-controller to be the default generic handler for menu item calls that do not need to call to a specific controller -Removed the test menu item -Finalized the help submenu items and hooked them up to the main-menu-controller
| | | | | | | | | | | | | * | | | added Tony's outline styling to the splash screenJohn Mayhew2012-02-10
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | * | | | Modified the page title of the credits and license html files so they fit ↵John Mayhew2012-02-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | within the chrome tab widths.
| * | | | | | | | | | | | | | | | Cleaning up open file in code viewJose Antonio Marquez2012-02-10
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Adding back file open for code viewJose Antonio Marquez2012-02-10
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-10
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html js/stage/stage.reel/stage.html
| | * | | | | | | | | | |