aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| | * | | | | | | | Changes to the DemoKishore Subramanian2012-03-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Feed Reader now shows one entry at a time - Category dropdown removed form the Map. It is included as part of the example code - Changed the categories that do not return results
| | * | | | | | | | Update Youtube player to HTML5Stuart Knightley2012-03-19
| | | | | | | | | |
| | * | | | | | | | Youtube appending script in drawFrançois Frisch2012-03-19
| | | | | | | | | |
| | * | | | | | | | using channel name rather than urlFrançois Frisch2012-03-18
| | | |_|_|_|/ / / | | |/| | | | | |
| | * | | | | | | 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
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| / / / / / | | |/ / / / /
| * | | | | | changing the picasa-carousel to use a getter and setter for the queryParameterValerio Virgillito2012-03-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internalValerio Virgillito2012-03-17
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | Youtube video is droppableFrançois Frisch2012-03-17
| | | | | | | | | | | | | | | | | | | | | | | | still getting errors with the carousel
| * | | | | | | 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>
| * | | | | | Adding the youtube playerFrançois Frisch2012-03-17
| | | | | | |
| * | | | | | Added a new picasa-carousel component as well as an example using itBenoit Marchant2012-03-17
| | | | | | |
| * | | | | | 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
| | | | | | |
| * | | | | | Adding feed reader and mapFranç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.
| * | | | | fixes for Runtime line object.hwc4872012-03-21
| | | | | |
| * | | | | 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
| | | | | |
| * | | | | Runtime canvas & WebGL fixes.hwc4872012-03-20
| | | | | |
| * | | | | 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>
* | | | | Merge pull request #129 from mqg734/WebGLMaterialsValerio Virgillito2012-03-20
|\ \ \ \ \ | |_|_|_|/ |/| | | | Added Montage button as a valid PI control and used it to invoke the edit material popup.
| * | | | 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>
| * | | | Support edit material button in oval and line PI.Nivesh Rajbhandari2012-03-20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | Support button control in Properties Panel and use them for edit fill and ↵Nivesh Rajbhandari2012-03-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stroke material. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | Fixing error in drawUtils when closing document - should set _eltArray and ↵Nivesh Rajbhandari2012-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 Rajbhandari2012-03-20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | Use new tree control in Materials panel.Nivesh Rajbhandari2012-03-19
|/ / / / | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | Merge pull request #126 from ericguzman/AddAnimations