Skip to content

Commit

Permalink
Update v1 draft
Browse files Browse the repository at this point in the history
  • Loading branch information
rodlie committed Jul 21, 2024
1 parent 7beba15 commit 04c9226
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 8 deletions.
29 changes: 21 additions & 8 deletions _drafts/friction-100.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,28 +12,41 @@ Draft for Friction 1.0.0 Beta 1.

* Proper support for timecodes
* New Theme *(work-in-progress)*
* Support for Split Clip (`K`)
* Support for Markers (`M`)
* Support for Frame In (`I`)
* Support for Frame Out (`O`)
* Support for Markers (`M`)
* Support for Split Clip (`K`)
* Changed shortcut for 'Invert Selection' (`Alt+A`)

[**Full Changelog**](https://github.com/friction2d/friction/compare/v0.9.6.1...v1.0.0-beta1).

### Split Clip

Friction now supports split clip. The action is available through the shortcut `K` on the timeline.
Friction now supports split clip. This action is available through the shortcut `K` on the timeline.

<video controls src="/assets/videos/100/friction-split-clip.mp4" title="Split action in use"></video>

Or through the context menu on the clip or the timeline scrollbar.

| Clip Context Menu | Timeline Scrollbar Context Menu |
| ------ | -------- |
| ![Clip context menu](/assets/screenshots/100/friction-clip-context-menu.jpg) | ![Frame scroll bar context menu](/assets/screenshots/100/friction-framescrollbar-context-menu.jpg)

### Markers

Friction now has initial support for markers on the timeline. This action is available through the shortcut `M` on the timline and through the timeline scrollbar context menu.

<video controls src="../assets/videos/100/friction-split-clip.mp4" title="Split action in use"></video>
*Note: If a marker already exists it will be removed. Clear all markers is available in the timeline scrollbar context menu.*

Or through the context menu on the clip.
<video controls src="/assets/videos/100/friction-markers.mp4" title="Markers in use"></video>

![Clip context menu](../assets/screenshots/100/friction-clip-context-menu.jpg)
### Frame In/Out

Or through the context menu in the frame scroll bar.
Friction now has initial support for frame in/out on the timeline. This action is available through the shortcut `I` for in and shortcut `O` for out. The actions are also available through the timeline scrollbar context menu.

![Frame scroll bar context menu](../assets/screenshots/100/friction-framescrollbar-context-menu.jpg)
*Note: If a in/out already exists it will be removed. Clear in/out is available in the timeline scrollbar context menu.*

<video controls src="/assets/videos/100/friction-frame-inout.mp4" title="Frame in/out in use"></video>

## Known Issues

Expand Down
Binary file added assets/videos/100/friction-frame-inout.mp4
Binary file not shown.
Binary file added assets/videos/100/friction-markers.mp4
Binary file not shown.

0 comments on commit 04c9226

Please sign in to comment.