aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Changed the rendering for canvas 2D rectangle.hwc4872012-02-08
|
* Reversed the orientation of one of the triangles for WebGL rendering.hwc4872012-02-08
|
* Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into workinghwc4872012-02-08
|\ | | | | | | | | Conflicts: js/helper-classes/RDGE/Materials/FlatMaterial.js
| * Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-08
| |\
| * | Fixed several typos in Materials import/export code to support toggling ↵Nivesh Rajbhandari2012-02-08
| | | | | | | | | | | | | | | | | | between 2d and 3d shape modes. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Fixed radio button to update 3d values when switching from local to global ↵Nivesh Rajbhandari2012-02-08
| | | | | | | | | | | | | | | | | | and vice-versa. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-02-08
|\ \ \ | | | | | | | | | | | | working
| * \ \ Merge pull request #25 from mayhewinator/WorkingBranchmayhewinator2012-02-08
| |\ \ \ | | |_|/ | |/| | Adding assets required to be a packaged chrome app
| | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵John Mayhew2012-02-08
| | |\ \ | | |/ / | |/| | | | | | WorkingBranch
| * | | Merge pull request #23 from joseeight/SCSSValerio Virgillito2012-02-08
| |\ \ \ | | | | | | | | | | Changing _scss folder to scss
| | * | | adding new scss folderJose Antonio Marquez2012-02-08
| | | | |
| | * | | delete _scss directoryJose Antonio Marquez2012-02-08
| |/ / /
| * | | Merge pull request #21 from mencio/pi_bugsValerio Virgillito2012-02-08
| |\ \ \ | | | | | | | | | | Pi bugs fixes for 964, 616, 1084
| | * | | IKNINJA - 1084: Fixing the custom tag.Valerio Virgillito2012-02-07
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | IKNINJA-616 - Drag and drop images fix for the PI and sourceValerio Virgillito2012-02-07
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | IKNINJA-964 - Fixed inconsistent element name in PI/CSS panel.Valerio Virgillito2012-02-07
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | Merge pull request #22 from ericguzman/StylesControllerUpdatesValerio Virgillito2012-02-08
| |\ \ \ \ | | | | | | | | | | | | Styles Controller - Added array of dirty stylesheets and event dispatch ...
| | * | | | Styles Controller - Added array of dirty stylesheets and event dispatch when ↵Eric Guzman2012-02-08
| | | | | | | | | | | | | | | | | | | | | | | | a sheet is dirtied.
| | | | * | Added manifest.json, and image file required for being a packaged chrome ↵John Mayhew2012-02-08
| | |_|/ / | |/| | | | | | | | | | | | | application. Removed the old versions.json and updated the main page to detect if it is running as a chrome app and retrieve the version info from the chrome.app object. If the app is running hosted, the code will use an XHR to load the manifest.json and retrieve the version number from it directly.
| * | | | Merge pull request #20 from mqg734/ToolFixesValerio Virgillito2012-02-08
| |\ \ \ \ | | | |_|/ | | |/| | Hooked up materials code to go through the ShapesController and updated the PI to reflect the currently selected shape's materials. Also fixed the following bugs:
| | * | | Added ability to toggle combobox's visibility so we can show/hide materials ↵Nivesh Rajbhandari2012-02-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | comboboxes in the tool options. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | updated montage v.0.6 to the latest changes.Valerio Virgillito2012-02-07
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Merge pull request #19 from ericguzman/TreeComponentsValerio Virgillito2012-02-07
| |\ \ \ | | |_|/ | |/| | Tree Components - Added copyright comments
| | * | Tree Components - Added copyright commentsEric Guzman2012-02-07
| |/ /
* | | Removed unused rdge files from the compiler.hwc4872012-02-08
| | | | | | | | | | | | | | | switched the preloader to use the compiled version of rdge Updated the rdge binary.
* | | Fixed context switching problems in rdgehwc4872012-02-08
| | |
* | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into workinghwc4872012-02-07
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: js/helper-classes/RDGE/GLRectangle.js js/helper-classes/RDGE/GLWorld.js js/helper-classes/RDGE/MaterialsLibrary.js
| * | id's must start with a letter, so our workaround for using uuid for RDGE ↵Nivesh Rajbhandari2012-02-07
| | | | | | | | | | | | | | | | | | canvas id's won't work because they often start with a number. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Fixing some typos and undeclared variables in GLRectangle and ShapesController.Nivesh Rajbhandari2012-02-07
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Supporting switching materials in the PI. Also, moved makeFillMaterial and ↵Nivesh Rajbhandari2012-02-07
| | | | | | | | | | | | | | | | | | makeStrokeMaterial functions into GLGeomObj so shapes other than GLRectangle can use these routines. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Fixed PI to support WebGL materials.Nivesh Rajbhandari2012-02-07
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Updated tools and PI to get/set materials by binding to appModel's materials ↵Nivesh Rajbhandari2012-02-07
| | | | | | | | | | | | | | | | | | property. This requires us to add FlatMaterial to the list of materials in the MaterialsLibrary. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-07
| |\|
| | * Merge pull request #18 from ericguzman/StylesControllerUpdatesValerio Virgillito2012-02-06
| | |\ | | | | | | | | Styles controller updates
| | | * Merge branch 'refs/heads/master' into StylesControllerUpdatesEric Guzman2012-02-06
| | | |\ | | | |/ | | |/|
| | * | Merge pull request #17 from joseeight/SnapFixValerio Virgillito2012-02-06
| | |\ \ | | | | | | | | | | Attempt to fix initialization bug for snap-manager
| | | * | Attempt to fix initialization bug for snap-managerJose Antonio Marquez2012-02-06
| | |/ /
| | * | Merge pull request #16 from ericguzman/TreeComponentsValerio Virgillito2012-02-06
| | |\ \ | | | | | | | | | | Tree components
| | | * | TreeController - moving the tree controller to the components directoryEric Guzman2012-02-06
| | | | |
| | | * | Tree Components - Adding the tree componentsEric Guzman2012-02-06
| | | | |
| | | * | Tree Controller - Clean out unused codeEric Guzman2012-02-06
| | | | |
| | | * | Tree Controller - Initial addEric Guzman2012-02-06
| | | | |
| | | | * Attempt to fix initialization bug for snap-managerJose Antonio Marquez2012-02-06
| | | | |
| | | | * TreeController - moving the tree controller to the components directoryEric Guzman2012-02-06
| | | | |
| | | | * Tree Components - Adding the tree componentsEric Guzman2012-02-06
| | | | |
| | | | * Tree Controller - Clean out unused codeEric Guzman2012-02-06
| | | | |
| | | | * Tree Controller - Initial addEric Guzman2012-02-06
| | | | |
| | | | * Styles Controller - Add some methods for modifying css keyframe rulesEric Guzman2012-02-06
| | | | |
| | | | * Styles Controller - Correct author attribution for specificity calculationEric Guzman2012-02-06
| | | | |
| | | | * Styles Controller - Add code to remove cache items from history (not just ↵Eric Guzman2012-02-06
| | | | | | | | | | | | | | | | | | | | nullifying them)