diff --git a/discord/discord_server.odg b/discord/discord_server.odg deleted file mode 100644 index c67aaa6..0000000 Binary files a/discord/discord_server.odg and /dev/null differ diff --git a/discord/discord_server_icon.odg b/discord/discord_server_icon.odg new file mode 100644 index 0000000..e4f1f11 Binary files /dev/null and b/discord/discord_server_icon.odg differ diff --git a/discord/discord_server_icon.png b/discord/discord_server_icon.png index b25cd55..9261b8d 100644 Binary files a/discord/discord_server_icon.png and b/discord/discord_server_icon.png differ diff --git a/overlay/stream_banner.odg b/overlay/stream_banner.odg index 648271a..56e3d79 100644 Binary files a/overlay/stream_banner.odg and b/overlay/stream_banner.odg differ diff --git a/overlay/stream_banner.png b/overlay/stream_banner.png index ce9cd56..c7f3d37 100644 Binary files a/overlay/stream_banner.png and b/overlay/stream_banner.png differ diff --git a/overlay/stream_overlay.odg b/overlay/stream_overlay.odg index 372d569..7cdc5cc 100644 Binary files a/overlay/stream_overlay.odg and b/overlay/stream_overlay.odg differ diff --git a/overlay/stream_overlay_chat.png b/overlay/stream_overlay_chat.png index aaff975..b088b53 100644 Binary files a/overlay/stream_overlay_chat.png and b/overlay/stream_overlay_chat.png differ diff --git a/overlay/stream_overlay_offline.png b/overlay/stream_overlay_offline.png index 02f8ecb..2f628d1 100644 Binary files a/overlay/stream_overlay_offline.png and b/overlay/stream_overlay_offline.png differ diff --git a/panel/stream_panel.odg b/panel/stream_panel.odg index a53295f..fd5c039 100644 Binary files a/panel/stream_panel.odg and b/panel/stream_panel.odg differ diff --git a/panel/stream_panel_info.png b/panel/stream_panel_info.png index 7ddacd9..90a209e 100644 Binary files a/panel/stream_panel_info.png and b/panel/stream_panel_info.png differ diff --git a/transition/drum_hit.wav b/transition/drum_hit.wav deleted file mode 100644 index 8dcc05e..0000000 Binary files a/transition/drum_hit.wav and /dev/null differ diff --git a/transition/drum_hit0001.wav b/transition/drum_hit0001.wav new file mode 100644 index 0000000..a4f08f7 Binary files /dev/null and b/transition/drum_hit0001.wav differ diff --git a/transition/new_profile_round.png b/transition/new_profile_round.png new file mode 100644 index 0000000..5f48f3d Binary files /dev/null and b/transition/new_profile_round.png differ diff --git a/transition/profile.png b/transition/profile.png deleted file mode 100644 index 6aba041..0000000 Binary files a/transition/profile.png and /dev/null differ diff --git a/transition/transition.webm b/transition/transition.webm deleted file mode 100644 index 55aae02..0000000 Binary files a/transition/transition.webm and /dev/null differ diff --git a/transition/transition_stinger.kdenlive b/transition/transition_stinger.kdenlive index b33cff1..14ac0bd 100644 --- a/transition/transition_stinger.kdenlive +++ b/transition/transition_stinger.kdenlive @@ -1,30 +1,84 @@ - - - - 150 + + + + 00:00:05.000 + pause + new_profile_round.png + 25 + 1 + 1 + 1 + 2 + 800 + 800 + qimage + 00:00:05:00 + was here + -1 + 4 + 2 + 57100 + 35983e4a82139e391e07787a4311ca6c + 0 + + + 125 pause - 1 + 1 1 1 kdenlivetitle - 150 - fancy_recct - <kdenlivetitle duration="150" LC_NUMERIC="C" width="1920" height="1080" out="149"> - <item type="QGraphicsRectItem" z-index="7"> + 00:00:05:00 + rectangle + <kdenlivetitle LC_NUMERIC="C" duration="125" height="1080" out="124" width="1920"> + <item type="QGraphicsRectItem" z-index="0"> <position x="602" y="-342"> <transform rotation="0,0,16" zoom="100">0.961262,0.275637,0,-0.275637,0.961262,0,0,0,1</transform> </position> <content brushcolor="255,184,108,255" pencolor="0,0,0,255" penwidth="0" rect="0,0,1175,1500"/> </item> - <item type="QGraphicsRectItem" z-index="3"> + <startviewport rect="0,0,1920,1080"/> + <endviewport rect="0,0,1920,1080"/> + <background color="0,0,0,0"/> +</kdenlivetitle> + + was here + -1 + 5 + 2 + {d755130f-84df-48f2-b1e2-f42e7ec25ddb} + 507cbd95d00863210b282bce45831cb3 + 0 + 1920 + 1080 + 0 + + + 125 + pause + + 1 + 1 + 1 + kdenlivetitle + 00:00:05:00 + fancy_rectangle + <kdenlivetitle LC_NUMERIC="C" duration="125" height="1080" out="124" width="1920"> + <item type="QGraphicsRectItem" z-index="2"> + <position x="602" y="-342"> + <transform rotation="0,0,16" zoom="100">0.961262,0.275637,0,-0.275637,0.961262,0,0,0,1</transform> + </position> + <content brushcolor="255,184,108,255" pencolor="0,0,0,255" penwidth="0" rect="0,0,1175,1500"/> + </item> + <item type="QGraphicsRectItem" z-index="1"> <position x="530" y="-461"> <transform rotation="0,0,16" zoom="100">0.961262,0.275637,0,-0.275637,0.961262,0,0,0,1</transform> </position> - <content brushcolor="255,85,85,255" pencolor="0,0,0,255" penwidth="0" rect="0,0,1377,1689.33"/> + <content brushcolor="255,85,85,255" pencolor="0,0,0,255" penwidth="0" rect="0,0,1377,1689"/> </item> - <item type="QGraphicsRectItem" z-index="1"> + <item type="QGraphicsRectItem" z-index="0"> <position x="444" y="-440"> <transform rotation="0,0,16" zoom="100">0.961262,0.275637,0,-0.275637,0.961262,0,0,0,1</transform> </position> @@ -35,327 +89,116 @@ <background color="0,0,0,0"/> </kdenlivetitle> + was here -1 + 6 2 - 2 - 5053b11dda3a7928734c42af50778b32 + {5826a6d0-9bc1-4b97-9ef9-d8e580cd246e} + 71d664efc82270006aae397a17d08a71 0 1920 1080 + 0 - - 00:00:05.000 + + 28 pause - profile.png - 25 - 1 - 1 - 1 - 2 - 500 - 500 - qimage - - 00:00:05.000 - - - profile.png - 2 - 3 - 28975 - 20fe1c04918c936533111c5732bb8039 - -1 - - - 150 - pause - - 1 - 1 - 1 - kdenlivetitle - 150 - rect - <kdenlivetitle duration="150" LC_NUMERIC="C" width="1920" height="1080" out="149"> - <item type="QGraphicsRectItem" z-index="7"> - <position x="602" y="-342"> - <transform rotation="0,0,16" zoom="100">0.961262,0.275637,0,-0.275637,0.961262,0,0,0,1</transform> - </position> - <content brushcolor="255,184,108,255" pencolor="0,0,0,255" penwidth="0" rect="0,0,1175,1500"/> - </item> - <startviewport rect="0,0,1920,1080"/> - <endviewport rect="0,0,1920,1080"/> - <background color="0,0,0,0"/> -</kdenlivetitle> - - -1 - 2 - 4 - 8252d739931f038ccdb831fe9cd6755d - 0 - 1920 - 1080 - - - 34 - pause - drum_hit.wav - 2 + drum_hit0001.wav + avformat + 1 audio s16 - 44100 + 48000 2 + stereo pcm_s16le PCM signed 16-bit little-endian - 1411200 - video - 90000 - 0 - 375 - 500 - 0 - yuvj420p - 1 - 601 - mjpeg - MJPEG (Motion JPEG) - 0 - Cover (front) - 2018 Epic Stock Media (Quest Game) https://epicstockmedia.com - Logic Pro X - 391212226 - Game Sounds - Tribal, Hit, UI, Notification, Ping, Percussive, Percussion, Drum, Kit, Touch, Collect, Click, Tap, Shake, Switch + 1536000 Collin Scudder - Soundminer + Tribal, Hit, UI, Notification, Ping, Percussive, Percussion, Drum, Kit, Touch, Collect, Click, Tap, Shake, Switch + 2018 Epic Stock Media (Quest Game) https://epicstockmedia.com 2018-03-12 + Game Sounds + 0 + Lavf60.16.100 + Logic Pro X 1 - 72 - 72 - 1 - 3 0 -1 - 1 - avformat - - 0 + 0 -1 - 5 - 372020 - 637dba3d031da0fada1ffa403792d410 - 164 - 90000 - 1 - 601 - 2 - 0 - 375 - 500 - full - 0 - 1 - 1 - - - 3 - 2 - -1 - 1 - 0 - 1671569112311 - 0 - 0 - 0 - ./;GL;.LRV;./;GX;.MP4;./;GP;.LRV;./;GP;.MP4 - 0 - 0 - [ -] - - [ - { - "color": "#9b59b6", - "comment": "Category 1", - "index": 0 - }, - { - "color": "#3daee9", - "comment": "Category 2", - "index": 1 - }, - { - "color": "#1abc9c", - "comment": "Category 3", - "index": 2 - }, - { - "color": "#1cdc9a", - "comment": "Category 4", - "index": 3 - }, - { - "color": "#c9ce3b", - "comment": "Category 5", - "index": 4 - }, - { - "color": "#fdbc4b", - "comment": "Category 6", - "index": 5 - }, - { - "color": "#f39c1f", - "comment": "Category 7", - "index": 6 - }, - { - "color": "#f47750", - "comment": "Category 8", - "index": 7 - }, - { - "color": "#da4453", - "comment": "Category 9", - "index": 8 - } -] - - 22.12.3 - 39 - - - atsc_1080p_30 - - 2000 - 800 - 1000 - - 640 - Video with Alpha - -1 - -1 - 0 - 0 - 0 - 0 - Alpha VP9 - 1 - 0 - 540 - 960 - 6 - -1 - 0 - -1 - 0 - transition.webm - 0 - 30000 - 1.04 - 1 - -1 - 0 - 40 - 3 - - - 1 - - - - - - + 7 + 1 + 215388 + c241f0095ad72ac36153377fbab2be93 + 199 + + 2147483647 continue black 1 color + black_track rgba 0 - - 34 + + 28 pause - drum_hit.wav + drum_hit0001.wav + avformat-novalidate + 1 0 -1 - 0 - avformat-novalidate - 2 + 0 + -1 + 7 + 1 + 215388 + c241f0095ad72ac36153377fbab2be93 + 199 + 1 audio s16 - 44100 + 48000 2 + stereo pcm_s16le PCM signed 16-bit little-endian - 1411200 - video - 90000 - 0 - 375 - 500 - 0 - yuvj420p - 1 - 601 - mjpeg - MJPEG (Motion JPEG) - 0 - Cover (front) - 2018 Epic Stock Media (Quest Game) https://epicstockmedia.com - Logic Pro X - 391212226 - Game Sounds - Tribal, Hit, UI, Notification, Ping, Percussive, Percussion, Drum, Kit, Touch, Collect, Click, Tap, Shake, Switch + 1536000 Collin Scudder - Soundminer + Tribal, Hit, UI, Notification, Ping, Percussive, Percussion, Drum, Kit, Touch, Collect, Click, Tap, Shake, Switch + 2018 Epic Stock Media (Quest Game) https://epicstockmedia.com 2018-03-12 - 1 - 72 - 72 - 1 - 3 - - 0 - -1 - 5 - 372020 - 637dba3d031da0fada1ffa403792d410 - 164 - 1 + Game Sounds + 0 + Lavf60.16.100 + Logic Pro X was here - 90000 - 1 - 601 - 2 - 0 - 375 - 500 - full - 0 - 1 + 0 0 - + 1 + 1 - - - 5 + + + 7 1 - + 1 67 1 0 - - + + 75 20dB @@ -378,14 +221,14 @@ - - 2 + + 6 1 qtblend qtblend - 00:00:00.000=-3549 -459 3552 1998 1.000000;00:00:00.333=-816 -459 3552 1998 1.000000;00:00:00.900=-816 -459 3552 1998 1.000000;00:00:01.267=1916 -459 3552 1998 1.000000 - 00:00:00.000=0;00:00:00.333=0;00:00:00.900=0;00:00:01.267=0 + 00:00:00.000=-3549 -459 3552 1998 1.000000;00:00:00.400=-816 -459 3552 1998 1.000000;00:00:00.960=-816 -459 3552 1998 1.000000;00:00:01.320=1916 -459 3552 1998 1.000000 + 00:00:00.000=0;00:00:00.400=0;00:00:00.960=0;00:00:01.320=0 0 0 0 @@ -393,7 +236,7 @@ - + 67 1 0 @@ -403,15 +246,15 @@ - - - 3 + + + 4 1 qtblend qtblend - 00:00:00.000~=480 271 960 540 1.000000;00:00:00.300~=288 163 1344 756 1.000000;00:00:00.833~=288 163 1344 756 1.000000;00:00:01.167~=480 271 960 540 1.000000 - 00:00:00.000~=0;00:00:00.300~=0;00:00:00.833~=0;00:00:01.167~=0 + 00:00:00.000~=480 271 960 540 1.000000;00:00:00.360~=288 163 1344 756 1.000000;00:00:00.760~=288 163 1344 756 1.000000;00:00:01.160~=480 271 960 540 1.000000 + 00:00:00.000~=0;00:00:00.360~=0;00:00:00.760~=0;00:00:01.160~=0 0 0 0 @@ -419,7 +262,7 @@ - + 67 1 0 @@ -429,14 +272,14 @@ - - 4 + + 5 1 qtblend qtblend - 00:00:00.000=-3549 -459 3552 1998 1.000000;00:00:00.333=-816 -459 3552 1998 1.000000;00:00:00.900=-816 -459 3552 1998 1.000000;00:00:01.267=1916 -459 3552 1998 1.000000 - 00:00:00.000=0;00:00:00.333=0;00:00:00.900=0;00:00:01.267=0 + 00:00:00.000=-3549 -459 3552 1998 1.000000;00:00:00.400=-816 -459 3552 1998 1.000000;00:00:00.960=-816 -459 3552 1998 1.000000;00:00:01.320=1916 -459 3552 1998 1.000000 + 00:00:00.000=0;00:00:00.400=0;00:00:00.960=0;00:00:01.320=0 0 0 0 @@ -444,7 +287,7 @@ - + 67 1 0 @@ -453,13 +296,44 @@ - - + + 00:00:01.360 + 34 + Sequenz 1 + + {c81d730f-8c87-4080-84c5-0c5018e23ca7} + 17 + 3 + 0 + 8be60ad72d944afc01db3f3094804d51 + 2 + 0 + 1 + 0 + {c81d730f-8c87-4080-84c5-0c5018e23ca7} + 1 + 1 + 33 + 0 + 4 + 4 + 1 + 2 + 0 + 34 + 2 + [ +] + + [ +] + + - + 3 4 0.2 @@ -479,30 +353,24 @@ 0 2 - 0 - 0 - 0 - qtblend + 0.1 + frei0r.cairoblend 1 237 0 3 - 0 - 0 - 0 - qtblend + 0.1 + frei0r.cairoblend 1 237 0 4 - 0 - 0 - 0 - qtblend + 0.1 + frei0r.cairoblend 1 237 @@ -521,4 +389,113 @@ 1 + + Sequenzen + 2 + {c81d730f-8c87-4080-84c5-0c5018e23ca7} + 2 + 0 + /home/niklas/Dokumente/ + 1 + 1711464273375 + 0 + 0 + 0 + + 0 + 0 + [ + { + "color": "#9b59b6", + "comment": "Kategorie 1", + "index": 0 + }, + { + "color": "#3daee9", + "comment": "Kategorie 2", + "index": 1 + }, + { + "color": "#1abc9c", + "comment": "Kategorie 3", + "index": 2 + }, + { + "color": "#1cdc9a", + "comment": "Kategorie 4", + "index": 3 + }, + { + "color": "#c9ce3b", + "comment": "Kategorie 5", + "index": 4 + }, + { + "color": "#fdbc4b", + "comment": "Kategorie 6", + "index": 5 + }, + { + "color": "#f39c1f", + "comment": "Kategorie 7", + "index": 6 + }, + { + "color": "#f47750", + "comment": "Kategorie 8", + "index": 7 + }, + { + "color": "#da4453", + "comment": "Kategorie 9", + "index": 8 + } +] + + 24.02.1 + {c81d730f-8c87-4080-84c5-0c5018e23ca7} + + + atsc_1080p_25 + + 2000 + 800 + 1000 + + 640 + Video with Alpha + -1 + -1 + 0 + 0 + 0 + 0 + 0 + Alpha VP9 + 0 + 540 + 960 + 6 + -1 + 0 + -1 + 0 + transition_stinger.webm + 30000 + {c81d730f-8c87-4080-84c5-0c5018e23ca7} + 1.1 + + 4 + + 1 + + + + + + + + 1 + + diff --git a/transition/transition_stinger.webm b/transition/transition_stinger.webm new file mode 100644 index 0000000..cfd3083 Binary files /dev/null and b/transition/transition_stinger.webm differ