| Commit message (Collapse) | Author | Age |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
commit 0285afe3d4bd458a51f11241f13ea6ffdb0283ed
Merge: 2f9f5e3 16d06ba
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Thu Jul 19 10:54:25 2012 -0700
Merge branch 'refs/heads/ninja-mqg734-master' into StageToolDrawingOptimizations
commit 2f9f5e369eb96f6c81b5e4bcbe09b418825e2864
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Wed Jul 18 17:15:19 2012 -0700
Fixed selection bounds not drawing in nested tags.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
commit b0a3507f9d27579ad511c69314a09136d7f7c6a0
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Wed Jul 18 11:07:44 2012 -0700
Layout info needs to redraw if stage is updated.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
commit 63c5e0bf52c33706ba597cb69f7794e287bd0f06
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Tue Jul 17 15:40:54 2012 -0700
Per feedback from QE, we are still going to draw tool feedback on each mouse move so the selection bounds are not out of sync with the elements.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
commit 0599a742092b985c4002977e501e3b457173f1d9
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Tue Jul 17 15:28:25 2012 -0700
Fixed grid not drawing correctly when switching documents and when adding/removing elements.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
commit fd9410606ee6358910d65b2cb5f71812fd44a7c4
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Tue Jul 17 11:36:09 2012 -0700
Updated drawing feedback to handle matrix 2d values entered via CSS Panel.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
commit 559c16c7ac8c9f40b94a011a6f932d4f97df66a7
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Mon Jul 16 17:14:28 2012 -0700
IKNinja-751 - Selection boundary doesn't follow the transform applied in the CSS Panel.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
commit e2da5340159db5cd6f75bf6c9b7eb9cbf959e5cd
Merge: 7cc5de3 5146f22
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Mon Jul 16 15:36:28 2012 -0700
Merge branch 'refs/heads/ninja-mqg734-master' into StageToolDrawingOptimizations
commit 7cc5de39e41b4220f53c91b15b0cf0ed53e0b0f6
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Mon Jul 16 14:52:06 2012 -0700
Check if ownerDocument.defaultValue is null.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
commit 5ae97995a28a4b06fb7f8703eb8090ea16d88acd
Merge: d17974d 0ede302
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Mon Jul 16 09:27:22 2012 -0700
Merge branch 'refs/heads/ninja-mqg734-master' into StageToolDrawingOptimizations
commit d17974d77273bb635311cb6466f4427cf4d9e5d4
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Mon Jul 16 08:45:05 2012 -0700
Pass in selectedElements array directly to drawUtils when drawing selection bounds instead of creating a duplicate array.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
commit 0b1ea3144cb3e2c1d272f60da32423d0604ace3b
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Fri Jul 13 14:03:40 2012 -0700
Fixed line tool not drawing the width and height info.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
commit b9c70e8d9ae324aa21fa5490edc71d8503bcefbc
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Fri Jul 13 12:42:25 2012 -0700
Used cached offsetWidth and offsetHeight.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
commit 9e17ac7124745ba745014efe149b31dee4fe658f
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Thu Jul 12 16:25:41 2012 -0700
Converting tabs to spaces … again!
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
commit 351726c951bb73c28f0e15ea1ab32e85cc735688
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Thu Jul 12 16:14:31 2012 -0700
Tabs should be 4 spaces.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
commit 250c419aa2dbcb10f012817ee7039aca77cb2518
Merge: 3f8d61a 2880e1d
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Thu Jul 12 16:08:31 2012 -0700
Merge branch 'refs/heads/ninja-mqg734-master' into StageToolDrawingOptimizations
commit 3f8d61a676da3992947ed9a2ed0e449780fcfbe0
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Thu Jul 12 15:53:44 2012 -0700
Rotate tool was not working immediately after switching selection and selection bounds were not drawing after resizing canvases.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
commit e2e1f81e3b6917e1032e1b99b79c266937f3bb25
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Thu Jul 12 12:15:59 2012 -0700
Single draw cycle for stage updates and tool drawings.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
commit 95a90b4c95ee3163c97bea317144366674e49ade
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Mon Jun 18 11:46:38 2012 -0700
Single draw cycle for the stage and layout.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
commit 21966b1515d80d2161a14e5a19bc66f3f49a92ce
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Fri Jun 15 13:33:14 2012 -0700
Cache element offsets, including offsetParent.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
commit 80c563c8ba06149691c6c1e754dd9a5e43bc7d4b
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Mon Jul 9 17:30:00 2012 -0700
Open materials editor popup next to PI button.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| |
|
| |
|
|\
| |
| |
| | |
GridFixes
|
| |
| |
| |
| |
| |
| |
| | |
Was lower-case. Now upper-case.
Also fixed BOMs, trailing white-space, DOS line terminators. Did not
expand tabs to spaces.
|
| | |
|
| | |
|
|\|
| |
| |
| |
| |
| |
| | |
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.
|
| |\ \ \
| | | |/
| | |/|
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
js/panels/Materials/materials-library-panel.reel/materials-library-panel.css
js/panels/Materials/materials-popup.reel/materials-popup.css
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
gradient for stroke color.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | | | |
|
|\ \ \ \
| | |/ /
| |/| |
| | | | |
GridFixes
|
| |/ / |
|
| | | |
|
| |/
|/| |
|
| | |
|
|/ |
|
|\
| |
| | |
Reclaim negative padding when moving items back into positive direction.
|
| |
| |
| |
| |
| |
| | |
template's left and top padding as the minimum values when switching between documents.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| |
| |
| |
| |
| |
| | |
Note that we only do this on elementChange and not elementChanging since it is a potentially slow routine.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|\ \
| | |
| | | |
Make stage transparent when rotating/zooming templates and draw an outline around the user's root instead.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
around the user's root instead.
Also, fixed the background color setting on banner and animation templates' "body."
Stage outline draws using drawGridLines code so it can show intersection with element planes.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|\ \ \
| |/ /
|/| | |
fixed a small startup issue with the RDGE library.
|
| |/ |
|
| |
| |
| |
| | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| |
| |
| |
| |
| |
| | |
the line intersection routine returns null.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|/
|
|
| |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|\
| |
| | |
IKNINJA-1671 - GIO: 3D rotate widget is offset from the object when rotated in negative space.
|
| |
| |
| |
| | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
in negative space.
I fixed this temporarily by disabling the auto stage scroll calculations when we modify matrices. The correct fix will be to update any matrices and local2Global caches if we update the stage's padding (which I'm doing in a separate fix for a single draw cycle for the stage, but that fix is not ready yet).
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|/ |
|
|\
| |
| |
| | |
Textures
|
| |
| |
| |
| |
| |
| | |
This issue is related to move object to negative space.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|\|
| |
| |
| |
| |
| |
| |
| |
| | |
Textures
Conflicts:
assets/canvas-runtime.js
js/io/system/ninjalibrary.json
js/mediators/element-mediator.js
|
| |
| |
| |
| |
| |
| |
| | |
Fixed the currentSelectedContainer by removing bindings and using property change on the current document
added the red outline back.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
js/document/models/html.js
js/document/views/design.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | |\ |
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
js/tools/PenTool.js
|
| | |\ \ \ |
|
| | |\ \ \ \ |
|
| | |\ \ \ \ \ |
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
(check if the second mouse click actually selects the existing first anchor point)
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
The elementModel is now a getter that will create a new model when needed.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | |_|_|_|_|/
| |/| | | | |
| | | | | | |
| | | | | | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
|\| | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Textures
|