aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/ToolFixes' into WebGLMaterialsNivesh Rajbhandari2012-04-04
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/templates/montage-html/default_html.css js/mediators/element-mediator.js js/panels/properties.reel/properties.js js/tools/BrushTool.js js/tools/LineTool.js js/tools/PenTool.js js/tools/SelectionTool.js js/tools/ShapeTool.js js/tools/TranslateObject3DTool.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Merge branch 'refs/heads/WebGLFileIO' into ToolFixesNivesh Rajbhandari2012-04-04
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: assets/canvas-runtime.js js/controllers/elements/shapes-controller.js js/lib/drawing/world.js js/lib/geom/geom-obj.js js/lib/geom/line.js js/mediators/element-mediator.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 Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * We should require VecUtils instead of referring to the global reference ↵Nivesh Rajbhandari2012-04-04
| | | | | | | | | | | | | | | | | | since we will eventually remove that from the window object. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * Merge branch 'refs/heads/EricSnapping' into WebGLFileIONivesh Rajbhandari2012-04-04
| | |\
| | | * Snapping fixes.hwc4872012-04-02
| | | |
| | | * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-03-29
| | | |\ | | | | | | | | | | | | | | | Snapping
| | | * | merge from mainhwc4872012-03-29
| | | | |
| | * | | Adjusting line's width and height when changing stroke size.Nivesh Rajbhandari2012-04-04
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | IKNinja-635 - Can't see 3d handles if div is red, green or blue color.Nivesh Rajbhandari2012-04-03
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | Give user feedback about which element the Fill/InkBottle tools will act on.Nivesh Rajbhandari2012-04-03
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | IKNinja-1375 - After WebGL conversion from PI, Selection tool gets ↵Nivesh Rajbhandari2012-04-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | deactivated or becomes non-functional to the shape. Need to set elementModel.isIn2DSnapCache to false when replacing element. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | IKNinja-1392 - Unable to view Oval canvas2D with Inner Radius in the ↵Nivesh Rajbhandari2012-04-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Chrome-Preview. Any shapes object are drawn after will not shown in Chrome-Preview. Vector.create should be replaced with [ ] notation. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | IKNinja-1376 - 3D values reverted when using Selection tool to move the ↵Nivesh Rajbhandari2012-04-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | object. (Only happen when 3D values set in PI) We need to update the undo array for the tool if values are changed outside the active tool. I think this was the same bug causing IKNinja-1411. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | IKNinja-1399 - [Eyedropper] Not sampling WebGL gradients after file open.Nivesh Rajbhandari2012-04-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to set the isShape property in the elementModel on file open. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | Switching to Linear/RadialGradient materials will set the corresponding ↵Nivesh Rajbhandari2012-04-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | color. Also, dispatching an addElement event when toggling shape from WebGL/canvas2d so timeline can draw correctly. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | IKNinna-1409 - Should dirty document when changing shape properties. ↵Nivesh Rajbhandari2012-04-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IKNinja-1391 - Shapes need to support no-color. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | IKNinja-1410 - Inner Radius should be restricted to 99%.Nivesh Rajbhandari2012-04-02
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | Merge branch 'refs/heads/ninja-internal' into WebGLFileIONivesh Rajbhandari2012-04-02
| | |\ \ \
| | * | | | Update PI and Color Panel to reflect default LinearGradient and ↵Nivesh Rajbhandari2012-03-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RadialGradient materials' colors. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | Merge branch 'refs/heads/ninja-internal' into WebGLFileIONivesh Rajbhandari2012-03-30
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | Updated shapes to always check for its stroke and fill colors and materials ↵Nivesh Rajbhandari2012-03-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of relying on the shapeModel cache because it can get out of sync. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | We shouldn't set z to 0 for translate tool snapping because user may want to ↵Nivesh Rajbhandari2012-03-29
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | snap in 3d. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | Styling PI's Materials edit button.Nivesh Rajbhandari2012-04-04
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-04-04
| |\ \ \ \
| | * \ \ \ Merge pull request #156 from mayhewinator/WorkingBranchValerio Virgillito2012-04-04
| | |\ \ \ \ | | | | | | | | | | | | | | Namespace and code cleanup for RDGE and related files
| | | * \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵John Mayhew2012-04-04
| | | |\ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WorkingBranch Conflicts: js/lib/drawing/world.js
| | | * | | | removed unnecessary call to exportMaterials from init(). this call should ↵John Mayhew2012-04-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | not have been there.
| | | * | | | Removed the dependence on an "assets" directory for the RDGE runtime. Now ↵John Mayhew2012-04-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Ninja does not need to create duplicate files when it sets up the users Ninja Projects directory for RDGE support.
| | | * | | | removed old unused import and export functions.John Mayhew2012-04-03
| | | | | | |
| | | * | | | Namespaced the canvas runtime file and updated all dependenciesJohn Mayhew2012-04-03
| | | | | | |
| | | * | | | updated the rdge compiled version and its runtime, incremented rdge library ↵John Mayhew2012-04-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | version number
| | | * | | | fixed remaining namespace bugs ensuring the use of the RDGE namespace ↵John Mayhew2012-04-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | everywhere it is required
| | | * | | | removed unnecessary files from the RDGE build.John Mayhew2012-04-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added back the build batch and shell script files for building the compiled version of RDGE Corrected the build scripts to not include the precompiled.js file twice.
| | | * | | | added the Closure compiler to the gitignore file so we wouldn't track it in ↵John Mayhew2012-04-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | source control
| | | * | | | Made use of semicolons consistent and updated new files to use the new RDGE ↵John Mayhew2012-04-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | namespace
| | | * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵John Mayhew2012-04-02
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WorkingBranch Conflicts: js/helper-classes/RDGE/rdge-compiled.js js/helper-classes/RDGE/runtime/GLRuntime.js js/helper-classes/RDGE/src/core/script/MeshManager.js js/helper-classes/RDGE/src/core/script/engine.js js/helper-classes/RDGE/src/core/script/fx/ssao.js js/helper-classes/RDGE/src/core/script/init_state.js js/helper-classes/RDGE/src/core/script/run_state.js js/helper-classes/RDGE/src/core/script/scenegraphNodes.js js/helper-classes/RDGE/src/core/script/utilities.js js/helper-classes/RDGE/src/tools/compile-rdge-core.bat js/helper-classes/RDGE/src/tools/compile-rdge-core.sh js/helper-classes/RDGE/src/tools/rdge-compiled.js js/lib/drawing/world.js js/lib/rdge/materials/bump-metal-material.js js/lib/rdge/materials/deform-material.js js/lib/rdge/materials/flat-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/linear-gradient-material.js js/lib/rdge/materials/mandel-material.js js/lib/rdge/materials/plasma-material.js js/lib/rdge/materials/pulse-material.js js/lib/rdge/materials/radial-blur-material.js js/lib/rdge/materials/radial-gradient-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 js/preloader/Preloader.js
| | | * | | | Recompiled RDGE and put index.html back to loading the compiled version of RDGEJohn Mayhew2012-04-02
| | | | | | |
| | | * | | | Fixed compiler warningsJohn Mayhew2012-04-02
| | | | | |