Merge remote-tracking branch 'origin/4.26' into 4.27

# Conflicts: # WebcamPanel/Content/Media/MP_Webcam.uasset
wickerman123 · Mar 22, 2022 · 5efaa98 · 5efaa98
2 parents a53f5f9 + 329e94b
commit 5efaa98
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -26,3 +26,11 @@ There's a little bit of setup required. Follow these steps:
 #### Options
 Click the options button in the top left of the panel to control various options such as the mask, background and chroma key settings (I don't own a greenscreen so I can't guarentee this works well, sorry!)
 ![Options](https://imgur.com/8jWNbJa.png)
+
+
+
+## Known Bugs
+
+1. When entering PIE, the Webcam feed breaks. To fix this, press the refresh button on the panel. The same issue will occur on exiting PIE too. 
+2. If the panel is present in the layout when the editor is started, the aspect ratio is incorrect. To fix this, press the refresh button on the panel.
+3. It's janky, I know, it's just a little bit of fun.
diff --git a/WebcamPanel/Content/Blueprints/EW_WebcamMenu.uasset b/WebcamPanel/Content/Blueprints/EW_WebcamMenu.uasset
diff --git a/WebcamPanel/Content/EW_WebcamPanel.uasset b/WebcamPanel/Content/EW_WebcamPanel.uasset
diff --git a/WebcamPanel/Content/Media/MP_Webcam.uasset b/WebcamPanel/Content/Media/MP_Webcam.uasset
diff --git a/WebcamPanel/Content/Media/Webcam_MediaSource.uasset b/WebcamPanel/Content/Media/Webcam_MediaSource.uasset