| Commit message (Collapse) | Author | Age |
| |
|
|\
| |
| |
| | |
Textures
|
| | |
|
| |
| |
| |
| | |
runtime.
|
| |\
| | |
| | |
| | | |
integration
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| |\ \
| | | |
| | | |
| | | | |
integration
|
| | | | |
|
| |_|/
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Texture
Conflicts:
assets/shaders/plasma.frag.glsl
js/helper-classes/RDGE/GLLine.js
js/helper-classes/RDGE/MaterialsLibrary.js
js/lib/drawing/world.js
js/lib/geom/circle.js
js/lib/geom/rectangle.js
js/lib/rdge/materials/flat-material.js
js/lib/rdge/materials/material.js
js/panels/Materials/Materials.xml
js/panels/Materials/materials-popup.reel/materials-popup.js
js/preloader/Preloader.js
|
|\ \ \
| | | |
| | | | |
fix for IKNINJA-1357 - Cannot create other file types such as css, json ...
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
the New file dialog box.
Signed-off-by: Ananya Sen <Ananya.Sen@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>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
stroke material.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
_planesArray's length to 0 instead of setting the arrays to null.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|\ \ \ \
| | | | |
| | | | | |
Presets Panel - Change Tab labels, Add Un-3d preset
|
| | | | | |
|
| |\| | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
js/panels/presets/default-transition-presets.js
|
| | | | | |
|
| |/ / /
|/| | |
| | | |
| | | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|\| | |
| | | |
| | | | |
Presets Panel - Adding Animations Tab
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
|\ \ \ \
| | |_|/
| |/| | |
|
| | | |
| | | |
| | | |
| | | | |
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>
|
| | | |
| | | |
| | | |
| | | | |
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>
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
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/Mat |