mirror of
https://github.com/storytold/artcraft.git
synced 2026-11-02 08:28:18 +00:00
Update merge status
This commit is contained in:
1 parent
6cb758a12d
commit
d6002cc10a
1 file changed
+10
-2
+10
-2
@@ -3,7 +3,15 @@ Instructions for merging repos
|
||||
|
||||
Following https://stackoverflow.com/a/14470212
|
||||
|
||||
- Merge in cloudcam w/ ZK protocol
|
||||
- Merge in cloudcam w/ working GUI
|
||||
Status:
|
||||
|
||||
|
||||
- `old_a`: storyteller-web (FakeYou, Storyteller)
|
||||
- `old_b`: cloudcam w/ working green screen GUI
|
||||
- `old_c`: cloudcam w/ ZeroMQ protocol that talks to Unreal Engine "CloudCamPlugin"
|
||||
|
||||
TODO:
|
||||
|
||||
- Merge in realtime voice conversion
|
||||
- Merge in old 'voder'
|
||||
|
||||
Reference in new issue
Block a user