aboutsummaryrefslogtreecommitdiff
path: root/js/data
Commit message (Collapse)AuthorAge
...
| * | | | | | | | | Fixing tooltips and keyboard shortcuts for 3d tools.Nivesh Rajbhandari2012-02-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IKNinja-1014 and IKNinja-1015. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | | | | Merge branch 'local-storage-version' of ↵Valerio Virgillito2012-02-27
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/mencio/ninja-internal into integration-candidate
| * | | | | | | | | | removing the old settings class and disabling panel settings until the new ↵Valerio Virgillito2012-02-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | panels are in Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | | | Merge branch 'refs/heads/master' into local-storage-versionValerio Virgillito2012-02-24
| |\| | | | | | | | |
| * | | | | | | | | | Merge branch 'refs/heads/master' into local-storage-versionValerio Virgillito2012-02-23
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | local storage integration and versioningValerio Virgillito2012-02-22
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed the splitters Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-24
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Marking inkbottle as the final tool in the set.Nivesh Rajbhandari2012-02-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | | Adding back Ink Bottle tool in the tool bar so QE can test ink bottle ↵Nivesh Rajbhandari2012-02-24
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | functionality without having to wait for the new icon and location of the tool. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-23
|\| | | | | | | |
| * | | | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-02-22
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-20
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Get color under mouse point from image or canvas.Nivesh Rajbhandari2012-02-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-22
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'refs/heads/master' into new-tool-iconsArmen Kesablyan2012-02-22
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | New Icons: Last set had imperfectionsArmen Kesablyan2012-02-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | | | | Tool Icons : New layoutArmen Kesablyan2012-02-15
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | | | | | | - file picker - select file on double clickAnanya Sen2012-02-21
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - check cloud availability before IO operations [open file, new file, Save, Save As]. Canceling operation if cloud was unavailable, as per team's agreement. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | | | Chrome PreviewJose Antonio Marquez2012-02-17
| |_|_|_|_|/ |/| | | | |
* | | | | | Presets Panel - Move to bottom, add to menuEric Guzman2012-02-16
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-13
|\| | | |
| * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵Valerio Virgillito2012-02-12
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | stage-color
| * | | | initial color chip for the stageValerio Virgillito2012-02-10
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-11
|\ \ \ \ | | |/ / | |/| | | | | | | | | | Conflicts: js/ninja.reel/ninja.html
| * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵John Mayhew2012-02-10
| |\ \ \ | | | | | | | | | | | | | | | WorkingBranch
| | * | | Support export/import of GLLine data.Nivesh Rajbhandari2012-02-10
| | |/ / | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * / / -Changed the capitalization of all main top level menus from all capsJohn Mayhew2012-02-10
| |/ / | | | | | | | | | | | | | | | -Added new main-menu-controller to be the default generic handler for menu item calls that do not need to call to a specific controller -Removed the test menu item -Finalized the help submenu items and hooked them up to the main-menu-controller
* | | file open and file new integrated againAnanya Sen2012-02-10
| | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-08
|\| |
| * | 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>
| * | Add enabled property for ComboBox to support enabling/disabling materials ↵Nivesh Rajbhandari2012-02-06
| | | | | | | | | | | | | | | | | | dropdowns in the PI. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Support use WebGL checkbox in the PI.Nivesh Rajbhandari2012-02-06
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | Merge branch 'refs/heads/AnanyaFileIO' into FileIOJose Antonio Marquez2012-02-06
|\ \ \
| * | | integrated save for the document tabs, detect codemirror history to show ↵Ananya Sen2012-02-06
| | | | | | | | | | | | | | | | | | | | | | | | document dirty indicator. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-06
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | We were only updating the first custom section in the PI.Nivesh Rajbhandari2012-02-03
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Merge branch 'refs/heads/NiveshColor' into ToolFixesNivesh Rajbhandari2012-02-03
| |\| | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * Updated color code in the PI to go through element mediator.Nivesh Rajbhandari2012-02-01
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Fixing keyboard shortcut and tooltip for hand and 3d tools.Nivesh Rajbhandari2012-02-02
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-02
|\| | | | | | | | | | | | | | | | | Conflicts: .gitignore js/ninja.reel/ninja.js
| * | Updating Shapes PI to support corner radii. Also fixed PI bug where we were ↵Nivesh Rajbhandari2012-02-02
| |/ | | | | | | | | | | always updating custom section 0. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* / Merged old FileIOJose Antonio Marquez2012-01-27
|/
* First commit of Ninja to ninja-internalPierre Frisch2012-01-27
Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 16:11:56 +0000