| Commit message (Collapse) | Author | Age |
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
js/components/gradientpicker.reel/gradientpicker.js
js/components/tools-properties/text-properties.reel/text-properties.js
js/document/views/base.js
js/document/views/design.js
js/helper-classes/3D/StageLine.js
js/helper-classes/3D/draw-utils.js
js/lib/drawing/world.js
js/lib/geom/circle.js
js/lib/geom/line.js
js/lib/geom/rectangle.js
js/lib/geom/shape-primitive.js
js/lib/rdge/materials/bump-metal-material.js
js/lib/rdge/materials/flag-material.js
js/lib/rdge/materials/fly-material.js
js/lib/rdge/materials/julia-material.js
js/lib/rdge/materials/keleidoscope-material.js
js/lib/rdge/materials/mandel-material.js
js/lib/rdge/materials/material.js
js/lib/rdge/materials/plasma-material.js
js/lib/rdge/materials/pulse-material.js
js/lib/rdge/materials/radial-gradient-material.js
js/lib/rdge/materials/taper-material.js
js/lib/rdge/materials/twist-vert-material.js
js/lib/rdge/materials/water-material.js
js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
js/panels/Materials/materials-popup.reel/materials-popup.html
js/panels/Materials/materials-popup.reel/materials-popup.js
js/tools/LineTool.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | |
|
|\ \
| | |
| | | |
IKNinja-1736 and IKNinja-1802 - Copy paste WebGL bugs.
|
| | |
| | |
| | |
| | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|\ \ \
| |_|/
|/| | |
Fixed IKNINJA-1763, IKNINJA-1807 - refresh stage after loading image/svg
|
| | |
| | |
| | |
| | | |
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
| |/
| |
| |
| |
| |
| | |
image and svg
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
|/ |
|
|
|
|
|
|
| |
don't generate data-RDGE-id for simple canvas element
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
|
- refactoring and cleanup
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|