aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-27
|\
| * Cleaning up pretty functions in IOJose Antonio Marquez2012-02-27
| |
| * Cleaning up and adding TODOsJose Antonio Marquez2012-02-26
| |
| * Cleaning up formatting for webGL dataJose Antonio Marquez2012-02-26
| |
| * Fixed issue with losing track of Ninja template cssJose Antonio Marquez2012-02-26
| | | | | | | | Also cleaned up URL getter for app in cleaning string code.
| * Cleaning up comments for external styles loadingJose Antonio Marquez2012-02-25
| |
| * Cleaning up ninja-data attributesJose Antonio Marquez2012-02-25
| | | | | | | | Added logic to load cross-domain CSS from CDN, but need to explore how to load without impacting permissions.
| * Adding prettify code to I/OJose Antonio Marquez2012-02-24
| | | | | | | | This is a possible set of methods to be used to prettify code. Added temporarily until approved.
| * Merge pull request #19 from ananyasen/FileIOJose Antonio Marquez Russo2012-02-24
| |\ | | | | | | FileIO branch pull request
| * \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-24
| |\ \
| | * \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-02-24
| | |\ \
| | | * | Marking inkbottle as the final tool in the set.Nivesh Rajbhandari2012-02-24
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | Adding back Ink Bottle tool in the tool bar so QE can test ink bottle ↵Nivesh Rajbhandari2012-02-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | functionality without having to wait for the new icon and location of the tool. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | 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>
| | * | | Adding some missing copyrightsValerio Virgillito2012-02-24
| | |/ / | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Added import/export of RDGE dataJose Antonio Marquez2012-02-24
| | | | | | | | | | | | | | | | This is only the IO aspect, the data getter seems broken for 2D canvas and does not allow for save, and nothing works for setting the data on load. However, the IO aspect of saving and opening the data are not incorporated.
* | | | - save show3DGrid flag per document while switching documentsAnanya Sen2012-02-27
| |_|/ |/| | | | | | | | | | | | | | - fix zoom tool keyboard control to listen to Z when ctrl and shift keys are not pressed with it Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | - added closeDocument event for timelineAnanya Sen2012-02-24
| | | | | | | | | | | | | | | | | | - minor bug fixes Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | - added flag for timeline to identify new file flowAnanya Sen2012-02-24
| | | | | | | | | | | | | | | | | | - added switchDocument event for timeline Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-23
|\| |
| * | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-23
| |\|
| | * Merge pull request #67 from ntfx47/PullRequest-TimelineValerio Virgillito2012-02-23
| | |\ | | | | | | | | Timeline : Fix for the split and element model error
| | | * Timeline : Fix for the split and element model errorKruti Shah2012-02-23
| | | | | | | | | | | | | | | | | | | | | | | | Timeline Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | | Merge pull request #17 from ericmueller/integrationJose Antonio Marquez Russo2012-02-23
| |\ \ \ | | | | | | | | | | Integration
| | * | | 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
| | * | | GL save and reload.hwc4872012-02-22
| | | | |
| | * | | Runtime classeshwc4872012-02-22
| | | | |
| | * | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into integrationhwc4872012-02-22
| | |\ \ \
| | * \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-02-22
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | integration
| | * | | | | Added all materials back inhwc4872012-02-22
| | | | | | |
| | * | | | | Adding all the shaders back inhwc4872012-02-22
| | | | | | |
| | * | | | | Adding bug fixes.hwc4872012-02-22
| | | | | | |
| | * | | | | Merge branch 'WebGLMaterials' of github.com:mqg734/ninja-internal into ↵hwc4872012-02-21
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | integration
| * | \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-23
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Merge pull request #65 from mqg734/NiveshColorValerio Virgillito2012-02-23
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix to read back colors when re-opening files.
| | | * | | | | | Fix to read back colors when re-opening files.Nivesh Rajbhandari2012-02-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-23
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/document-controller.js
| | * | | | | | | Fixing app mode check.Valerio Virgillito2012-02-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | | fixing the tools shortcuts - IKNINJA 1199Valerio Virgillito2012-02-23
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | / Remove selection calls from timelinepanel.jsJonathan Duran2012-02-23
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | | Fix for tween repetition arrays getting overwritten on file openJonathan Duran2012-02-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | | Timeline: Reopen Doc Restore TimeLineJonathan Duran2012-02-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | | New DocJonathan Duran2012-02-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | | Timeline Track Open docJonathan Duran2012-02-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | | Timeline:Open Doc in TimelinePanel.jsJonathan Duran2012-02-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | | Timeline: Create new PropertyTrack subcomponent, and use it in the ↵Jonathan Duran2012-02-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TimelineTrack component. Cherry pick commit from jreid/Timeline-jreid Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | | Unterminated linesJonathan Duran2012-02-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | | Redo timeline resize codeJonathan Duran2012-02-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | | Timeline Reset to clean Master branch. Code scrub.Jonathan Duran2012-02-23
| | | | | | | | | | | | | | | | | | | |