| Commit message (Collapse) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| | | * | | | | | | | fully removing our old button component from Ninja | Valerio Virgillito | 2012-03-19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | * | | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵ | Valerio Virgillito | 2012-03-19 | |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | montage-integration | |||
| | | * | | | | | | | fixing the selection for the picasa carousel | Valerio Virgillito | 2012-03-19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | * | | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵ | Valerio Virgillito | 2012-03-19 | |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | montage-integration | |||
| | | * | | | | | | | Maps - Apply default width and height styles to components if specified. ↵ | Nivesh Rajbhandari | 2012-03-19 | |
| | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change default location to Sunnyvale. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | | * | | | | | | fixing the selection of components. Temporary workaround for now. | Valerio Virgillito | 2012-03-18 | |
| | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | | * | | | | | looping through both branches of the components tree | Valerio Virgillito | 2012-03-18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | * | | | | | | Merge branch 'refs/heads/master' into montage-integration | Valerio Virgillito | 2012-03-19 | |
| | |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / / | ||||
| | * | | | | | Youtube video is droppable | François Frisch | 2012-03-17 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | still getting errors with the carousel Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | * | | | | | Integrating picasa carousel and youtube channel | François Frisch | 2012-03-17 | |
| | | | | | | | ||||
| | * | | | | | Adding back webkit-transform styles in set3DProperties. Changing "zoom" to ↵ | Valerio Virgillito | 2012-03-17 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "zoomValue" in map component to avoid scaling the map. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | * | | | | | fixing the map styles and temporary disabling the 3d styles for elements. | Valerio Virgillito | 2012-03-17 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | * | | | | | adding element creation for the map and feedreader components. | Valerio Virgillito | 2012-03-17 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | * | | | | | Fixed snap-manager to stop snapping after first level children. | Nivesh Rajbhandari | 2012-03-17 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | * | | | | | Adding components to PI | François Frisch | 2012-03-17 | |
| | | | | | | | ||||
| | * | | | | | Deleting unecessary property | François Frisch | 2012-03-17 | |
| | | | | | | | ||||
| | * | | | | | Getting ownerComponent bindings | François Frisch | 2012-03-17 | |
| | | |_|/ / | |/| | | | ||||
| * | | | | | 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-Mo | |||