| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | textures | hwc487 | 2012-03-23 |
| | | |||
| * | textures | hwc487 | 2012-03-23 |
| | | |||
| * | Merge branch 'integration' of github.com:ericmueller/ninja-internal into ↵ | hwc487 | 2012-03-22 |
| |\ | | | | | | | Textures | ||
| | * | Added Paris and Raiders materials | hwc487 | 2012-03-22 |
| | | | |||
| | * | Synchronized material animation speed for pulse material between Ninja and ↵ | hwc487 | 2012-03-21 |
| | | | | | | | | | runtime. | ||
| | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-03-21 |
| | |\ | | | | | | | | | | integration | ||
| | * | | Added material library data to the canvas data. | hwc487 | 2012-03-21 |
| | | | | |||
| | * | | Clear RDGE when an element is deleted and before registering the context. | hwc487 | 2012-03-21 |
| | | | | |||
| | * | | Bug Fixes for Canvas & WebGL File IO | hwc487 | 2012-03-20 |
| | | | | |||
| | * | | removing dead code | hwc487 | 2012-03-16 |
| | | | | |||
| | * | | Supporting new and old GL data formats. | hwc487 | 2012-03-16 |
| | | | | |||
| | * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-03-16 |
| | |\ \ | | | | | | | | | | | | | integration | ||
| | * | | | Conversion to JSON based file IO for canvas2D and WebGL rendering | hwc487 | 2012-03-16 |
| | | | | | |||
| * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-03-22 |
| | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Texture Conflicts: assets/shaders/plasma.frag.glsl js/helper-classes/RDGE/GLLine.js js/helper-classes/RDGE/MaterialsLibrary.js js/lib/drawing/world.js js/lib/geom/circle.js js/lib/geom/rectangle.js js/lib/rdge/materials/flat-material.js js/lib/rdge/materials/material.js js/panels/Materials/Materials.xml js/panels/Materials/materials-popup.reel/materials-popup.js js/preloader/Preloader.js | ||
| * | | | Merge pull request #125 from ananyasen/IO-patch-ninja-internal-master-ananya | Valerio Virgillito | 2012-03-21 |
| |\ \ \ | | | | | | | | | fix for IKNINJA-1357 - Cannot create other file types such as css, json ... | ||
| | * | | | fix for IKNINJA-1357 - Cannot create other file types such as css, json from ↵ | Ananya Sen | 2012-03-16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | the New file dialog box. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | | | Button's enabled property binding should be oneway only. | Nivesh Rajbhandari | 2012-03-20 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | Deleting unused Materials.xml file since we converted to JSON. | Nivesh Rajbhandari | 2012-03-20 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | Support edit material button in oval and line PI. | Nivesh Rajbhandari | 2012-03-20 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | Support button control in Properties Panel and use them for edit fill and ↵ | Nivesh Rajbhandari | 2012-03-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | stroke material. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | Fixing error in drawUtils when closing document - should set _eltArray and ↵ | Nivesh Rajbhandari | 2012-03-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | _planesArray's length to 0 instead of setting the arrays to null. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | Removing zoom from element's getMatrix. Zoom should only be checked on stage. | Nivesh Rajbhandari | 2012-03-20 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | Use new tree control in Materials panel. | Nivesh Rajbhandari | 2012-03-19 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | Merge pull request #126 from ericguzman/AddAnimationsLibrary | Valerio Virgillito | 2012-03-19 |
| |\ \ \ \ | | | | | | | | | | | Presets Panel - Change Tab labels, Add Un-3d preset | ||
| | * | | | | Presets Panel - Fix conflict with default transition presets | Eric Guzman | 2012-03-17 |
| | | | | | | |||
| | * | | | | Merge branch 'refs/heads/master' into AddAnimationsLibrary | Eric Guzman | 2012-03-17 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/presets/default-transition-presets.js | ||
| | * | | | | Presets Panel - Change Tab labels, Add Un-3d preset | Eric Guzman | 2012-03-16 |
| | | | | | | |||
| * | | | | | Replacing old button component with montage button component in our UI. | Nivesh Rajbhandari | 2012-03-19 |
| | |/ / / |/| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | Merge pull request #124 from ericguzman/AddAnimationsLibrary | Valerio Virgillito | 2012-03-16 |
| |\| | | | | | | | | | | | Presets Panel - Adding Animations Tab | ||
| | * | | | Presets Panel - Adding Animations Tab | Eric Guzman | 2012-03-16 |
| | | | | | |||
| * | | | | Squashed commit of SnapManagerFixes | Valerio Virgillito | 2012-03-16 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Valerio Virgillito | 2012-03-16 |
| |\ \ \ \ | | |_|/ | |/| | | |||
| | * | | | IKNINJA-1305 : fixed the check for stopVideos() method's existence | Ananya Sen | 2012-03-16 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | | Merge pull request #121 from dhg637/Something | Valerio Virgillito | 2012-03-16 |
| | |\ \ \ | | | | | | | | | | | Presets Panel: Added Scale Up and Down to transitions list. According to | ||
| | | * | | | Presets Panel: Added Scale Up and Down to transitions list. According to eric G. | Armen Kesablyan | 2012-03-15 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | | | | | fixing the components drag and drop. | Valerio Virgillito | 2012-03-16 |
| |/ / / / | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | fixing the drag and drop images to the pasteboard | Valerio Virgillito | 2012-03-16 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | Temp fix applied to all elements | Jose Antonio Marquez | 2012-03-15 |
| | | | | | | | | | | | | | | | | | This should be moved to 'makeNJElement' to account for the element to be loaded. | ||
| * | | | | Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate | Jose Antonio Marquez | 2012-03-15 |
| |\ \ \ \ | |||
| | * \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-03-15 |
| | |\ \ \ \ | |||
| | | * \ \ \ | Merge pull request #118 from mencio/pi-fixes | Valerio Virgillito | 2012-03-15 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | Fixed issues with Properties panel, focus and grid redraw | ||
| | | | * \ \ \ | Merge branch 'refs/heads/master' into pi-fixes | Valerio Virgillito | 2012-03-15 |
| | | | |\ \ \ \ | |||
| | | | * | | | | | Fixing the splitter resize canvas bug by getting the size when a document is ↵ | Valerio Virgillito | 2012-03-14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | opened. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | | * | | | | | adding a focus manager to handle panel bugs where blur was not getting ↵ | Valerio Virgillito | 2012-03-14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | called when clicking on the canvas. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | | * | | | | | Removing the name attribute from the PI. Fixing the ID and Class attribute ↵ | Valerio Virgillito | 2012-03-14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from the PI Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | | | | Timeline: remove comment. | Jonathan Duran | 2012-03-15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | * | | | | | | Timeline: Fix for layer selection problems on file open and switch. | Jonathan Duran | 2012-03-15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | * | | | | | | revert space | Jonathan Duran | 2012-03-15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | * | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-03-15 |
| | | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controller | ||