aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'master' into brushtoolPushkar Joshi2012-02-09
|\
| * Merge pull request #28 from mqg734/SnapManagerFixesValerio Virgillito2012-02-09
| |\ | | | | | | Merging SnapManager fixes, webGL drawing fixes and some 3d tool fixes
| | * Fixed bad merge in FlatMaterials.Nivesh Rajbhandari2012-02-09
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * Merge branch 'refs/heads/ninja-internal' into SnapManagerFixesNivesh Rajbhandari2012-02-09
| | |\ | | |/ | |/| | | | | | | | | | | | | Conflicts: js/helper-classes/RDGE/Materials/FlatMaterial.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Merge pull request #26 from pushkarjoshi/pentoolValerio Virgillito2012-02-09
| |\ \ | | | | | | | | Pentool
| * | | adding oneway to the 3d bindings to fix a bug where the stage was getting ↵Valerio Virgillito2012-02-09
| | | | | | | | | | | | | | | | | | | | | | | | selected. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Merge pull request #29 from mayhewinator/WorkingBranchValerio Virgillito2012-02-09
| |\ \ \ | | | | | | | | | | Updates for Splash screen, icon, license page and credits page
| | * | | removed null characters at the end of this file that made GIT treat it as a ↵John Mayhew2012-02-09
| | | | | | | | | | | | | | | | | | | | binary file
| | * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵John Mayhew2012-02-09
| | |\ \ \ | | |/ / / | |/| | | | | | | | WorkingBranch
| | * | | Implemented final splash screen, the credits page and the license pageJohn Mayhew2012-02-09
| | | | |
| | * | | fixed error with initializing and accessing the ninja version object from ↵John Mayhew2012-02-09
| | | | | | | | | | | | | | | | | | | | the main reel
| | * | | Updated fav icon to the final imageJohn Mayhew2012-02-09
| | | | |
| | | | * Merge branch 'refs/heads/ninja-internal' into SnapManagerFixesNivesh Rajbhandari2012-02-09
| | | | |\ | | |_|_|/ | |/| | |
| * | | | Merge pull request #24 from mencio/pi_bugsValerio Virgillito2012-02-08
| |\ \ \ \ | | | | | | | | | | | | Pi bugs
| | * | | | Correcting the PI lock for height which had a bug in the original pull request.Valerio Virgillito2012-02-08
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | Merge branch 'refs/heads/master' into pi_bugsValerio Virgillito2012-02-08
| | |\ \ \ \
| | * | | | | Fix for the PI Lock button.Valerio Virgillito2012-02-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing the following JIRA bugs: 111 Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | Updating the sass file.Valerio Virgillito2012-02-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | Merge pull request #27 from ericguzman/TreeComponentsValerio Virgillito2012-02-08
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | Tree Components - css fixes
| | * | | | | Tree Components - css fixesEric Guzman2012-02-08
| |/ / / / /
| | | | | * Changed the rendering for canvas 2D rectangle.Nivesh Rajbhandari2012-02-09
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | | | * Reversed the orientation of one of the triangles for WebGL rendering.Nivesh Rajbhandari2012-02-09
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | | | * Fixed runtime error when using 3d tools without any items selected.Nivesh Rajbhandari2012-02-09
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | | | * Merging snap manager fix for infinite projection errors when stage view is ↵Nivesh Rajbhandari2012-02-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changed to top or side. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | | | * Merging fix for marquee selection that accounts for 3d values.Nivesh Rajbhandari2012-02-08
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | | | * Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-08
| | | | | |\ | | |_|_|_|/ | |/| | | |
| | | | | * 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 'pentool' into brushtoolPushkar Joshi2012-02-09
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | removing shadersPushkar Joshi2012-02-09
| | | | | |
* | | | | | first phase of simple resampling to prevent tiny segmentsPushkar Joshi2012-02-09
|/ / / / /
* | | | | fill all paths even if they are openPushkar Joshi2012-02-08
| | | | |
* | | | | Merge branch 'master' into pentoolPushkar Joshi2012-02-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/helper-classes/RDGE/GLWorld.js js/helper-classes/RDGE/MaterialsLibrary.js
| * | | | 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>
| | * | | 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>