aboutsummaryrefslogtreecommitdiff
path: root/js/models
Commit message (Collapse)AuthorAge
* Merge branch 'timeline-play' of https://github.com/mencio/ninjaValerio Virgillito2012-07-19
|\
| * Timeline: updated livePreview to timeline play. Hide canvas and draw red outlineValerio Virgillito2012-07-19
| | | | | | | | | | | | | | | | - Changed the play button to a toggle button - livePreview code in stage activated via bindings - Draw a red outline of the canvas when in play Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Renamed Raiders material to Dark Blur, and Paris to Blue Sky.hwc4872012-07-19
| |
* | Re-added Radial Blur and Raiders materialshwc4872012-07-19
|/
* removed left over comments.Valerio Virgillito2012-07-17
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Removed the shaders that we do not have rights to.hwc4872012-07-10
|
* BSD LicenseKris Kowal2012-07-09
|
* Remove trailing spacesKris Kowal2012-07-06
|
* Expand tabsKris Kowal2012-07-06
|
* Update copyright boilerplateKris Kowal2012-07-06
|
* Merge pull request #298 from ericmueller/TexturesValerio Virgillito2012-06-19
|\ | | | | Textures
| * Fixed a canvas 2D rendering problem.hwc4872012-06-15
| |
| * Re-added Paris materialhwc4872012-06-15
| |
| * Fix for line color.hwc4872012-06-14
| | | | | | | | Name change for all materials
| * Fixed alphabetization of material names.hwc4872012-06-14
| | | | | | | | | | Removed console output. Removed texture map field from Mandel material editor.
| * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-13
| |\ | | | | | | | | | | | | | | | | | | Textures Conflicts: js/io/system/ninjalibrary.json
| * | Removed a console message.hwc4872012-06-13
| | | | | | | | | | | | Removed cloud material from the pulldown.
| * | Moved Flat material to the top of the drop down.hwc4872012-06-12
| | |
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-12
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures Conflicts: assets/canvas-runtime.js js/io/system/ninjalibrary.json js/mediators/element-mediator.js
| * | | material cleanup and rearchitecturehwc4872012-06-06
| | | |
| * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-04
| |\ \ \ | | | | | | | | | | | | | | | Textures
| * \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-05-11
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures Conflicts: js/lib/geom/geom-obj.js js/lib/geom/rectangle.js js/tools/TagTool.js
| * \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-04-27
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Textures
| * | | | | | Update materials to the new texture model.hwc4872012-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Create local world for deleted source canvases
| * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-04-19
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures Conflicts: js/lib/drawing/world.js js/lib/geom/geom-obj.js js/lib/rdge/materials/cloud-material.js js/lib/rdge/materials/deform-material.js js/lib/rdge/materials/flat-material.js js/lib/rdge/materials/material.js js/lib/rdge/materials/pulse-material.js js/lib/rdge/materials/relief-tunnel-material.js js/lib/rdge/materials/square-tunnel-material.js js/lib/rdge/materials/star-material.js js/lib/rdge/materials/taper-material.js js/lib/rdge/materials/tunnel-material.js js/lib/rdge/materials/twist-material.js js/lib/rdge/materials/twist-vert-material.js js/lib/rdge/materials/uber-material.js js/lib/rdge/materials/water-material.js js/lib/rdge/materials/z-invert-material.js
| * | | | | | | Cloud materialhwc4872012-04-10
| | | | | | | |
| * | | | | | | Re-added taper and twist-vert materials.hwc4872012-04-05
| | | | | | | |
| * | | | | | | Added Flag materialhwc4872012-04-04
| | | | | | | |
| * | | | | | | started the flag materialhwc4872012-04-03
| | | | | | | |
* | | | | | | | Fixing apply 'no color'Jose Antonio Marquez2012-06-15
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | This should fix canvas and standard DOM elements including the root (body or template wrapper).
* | | | | | | IKNINJA-1675 - Cannot resize SVG using free transform tool.Nivesh Rajbhandari2012-06-12
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | Body PI fixes.Nivesh Rajbhandari2012-06-07
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | fixing a rotation and zoom bugValerio Virgillito2012-06-06
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | removing all model creators.Valerio Virgillito2012-06-05
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | The elementModel is now a getter that will create a new model when needed. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | fixed the 3d grid when switching documents and some cleanupValerio Virgillito2012-06-01
| |_|_|/ |/| | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | Refactor creating elements. Removed makeNJElement and separated the model ↵Valerio Virgillito2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | creation Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | Nesting absolute element in the Tag tool. Refactoring element creation and ↵Valerio Virgillito2012-05-02
| |_|/ |/| | | | | | | | | | | | | | element models Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Fixing the element model and adding get elementValerio Virgillito2012-04-26
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Added a body controllerValerio Virgillito2012-04-24
| |/ |/| | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | removing _undo array and _targets array and use object instead of matching ↵Valerio Virgillito2012-04-13
| | | | | | | | | | | | arrays to set properties Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Single perspective fix.Nivesh Rajbhandari2012-04-09
| | | | | | | | | | | | Note that rotating multiple objects when the stage is rotated still doesn't work and flatten still doesn't work. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Merge branch 'refs/heads/ToolFixes' into WebGLMaterialsNivesh Rajbhandari2012-04-04
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/templates/montage-html/default_html.css js/mediators/element-mediator.js js/panels/properties.reel/properties.js js/tools/BrushTool.js js/tools/LineTool.js js/tools/PenTool.js js/tools/SelectionTool.js js/tools/ShapeTool.js js/tools/TranslateObject3DTool.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | 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>
* | | Build elements' properties3d values on file open.Nivesh Rajbhandari2012-03-27
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | Merge branch 'refs/heads/WebGLFileIO' into WebGLMaterialsNivesh Rajbhandari2012-03-27
|\| |
| * | Fixed issue with WebGL materials not working after file-save or ↵Nivesh Rajbhandari2012-03-26
| |/ | | | | | | | | | | chrome-preview. Also fixed Raiders material not showing in the PI or working during Chrome Preview. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-03-27
|\| | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Adding checkbox in PI to start/stop WebGL animation preview.Nivesh Rajbhandari2012-03-22
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Squashed commit of the following GL integrationValerio Virgillito2012-03-22
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Get matrix and perspective distance from styles controller.Nivesh Rajbhandari2012-03-21
|/ | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 00:57:29 +0000