| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/Ninja-Master' into Document | Jose Antonio Marquez | 2012-07-24 |
| |\ | |||
| | * | removing console log | Valerio Virgillito | 2012-07-24 |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | Merge branch 'TextTool-Color' of https://github.com/dhg637/ninja | Valerio Virgillito | 2012-07-24 |
| | |\ | |||
| | | * | Text Tool Color Change Fix | Armen Kesablyan | 2012-07-24 |
| | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | | | New: Adding method to switch from code to design view | Jose Antonio Marquez | 2012-07-24 |
| | | | | | | | | | | | | | Added functionality to parse the code view string back into a Ninja template object to redraw design view. Only outstanding bugs are timeline errors and code view layout issues. | ||
| * | | | Merge branch 'refs/heads/Ninja-Master' into Document | Jose Antonio Marquez | 2012-07-24 |
| |\| | | |||
| | * | | Merge branch 'TimelineUber' of https://github.com/imix23ways/ninja | Valerio Virgillito | 2012-07-24 |
| | |\ \ | |||
| | | * | | Remove console logs | Jonathan Duran | 2012-07-24 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | * | | FIX IK-1485 | Jonathan Duran | 2012-07-24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Fix 3D bug IK 1485 Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | | Merge branch 'refs/heads/Ninja-Master' into Document | Jose Antonio Marquez | 2012-07-24 |
| |\| | | | |||
| | * | | | jshint cleanup on the tools directory | Valerio Virgillito | 2012-07-24 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | New: Adding method to display document in code view | Jose Antonio Marquez Russo | 2012-07-23 |
| | | | | | | | | | | | | | | | | | Added method to parse in memory document in code view. This allows users to view current in memory document in code view while not saving the document or external files. Still need to handle naming of paths for files that require saving but are not saved (webGL and Montage libraries). Also, need to implement method to switch back from code view to design view, but will need Timeline fixes. | ||
| * | | | | In Progress: Cleaning up merge | Jose Antonio Marquez Russo | 2012-07-23 |
| | | | | | | | | | | | | | | | | | Cleaned up new updates. Still pending is adding functionality to parse the document when toggling views and fix Timeline errors. Code view also has some rending issues that will be fixed, this is just a clean up. | ||
| * | | | | Merge pull request #44 from ananyasen/Document | Jose Antonio Marquez Russo | 2012-07-23 |
| |\ \ \ \ | | | | | | | | | | | first cut to show code editor for design document | ||
| | * \ \ \ | Merge branch 'refs/heads/Jose-Document' into Document | Ananya Sen | 2012-07-23 |
| | |\ \ \ \ | |||
| | * | | | | | show design code editor - first cut | Ananya Sen | 2012-07-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | | | | parameterize the parentContainer for text document | Ananya Sen | 2012-07-18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | | | | | Merge branch 'refs/heads/Ninja-master' into Document | Jose Antonio Marquez Russo | 2012-07-23 |
| |\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||
| | * | | | | | Merge branch 'tag-properties-fixes' of https://github.com/mencio/ninja | Valerio Virgillito | 2012-07-23 |
| | |\ \ \ \ \ | |||
| | | * | | | | | tag-tool: Minor styles update and some cleanup | Valerio Virgillito | 2012-07-23 |
| | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Styled the position drop down and moved some styles to the reel. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | | Merge branch 'refs/heads/Ninja-Master' into Document | Jose Antonio Marquez | 2012-07-23 |
| |\| | | | | | |_|_|/ / |/| | | | | |||
| | * | | | | Merge branch 'SevenDotOneCommits' of https://github.com/ericmueller/ninja | Valerio Virgillito | 2012-07-23 |
| | |\ \ \ \ | |||
| | | * | | | | Bugs fixed: | hwc487 | 2012-07-23 |
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1915 - Data.JSON too large. Reduced mesh size and limited precision of fp numbers 1381 - Background transparency in preview. 1740 - File Save As caused WebGL to stop animating. Crossed RDGE IDs 1954 - Texture change from material popup broke screen rendering. Set correct context on property change. | ||
| | * | | | | Fix: Adding a check for element w/h/t/l | Jose Antonio Marquez | 2012-07-23 |
| | | | | | | | | | | | | | | | | | | | | | This fixes an issue with elements with no set width, height, top, left values from being handling through the PI. Currently those values will default to zero, a secondary fix will address this to show no value in PI and other panels. | ||
| * | | | | | Merge branch 'refs/heads/Ninja-Master' into Document | Jose Antonio Marquez | 2012-07-23 |
| |\| | | | | |||
| | * | | | | Merge branch 'minorFixes_7.1' of https://github.com/ericguzman/ninja | Valerio Virgillito | 2012-07-23 |
| | |\ \ \ \ | | |_|_|/ | |/| | | | |||
| | | * | | | CSS Panel - Remove data attribute to remove style tags from document. | Eric Guzman | 2012-07-20 |
| | | | | | | |||
| | | * | | | Merge branch 'refs/heads/master' into fixes_7.1 | Eric Guzman | 2012-07-20 |
| | | |\ \ \ | |||
| | | * | | | | CSS Panel - Fix updating when media changes, sheets are deleted. | Eric Guzman | 2012-07-20 |
| | | | | | | | |||
| | | * | | | | Style Sheets - Show dirty marker when editing media attribute | Eric Guzman | 2012-07-18 |
| | | | | | | | |||
| | | * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja into fixes_7.1 | Eric Guzman | 2012-07-18 |
| | | |\ \ \ \ | |||
| | | * | | | | | CSS Panel - Handle media attribute changes | Eric Guzman | 2012-07-17 |
| | | | | | | | | |||
| | | * | | | | | Styles Controller - Re-add dirty event. Add data- attribute to keep created ↵ | Eric Guzman | 2012-07-17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stylesheets. | ||
| * | | | | | | | Merge branch 'refs/heads/Ninja-Master' into Document | Jose Antonio Marquez | 2012-07-23 |
| |\| | | | | | | |||
| | * | | | | | | Merge branch 'refs/heads/NINJA-master' into TimelineUber | Jonathan Duran | 2012-07-23 |
| | |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||
| | * | | | | | | Merge branch 'refs/heads/Timeline-local-kruti' into TimelineUber | Jonathan Duran | 2012-07-20 |
| | |\ \ \ \ \ \ | |||
| | | * | | | | | | The zoom slider resets.Commented some code | Kruti Shah | 2012-07-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| | * | | | | | | | Merge branch 'refs/heads/NINJA-master' into TimelineUber | Jonathan Duran | 2012-07-20 |
| | |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||
| | * | | | | | | | Merge branch 'refs/heads/NINJA-master' into TimelineUber | Jonathan Duran | 2012-07-20 |
| | |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | | | | | | | Improve keyframe selection by moving playhead marker to lower z-index | Jonathan Duran | 2012-07-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | | | | | | | FIx 3D animation workflow | Jonathan Duran | 2012-07-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Can now add 3D to any keyframe and all the tween will initialize their 3D identity matrices Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | | | | | | | Merge branch 'refs/heads/Timeline-local-kruti' into TimelineUber | Jonathan Duran | 2012-07-19 |
| | |\ \ \ \ \ \ \ | |||
| | | * | | | | | | | The zoom slider position remembered between multi doc switch | Kruti Shah | 2012-07-18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| * | | | | | | | | | Merge branch 'refs/heads/Ninja-Master' into Document | Jose Antonio Marquez | 2012-07-23 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | |||
| | * | | | | | | | | Merge branch 'template-pi-breadcrumb' of https://github.com/mencio/ninja | Valerio Virgillito | 2012-07-22 |
| | |\ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | Unifying the banner and animation template display of ninja-content | Valerio Virgillito | 2012-07-20 |
| | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the banner and animation template the stage element now shows div in both the pi and breadcrumb. IKNINJA: 1776 Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | | | | | Merge branch 'refs/heads/Ninja-Master' into Document | Jose Antonio Marquez | 2012-07-20 |
| |\| | | | | | | | | |||
| | * | | | | | | | | Merge branch 'Fixes_071' of https://github.com/mqg734/ninja | Valerio Virgillito | 2012-07-20 |
| | |\ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | If no material was defined, use Flat material when switching from 2d to ↵ | Nivesh Rajbhandari | 2012-07-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebGL shape. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | | | | | | IKNINJA-1780 - [Shape] Error when opening document that contains a shape ↵ | Nivesh Rajbhandari | 2012-07-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |||