| Commit message (Collapse) | Author | Age |
... | |
| |/ / / / /
| | | | | |
| | | | | |
| | | | | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
frame.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| |\ \ \ \ \
| | | |_|_|/
| | |/| | | |
|
| | |_|_|/
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | | |
a width and height on the body in order to do 3d.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|\ \ \ \ \
| | |_|/ /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Textures
Conflicts:
js/lib/geom/shape-primitive.js
js/lib/rdge/materials/linear-gradient-material.js
|
| | | | | |
|
| | | | | |
|
| | | | | |
|
| |\ \ \ \
| | | |/ /
| | |/| |
| | | | |
| | | | |
| | | | | |
Conflicts:
js/lib/geom/circle.js
js/lib/geom/rectangle.js
|
| |/ / / |
|
|\| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Textures
Conflicts:
js/lib/geom/geom-obj.js
js/lib/geom/rectangle.js
js/tools/TagTool.js
|
| |/ / |
|
|\| |
| | |
| | |
| | | |
Textures
|
| | |
| | |
| | |
| | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | |
| | |
| | |
| | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | |
| | |
| | |
| | |
| | |
| | | |
differently.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | |
| | |
| | |
| | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|\| |
| | |
| | |
| | | |
Textures
|
| | | |
|
| | | |
|
| |\|
| | |
| | |
| | | |
Canvas-interaction
|
| | | |
|
|\ \ \
| | |/
| |/|
| | | |
Textures
|
| |\|
| | |
| | |
| | |
| | | |
Conflicts:
js/helper-classes/3D/view-utils.js
|
| |\ \
| | | |
| | | |
| | | |
| | | | |
Conflicts:
js/tools/PenTool.js
|
| | | |
| | | |
| | | |
| | | | |
canvas, and with a rotated view
|
| |\ \ \ |
|
| | | | |
| | | | |
| | | | |
| | | | | |
and path overlay (code needs cleanup)...still buggy if creating new paths
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
js/tools/PenTool.js
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
to position the canvas on which the path is rendered
AND
add data-montage- to the ids in the pen and brush reels
AND
fix a bug with pen stroke transparency not working
|
|\ \ \ \ \ \
| | |_|_|_|/
| |/| | | |
| | | | | | |
Textures
|
| |\ \ \ \ \
| | | | | | |
| | | | | | | |
Merging Eric's snapping and tool fixes into master.
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | | | | | | |
|
| | | | | | | |
|
| | |\ \ \ \ \
| | | | |_|_|/
| | | |/| | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Snapping_II
Conflicts:
js/helper-classes/3D/view-utils.js
js/panels/presets/animations-presets.reel/animations-presets.js
js/panels/presets/style-presets.reel/style-presets.js
js/panels/presets/transitions-presets.reel/transitions-presets.js
js/tools/Translate3DToolBase.js
|
| | | | | | | |
|
| | | | | | | |
|
| | | |_|_|/
| | |/| | | |
|
|\| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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
|
| | |/ / /
| |/| | |
| | | | |
| | | | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | | | |
| | | | |
| | | | |
| | | | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
to adjust for them. Also, we should set webkit-transform-style to preserve-3d if elements are rotated (until we also support flattened mode).
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | | | |
| | | | |
| | | | |
| | | | | |
|