aboutsummaryrefslogtreecommitdiff
path: root/js
<
Commit message (Collapse)AuthorAge
...
| * | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Valerio Virgillito2012-03-21
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | montage-integration
| | * | | | | | | | Presets Panel - Add Font style presetEric Guzman2012-03-21
| | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | Merge branch 'refs/heads/master' into montage-integrationValerio Virgillito2012-03-21
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | / / | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Valerio Virgillito2012-03-20
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | montage-integration
| | * | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Eric Guzman2012-03-20
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | FeedReaderAnimation
| | * | | | | | | Presets - Animation updateEric Guzman2012-03-20
| | | | | | | | |
| * | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Valerio Virgillito2012-03-20
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | montage-integration
| | * | | | | | | Fixing the selection issuesValerio Virgillito2012-03-20
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | Merge branch 'refs/heads/button-switch' into montage-integrationValerio Virgillito2012-03-20
| |\ \ \ \ \ \ \
| | * | | | | | | fully removing our old button component from NinjaValerio Virgillito2012-03-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Valerio Virgillito2012-03-19
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | montage-integration
| | * | | | | | | fixing the selection for the picasa carouselValerio Virgillito2012-03-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Valerio Virgillito2012-03-19
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | montage-integration
| | * | | | | | | Maps - Apply default width and height styles to components if specified. ↵Nivesh Rajbhandari2012-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 Virgillito2012-03-18
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | looping through both branches of the components treeValerio Virgillito2012-03-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | Merge branch 'refs/heads/master' into montage-integrationValerio Virgillito2012-03-19
| |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / /
| * | | | | Youtube video is droppableFrançois Frisch2012-03-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | still getting errors with the carousel Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | Integrating picasa carousel and youtube channelFrançois Frisch2012-03-17
| | | | | |
| * | | | | Adding back webkit-transform styles in set3DProperties. Changing "zoom" to ↵Valerio Virgillito2012-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 Virgillito2012-03-17
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | adding element creation for the map and feedreader components.Valerio Virgillito2012-03-17
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | Fixed snap-manager to stop snapping after first level children.Nivesh Rajbhandari2012-03-17
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | Adding components to PIFrançois Frisch2012-03-17
| | | | | |
| * | | | | Deleting unecessary propertyFrançois Frisch2012-03-17
| | | | | |
| * | | | | Getting ownerComponent bindingsFrançois Frisch2012-03-17
| | |_|/ / | |/| | |
* | | | | textureshwc4872012-03-23
| | | | |
* | | | | textureshwc4872012-03-23
| | | | |
* | | | | Merge branch 'integration' of github.com:ericmueller/ninja-internal into ↵hwc4872012-03-22
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Textures
| * | | | | Added Paris and Raiders materialshwc4872012-03-22
| | | | | |
| * | | | | Synchronized material animation speed for pulse material between Ninja and ↵hwc4872012-03-21
| | | | | | | | | | | | | | | | | | | | | | | | runtime.
| * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-03-21
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | integration
| * | | | | Added material library data to the canvas data.hwc4872012-03-21
| | | | | |
| * | | | | Clear RDGE when an element is deleted and before registering the context.hwc4872012-03-21
| | | | | |
| * | | | | Bug Fixes for Canvas & WebGL File IOhwc4872012-03-20
| | | | | |
| * | | | | removing dead codehwc4872012-03-16
| | | | | |
| * | | | | Supporting new and old GL data formats.hwc4872012-03-16
| | | | | |
| * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-03-16
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | integration
| * | | | | | Conversion to JSON based file IO for canvas2D and WebGL renderinghwc4872012-03-16
| | | | | | |
* | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-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-ananyaValerio Virgillito2012-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 Sen2012-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 Rajbhandari2012-03-20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | Deleting unused Materials.xml file since we converted to JSON.Nivesh Rajbhandari2012-03-20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>