| Commit message (Expand) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| * | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-19 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | | | | Squashed commit of the following: | Valerio Virgillito | 2012-04-18 | |
| | | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | | | Remove TODOs | Jonathan Duran | 2012-04-18 | |
| * | | | | | | | | | | | | | | | | | | Add flag for abs/rel position | Jonathan Duran | 2012-04-18 | |
| * | | | | | | | | | | | | | | | | | | FIX for layer selection when adding a keyframe in unselected layer | Jonathan Duran | 2012-04-18 | |
| * | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-04-18 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | | | Timeline: Bug fix: changing layer name didn't save in some circumstances. | Jon Reid | 2012-04-17 | |
| | * | | | | | | | | | | | | | | | | | Timeline: Further fixes to new document/breadcrumb interactions. | Jon Reid | 2012-04-17 | |
| * | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-18 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / / | ||||
| | * | | | | | | | | | | | | | | | | Merge pull request #165 from mqg734/BoundsCalculation | Valerio Virgillito | 2012-04-17 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | * | | | | | | | | | | | | | | | | Drag and drop of images and components should not add 3d values by default. | Nivesh Rajbhandari | 2012-04-16 | |
| | | |/ / / / / / / / / / / / / / / | ||||
| | * | | | | | | | | | | | | | | | | collapsing the history panel by default and commenting out the undo for the 3... | Valerio Virgillito | 2012-04-13 | |
| | * | | | | | | | | | | | | | | | | setAttribute added to the undo/redo | Valerio Virgillito | 2012-04-09 | |
| | * | | | | | | | | | | | | | | | | adding a history panel | Valerio Virgillito | 2012-04-09 | |
| | |/ / / / / / / / / / / / / / / | ||||
| * | | | | | | | | | | | | | | | | Fix tweens not updating keyframe rules | Jonathan Duran | 2012-04-16 | |
| * | | | | | | | | | | | | | | | | Timeline: Bug fixes for restoring tweens on new document and breadcrumb. | Jon Reid | 2012-04-13 | |
| * | | | | | | | | | | | | | | | | Timeline: Remove default style track. | Jon Reid | 2012-04-13 | |
| * | | | | | | | | | | | | | | | | Timeline: More bug fixes for document switching. | Jon Reid | 2012-04-13 | |
| * | | | | | | | | | | | | | | | | Timeline: More bug fixes. | Jon Reid | 2012-04-12 | |
| * | | | | | | | | | | | | | | | | Timeline: Bug fixes: Document switching between new documents now working. | Jon Reid | 2012-04-12 | |
| * | | | | | | | | | | | | | | | | Timeline: Fixing the animated Element | Kruti Shah | 2012-04-12 | |
| * | | | | | | | | | | | | | | | | Timeline : Replace Element Taken Care of | Kruti Shah | 2012-04-12 | |
| * | | | | | | | | | | | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-04-12 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-04-11 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | | | | | | | | Timeline: Change Master Layer configuration menu to be on click; bug fix: | Jon Reid | 2012-04-11 | |
| * | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/timeline-kruti-local' into TimelineUber | Jonathan Duran | 2012-04-12 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | | | Timeline:Changing function name | Kruti Shah | 2012-04-12 | |
| * | | | | | | | | | | | | | | | | | | More Absolute vs Relative changes and cleanup | Jonathan Duran | 2012-04-11 | |
| | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | | Timeline: Bug fix: Drag and Drop now working again. | Jon Reid | 2012-04-10 | |
| * | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-04-10 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | | | | | | | | Abs. vs. Rel. animation postion functions | Jonathan Duran | 2012-04-10 | |
| | * | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-04-10 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-10 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / | |/| | / / / / / / / / / / / / / / / | | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | | | | | | Merge pull request #159 from mqg734/WebGLMaterials | Valerio Virgillito | 2012-04-09 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | | | | | | | Undoing bad auto-merge resize-composer.js. | Nivesh Rajbhandari | 2012-04-05 | |
| | | | * | | | | | | | | | | | | | | | Undoing some minor spacing differences from auto-merge. | Nivesh Rajbhandari | 2012-04-05 | |
| | | | * | | | | | | | | | | | | | | | Undoing mistakes from auto-merge. | Nivesh Rajbhandari | 2012-04-05 | |
| | | | * | | | | | | | | | | | | | | | Merge branch 'refs/heads/ToolFixes' into WebGLMaterials | Nivesh Rajbhandari | 2012-04-04 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/WebGLFileIO' into ToolFixes | Nivesh Rajbhandari | 2012-04-04 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/EricSnapping' into WebGLFileIO | Nivesh Rajbhandari | 2012-04-04 | |
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | | | | | |/| | | | | | | | | | | | | | | ||||
| | | | | | | * | | | | | | | | | | | | | | merge from main | hwc487 | 2012-03-29 | |
| | | | | * | | | | | | | | | | | | | | | | Styling PI's Materials edit button. | Nivesh Rajbhandari | 2012-04-04 | |
| | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterials | Nivesh Rajbhandari | 2012-03-27 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | * | | | | | | | | | | | | | | | | | Adding logic for flatten checkbox in PI. | Nivesh Rajbhandari | 2012-03-24 | |
| | | | * | | | | | | | | | | | | | | | | | Tweaking some styles in the materials popup. | Nivesh Rajbhandari | 2012-03-23 | |
| | | | * | | | ||||