aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
* New: Added switching view functionality to document UIJose Antonio Marquez2012-07-16
| | | | This now let's you switch between code and design views in all documents opened that support design view. Code view for these documents is currently unsupported, so this is just to hook up the UI to the new methods. Code view will be added next.
* New: Adding switch view methodJose Antonio Marquez2012-07-16
| | | | Added a method to switch views from code and design. (Code is not currently supported)
* Merge pull request #392 from joseeight/DocumentValerio Virgillito2012-07-16
|\ | | | | New: Improved layout of components for breadcrumb and UI buttons for views
| * CSS Fixes for WindowsJose Antonio Marquez2012-07-16
| | | | | | | | Font size is not inherited in Chrome for Windows, but does inherit in Mac, adding size for avoid inconsistency.
| * Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-16
| |\
| * | New: Added knob to timeline resizerJose Antonio Marquez2012-07-13
| | | | | | | | | | | | Added visual feedback for the timeline resizer
| * | New: Improved Breadcrumb LayoutJose Antonio Marquez2012-07-13
| | | | | | | | | | | | Added new CSS/HTML layout for the breadcrumb component.
| * | adding a container around the breadcrumb buttonValerio Virgillito2012-07-12
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-12
| |\ \
| * | | Improving Document Bar UIJose Antonio Marquez2012-07-12
| | | | | | | | | | | | | | | | Setting up new document bar UI to then set up switching document view modes. Improving layout of component and cleaning up. Added icons and button UI.
* | | | Merge branch 'master' of github.com:Motorola-Mobility/ninjaJohn Mayhew2012-07-16
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge pull request #391 from joseeight/ColorValerio Virgillito2012-07-14
| |\ \ \ | | |_|/ | |/| | Fix: IKNINJA-1634
| | * | Merge branch 'refs/heads/Ninja-Master' into ColorJose Antonio Marquez2012-07-10
| | |\|
| | * | Fixing IKNINJA-1634Jose Antonio Marquez2012-07-10
| | | | | | | | | | | | | | | | Adding a fix for referencing the stop from all elements on the gradient stop itself.
* | | | Trademark Update - added trademarked Ninja name to the splash screen and ↵John Mayhew2012-07-16
|/ / / | | | | | | | | | about box.
* | | Merge branch 'master' of github.com:Motorola-Mobility/ninja into GridFixeshwc4872012-07-11
|\ \ \ | | |/ | |/| | | | | | | Conflicts: assets/shaders/radialBlur.frag.glsl
| * | Removed the shaders that we do not have rights to.hwc4872012-07-10
| |/
* | re-wrote the radial blur shader. Changed tolerances in the deformation shaders.hwc4872012-07-11
| |
* | Tweak to an edge case in grid drawing.hwc4872012-07-10
| |
* | Grid drawing changeshwc4872012-07-10
| |
* | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-07-10
|\| | | | | | | GridFixes
| * fixed incorrect capitalization for DOCTYPE htmlJohn Mayhew2012-07-09
| |
| * cleaned up remaining copyrights for releaseJohn Mayhew2012-07-09
| |
| * Merge pull request #381 from kriskowal/normalizeValerio Virgillito2012-07-09
| |\ | | | | | | Normalize HTML DOCTYPE
| | * Normalize HTML DOCTYPEKris Kowal2012-07-09
| | | | | | | | | | | | | | | | | | | | | Was lower-case. Now upper-case. Also fixed BOMs, trailing white-space, DOS line terminators. Did not expand tabs to spaces.
| * | Merge branch 'refs/heads/ninja-internal-master' into ↵Ananya Sen2012-07-09
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | codemirror-custom-theme-removal Conflicts: js/code-editor/codemirror-ninja/theme/lesser-dark-ninja.css js/code-editor/codemirror-ninja/theme/xq-dark-ninja.css Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * Merge branch 'refs/heads/Ninja-Internal' into AnalyticsJose Antonio Marquez2012-07-09
| | |\ | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * BSD LicenseKris Kowal2012-07-09
| | | |
| | * | Adding Google AnalyticsJose Antonio Marquez2012-07-09
| | |/ | | | | | | | | | | | | | | | | | | Conflicts: index.html js/ninja.reel/ninja.html
| * | removed unnecessary todo commentsAnanya Sen2012-07-09
| | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | Removed the customized xq-dark and lesser-dark themes temporarily until ↵Ananya Sen2012-07-09
| | | | | | | | | | | | | | | | | | copyright legalities determined Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | Grid drawing fixeshwc4872012-07-10
| | |
* | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-07-09
|\ \ \ | | |/ | |/| | | | | | | | | | | | | GridFixes Conflicts: js/helper-classes/3D/StageLine.js
| * | Merge branch 'normalize' of https://github.com/kriskowal/ninja-internalValerio Virgillito2012-07-09
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | Normalize HTML doctypeKris Kowal2012-07-06
| | | |
| | * | Remove byte order markers (BOM)Kris Kowal2012-07-06
| | | |
| | * | Remove trailing spacesKris Kowal2012-07-06
| | | |
| | * | Normalize to unix line terminatorsKris Kowal2012-07-06
| | | |
| | * | Remove trailing spacesKris Kowal2012-07-06
| | | |
| | * | Expand tabsKris Kowal2012-07-06
| | |/
| * | Merge branch 'GIO-TextTool' of https://github.com/dhg637/ninja-internalValerio Virgillito2012-07-09
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/tools-properties/text-properties.reel/text-properties.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * \ Merge branch 'refs/heads/master' into GIO-TextToolArmen Kesablyan2012-07-03
| | |\ \
| | * | | Text Tool 2Armen Kesablyan2012-07-03
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | Merge branch 'refs/heads/master' into GIO-TextToolArmen Kesablyan2012-07-02
| | |\ \ \
| | * | | | Bug: Font Name & Size not updating text toolArmen Kesablyan2012-07-02
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-28
| | |\ \ \ \
| * | \ \ \ \ Merge branch 'Taper' of https://github.com/ericmueller/ninja-internalValerio Virgillito2012-07-09
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/lib/geom/circle.js js/lib/rdge/materials/linear-gradient-material.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | 'V' texture map coordinate was inverted in some cases.hwc4872012-06-29
| | | | | | | |
| | * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Taperhwc4872012-06-29
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Taperhwc4872012-06-28
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 00:23:47 +0000