| Commit message (Collapse) | Author | Age |
|\
| |
| |
| | |
GridFixes
|
| | |
|
|\|
| |
| |
| |
| |
| |
| | |
GridFixes
Conflicts:
js/helper-classes/3D/StageLine.js
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | | |
|
| | | |
|
| |\ \
| | |/
| |/| |
Fixes for incorrect line/polygon intersections.
|
|\| |
| | |
| | |
| | | |
GridFixes
|
| | | |
|
| |/
|/| |
|
|/ |
|
|
|
|
| |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|
|
|
| |
(check if the second mouse click actually selects the existing first anchor point)
|
|\
| |
| |
| |
| |
| |
| | |
integration
Conflicts:
js/preloader/Preloader.js
|
| |
| |
| |
| |
| |
| |
| | |
- Requiring all the previously pre-loaded files
- RDGE, Codemirror and gl-matrix are not included via a script tag.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| |
| |
| |
| |
| |
| | |
We can't translate 3d moves into 2d space due to perspective, so we must update the matrix3d values instead of the top-left values if items have 3d.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|/ |
|
|\ |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
js/helper-classes/RDGE/Materials/FlatMaterial.js
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | |
| | |
| | |
| | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|\ \ \
| | |/
| |/| |
|
| |/
| |
| |
| | |
and mouse down
|
|\|
| |
| |
| |
| |
| | |
Conflicts:
.gitignore
js/ninja.reel/ninja.js
|
| |
| |
| |
| | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|/ |
|
|
Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>
|