aboutsummaryrefslogtreecommitdiff
path: root/js/document
Commit message (Collapse)AuthorAge
* Give user feedback about which element the Fill/InkBottle tools will act on.Nivesh Rajbhandari2012-04-03
| | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Merge branch 'refs/heads/ninja-internal' into WebGLFileIONivesh Rajbhandari2012-03-30
|\ | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Merge pull request #147 from pushkarjoshi/brushtoolValerio Virgillito2012-03-29
| |\ | | | | | | Brushtool
| | * Merge branch 'master' into brushtoolPushkar Joshi2012-03-28
| | |\
| | * | File IO for the brush stroke AND changing the data type of brush stroke from ↵Pushkar Joshi2012-03-27
| | | | | | | | | | | | | | | | GEOM_TYPE_CUBIC_BEZIER to GEOM_TYPE_BRUSH_STROKE
* | | | Updated shapes to always check for its stroke and fill colors and materials ↵Nivesh Rajbhandari2012-03-29
|/ / / | | | | | | | | | | | | | | | instead of relying on the shapeModel cache because it can get out of sync. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | Merge pull request #131 from ananyasen/integration-candidateValerio Virgillito2012-03-28
|\ \ \ | |_|/ |/| | Pull request IKNINJA-1302, IKNINJA-1367, IKNINJA-1361, IKNINJA-1364, IKNINJA-1302, IKNINJA-1266
| * | - enable/disable save, saveAs, saveAll, close, closeAll as per documents openAnanya Sen2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added close file and close all menu items Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> Conflicts: js/helper-classes/3D/draw-utils.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | Presets Controller - Removing test background from transition classEric Guzman2012-03-27
| | |
* | | Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-03-27
|\ \ \ | | |/ | |/|
| * | Removing m-js components I/O and fix for webGLJose Antonio Marquez2012-03-23
| | | | | | | | | | | | Removed saving m-js components as new components broke I/O when present. Also made a fix for checking length of webGL array since first item now is non-user data. (That is to be removed)
| * | Merge branch 'refs/heads/Ninja-Montage-Integration' into ↵Jose Antonio Marquez2012-03-22
| |\ \ | | | | | | | | | | | | FileIO-Montage-Components
| | * | Squashed commit of the following GL integrationValerio Virgillito2012-03-22
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Adding Ninja URL method to io-mediatorJose Antonio Marquez2012-03-22
| | | |
| * | | Adding firstDraw event to components addedJose Antonio Marquez2012-03-22
| |/ / | | | | | | | | | This will allow us to re-parse the document for styles added dynamically.
| * | Adding 'addComponentFirstDraw' event from the user document main component.Valerio Virgillito2012-03-21
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Merge branch 'refs/heads/francoisfrisch-Ninja-Internal' into ↵Jose Antonio Marquez2012-03-18
| |\ \ | | | | | | | | | | | | FileIO-Montage-Components
| | * | Deleting unecessary propertyFrançois Frisch2012-03-17
| | | |
| | * | Getting ownerComponent bindingsFrançois Frisch2012-03-17
| | |/
| * / Temp I/O functionality for M-JS componentsJose Antonio Marquez2012-03-18
| |/ | | | | | | Added the ability to save montages component serialization from Ninja. Very rough, but functional.
* / Presets Panel - Adding presets controller and removing functionality from ↵Eric Guzman2012-03-22
|/ | | | panel code
* Corrections for Uber shader IOhwc4872012-03-14
|
* Fixed BumpMetal materialhwc4872012-03-13
|
* Add temp delay for webGL previewJose Antonio Marquez2012-03-10
| | | | Added a padded launch webGL preview delay. This is very temporary, just a work around until RDGE issues are fixed.
* further removal of authortime asset path replacement.hwc4872012-03-09
|
* Removed asset path replacement at authortime.hwc4872012-03-09
|
* Adding webGL I/O runtime functionalityJose Antonio Marquez2012-03-09
| | | | There is a problem that needs to be resolved in the CanvasRuntime.
* Merge branch 'refs/heads/integration' into FileIO-IntegrationJose Antonio Marquez2012-03-09
|\ | | | | | | | | Conflicts: js/document/html-document.js
| * Canvas IOhwc4872012-03-08
| |
* | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-08
|\ \ | | | | | | | | | | | | | | | Conflicts: js/document/html-document.js js/helper-classes/3D/draw-utils.js
| * | IKNINJA-1270: fixed browser crashing when you close a document while playing ↵Ananya Sen2012-03-08
| | | | | | | | | | | | | | | | | | a video Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | Merge pull request #30 from ananyasen/FileIO-ananyaJose Antonio Marquez Russo2012-03-08
|\ \ \ | | | | | | | | FileIO branch pull request
| * | | Merge branch 'refs/heads/FileIO-jose' into FileIO-ananyaAnanya Sen2012-03-08
| |\| |
| * | | minor fixesAnanya Sen2012-03-07
| | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | added close file menu itemAnanya Sen2012-03-06
| | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | Merge branch 'refs/heads/FileIO-jose' into FileIO-ananyaAnanya Sen2012-03-06
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/selection-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | removed unnecessary console logsAnanya Sen2012-03-06
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | IKNINJA-1270: fixed browser crashing when you close a document while playing ↵Ananya Sen2012-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a video then wait for a while Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | Adding I/O functionality to RDGEJose Antonio Marquez2012-03-08
| | | | | | | | | | | | | | | | | | | | Added webGL/Canvas file I/O for Ninja, it also created routine for saving data for runtime, however, the runtime RDGE library needs an update for runtime to work, so right now I/O will only work for Ninja.
* | | | | Merge pull request #29 from ericmueller/integrationJose Antonio Marquez Russo2012-03-08
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| | Integration
| * | | removed an unused parameter to CanvasDataManagerhwc4872012-03-08
| | | |
| * | | Commented out code for loading for runtimehwc4872012-03-08
| | | |
| * | | Fixed a few problems with Plasma material.hwc4872012-03-07
| | | |
| * | | File IOhwc4872012-03-07
| | | |
| * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-03-06
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | integration Conflicts: js/preloader/Preloader.js
| | * | | Fixing WebGL not available bugJose Antonio Marquez2012-03-06
| | | | |
| * | | | Updated buildShapeModel to set PI and selection values too and also avoid ↵Nivesh Rajbhandari2012-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fill material for lines. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | update the shapeModel after importhwc4872012-03-06
| | | | |
| * | | | Authortime import of 2d & 3d canvaseshwc4872012-03-06
| | | | |
| * | | | Merge branch 'TimelineUber' of github.com:imix23ways/ninja-internal into ↵hwc4872012-03-06
| |\ \ \ \ | | | | | | | | | | | | | | | | | | integration
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 01:11:08 +0000