aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-13
|\| | | | | | | |
| * | | | | | | | Bug FixesJose Antonio Marquez2012-02-13
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IKNINJA-1101 IKNINJA-1079 IKNINJA-1144
* | | | | | | | Save 'code' view filesJose Antonio Marquez2012-02-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added functionality (temp) to save files in code view.
* | | | | | | | File Save (with CSS styles)Jose Antonio Marquez2012-02-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Temp fix for saving styles in <style> of HTML document.
* | | | | | | | File Save (HTML only)Jose Antonio Marquez2012-02-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the ability to save an HTML file from design view, need to add CSS detection and saving (of styles in <style> only). Also need to add 'Save All' for all file attached to the HTML file.
* | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html
| * | | | | | | Merge pull request #32 from mayhewinator/WorkingBranchmayhewinator2012-02-10
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | Updates for splash screen, menu items and implemented some of the new help menu items
| | * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵John Mayhew2012-02-10
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | WorkingBranch
| * | | | | | | Merge pull request #31 from mqg734/WebGLFixesValerio Virgillito2012-02-10
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Merging WebGL fixes
| | * \ \ \ \ \ \ 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |