| Commit message (Collapse) | Author | Age |
|
|
|
| |
path is smoothed (and also when the stroke width is changed) AND some code cleanup to remove unnecessary brush stroke properties
|
|
|
|
| |
size is changed (does not yet work when smoothing is applied) AND select the newly created brush stroke by default
|
|
|
|
| |
store the brush stroke points. Current version does not yet update the width and height of the brush stroke canvas upon changing the brush stroke through the PI. Also, current version does not obtain 3D position of points properly from the drawing tool base (see BrushTool _getUnsnappedPosition)
|
|
|
|
|
|
| |
and code cleanup
GOOD status before doing 3D unprojection step
|
| |
|
| |
|
|\ |
|
| |\
| | |
| | | |
IKNINJA-1305 : fixed the check for stopVideos() method's existence
|
| |/
| |
| |
| | |
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
| |\
| | |
| | | |
Presets Panel: Added Scale Up and Down to transitions list. According to
|
| | |
| | |
| | |
| | | |
Signed-off-by: Armen Kesablyan <armen@motorola.com>
|
| | |
| | |
| | |
| | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | |
| | |
| | |
| | | |
This should be moved to 'makeNJElement' to account for the element to be loaded.
|
| |\ \ |
|
| | |\ \ |
|
| | | |\ \
| | | | | |
| | | | | | |
Fixed issues with Properties panel, focus and grid redraw
|
| | | | |\ \ |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
opened.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
called when clicking on the canvas.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
from the PI
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | | |\ \ \ \
| | | | |_|/ /
| | | |/| | | |
Timeline uber
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| | | | |\ \ \
| | | | |/ / /
| | | |/| | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
js/controllers/selection-controller.js
js/helper-classes/RDGE/src/tools/rdge-compiled.js
js/helper-classes/backup-delete/GLBrushStroke.js
js/helper-classes/backup-delete/GLCircle.js
js/helper-classes/backup-delete/GLGeomObj.js
js/helper-classes/backup-delete/GLRectangle.js
js/helper-classes/backup-delete/GLSubpath.js
js/helper-classes/backup-delete/GLWorld.js
js/helper-classes/backup-delete/Materials/BumpMetalMaterial.js
js/helper-classes/backup-delete/Materials/DeformMaterial.js
js/helper-classes/backup-delete/Materials/FlatMaterial.js
js/helper-classes/backup-delete/Materials/FlyMaterial.js
js/helper-classes/backup-delete/Materials/JuliaMaterial.js
js/helper-classes/backup-delete/Materials/KeleidoscopeMaterial.js
js/helper-classes/backup-delete/Materials/LinearGradientMaterial.js
js/helper-classes/backup-delete/Materials/MandelMaterial.js
js/helper-classes/backup-delete/Materials/PlasmaMaterial.js
js/helper-classes/backup-delete/Materials/PulseMaterial.js
js/helper-classes/backup-delete/Materials/RadialBlurMaterial.js
js/helper-classes/backup-delete/Materials/RadialGradientMaterial.js
js/helper-classes/backup-delete/Materials/ReliefTunnelMaterial.js
js/helper-classes/backup-delete/Materials/SquareTunnelMaterial.js
js/helper-classes/backup-delete/Materials/StarMaterial.js
js/helper-classes/backup-delete/Materials/TaperMaterial.js
js/helper-classes/backup-delete/Materials/TunnelMaterial.js
js/helper-classes/backup-delete/Materials/TwistMaterial.js
js/helper-classes/backup-delete/Materials/TwistVertMaterial.js
js/helper-classes/backup-delete/Materials/UberMaterial.js
js/helper-classes/backup-delete/Materials/WaterMaterial.js
js/helper-classes/backup-delete/Materials/ZInvertMaterial.js
js/lib/drawing/world.js
js/preloader/Preloader.js
js/stage/layout.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
merge master into timeline
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| |\| | | | | |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Added a temp fix to allow for a redraw of an SVG on load.
|
| | | | | | | |
|
| | |\| | | | |
|
| |\ \ \ \ \ \
| | | |/ / / /
| | |/| | | | |
|
| | |\ \ \ \ \
| | | | |_|_|/
| | | |/| | | |
|
| | | |_|_|/
| | |/| | |
| | | | | |
| | | | | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| |\ \ \ \ \
| | |_|_|/ /
| |/| | | | |
|
| | |\ \ \ \
| | | |_|/ /
| | |/| | | |
Integration
|
| | | | | | |
|
| | | | | | |
|
| | | |\ \ \
| | | | | | |
| | | | | | | |
Clean-Up
|
| | | | | | | |
|
| | | |\ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | | |
integration
|
| | | | |\ \ \ \
| | | | | | | | |
| | | | | | | | | |
File IO Updates
|
| | | |\| | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
integration
|
| | | | |\ \ \ \ \
| | | | | | | | | |
| | | | | | | | | | |
Integrated dynamic path to assets
|
| | | |\ \ \ \ \ \ \
| | | | |/ / / / / /
| | |