aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Timeline: Style zoom slider.Jon Reid2012-07-17
|
* Timeline: Bug fix: Now able to add first keyframe to an element usingJon Reid2012-07-17
| | | | function key.
* Merge branch 'refs/heads/NINJA-master' into TimelineUberJonathan Duran2012-07-17
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/DragDrop.js js/panels/Timeline/Keyframe.reel/Keyframe.js js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js js/panels/Timeline/Span.reel/Span.js js/panels/Timeline/Style.reel/Style.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js js/panels/Timeline/Track.reel/Track.html js/panels/Timeline/Track.reel/Track.js js/panels/Timeline/Track.reel/css/Track.css js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css js/panels/Timeline/Tween.reel/Tween.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * update Readme.md to add info about hidden user library folder on Lion.San Khong2012-07-16
| |
| * 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.
| | * | Merge pull request #42 from mencio/breadcrumb-containerJose Antonio Marquez Russo2012-07-12
| | |\ \ | | | | | | | | | | adding a container around the breadcrumb button
| | | * | 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 pull request #394 from mayhewinator/masterValerio Virgillito2012-07-16
| |\ \ \ \ | | | | | | | | | | | | Fixed incorrect comment blocks around our open source copyright notice
| | * | | | Added back one copyright block so it is properly included in the ninja.css ↵John Mayhew2012-07-16
| | | | | | | | | | | | | | | | | | | | | | | | output file from SASS
| | * | | | Fixed incorrect comment blocks around our open source copyright notice. ↵John Mayhew2012-07-16
| | | | | | | | | | | | | | | | | | | | | | | | These incorrect comments kept us from being able to create the ninja.css file via SASS
| * | | | | Merge pull request #393 from mayhewinator/masterValerio Virgillito2012-07-16
| |\| | | | | | |_|_|/ | |/| | | Trademark Update-Added trademarked Ninja app name to about box and splash screen
| | * | | 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-11
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | 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.
| * | | | | Update Readme.md to fix some typosSan Khong2012-07-13
| | |_|_|/ | |/| | |
| * | | | Merge pull request #389 from ericmueller/GridFixesValerio Virgillito2012-07-12
| |\ \ \ \ | | |_|_|/ | |/| | | Grid fixes
| | * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja into GridFixeshwc4872012-07-11
| | |\ \ \ | | |/ / / | |/| | | | | | | | | | | | | Conflicts: assets/shaders/radialBlur.frag.glsl
| * | | | Update masterSan Khong2012-07-11
| | | | |
| * | | | Update masterSan Khong2012-07-11
| | | | |
| * | | | Update masterSan Khong2012-07-11
| | | | |
| * | | | Merge pull request #388 from mayhewinator/masterValerio Virgillito2012-07-10
| |\ \ \ \ | | | | | | | | | | | | final updates for Chrome App store release
| | * | | | Fix for incorrect doctype in last commitJohn Mayhew2012-07-10
| | | | | |
| | * | | | final updates for Chrome App store releaseJohn Mayhew2012-07-10
| |/ / / /
| * | | / Updating the Readme.Valerio Virgillito2012-07-10
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Merge pull request #385 from ericmueller/ShadersRemovedValerio Virgillito2012-07-10
| |\ \ \ | | |_|/ | |/| | Removed the shaders that we do not have rights to.
| | * | 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
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-07-09
| |\ \
| | * \ Merge pull request #384 from mayhewinator/masterValerio Virgillito2012-07-09
| | |\ \ | | | | | | | | | | removed company name from app name in credits and license files
| | | * | removed unnecessary company string in app name for license and creditsJohn Mayhew2012-07-09
| | | | |
| * | | | Add some <li> to the copyright noticeValerio Virgillito2012-07-09
| |/ / / | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Merge pull request #382 from mayhewinator/masterValerio Virgillito2012-07-09
| |\| | | | | | | | | | fixed remaining copyrights and fixed capitalization for doctype tag
| | * | fixed incorrect capitalization for DOCTYPE htmlJohn Mayhew2012-07-09
| | | |
| | * | cleaned up remaining copyrights for releaseJohn Mayhew2012-07-09
| | | |
| | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalJohn 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 'master' of github.com:Motorola-Mobility/ninja-internalJohn Mayhew2012-07-09
| | | |\ \ | | |_|/ / | |/| | | | | | | | | | | | | Conflicts: manifest.json
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 15:02:23 +0000