Merge branch 'master' into modularize

* master:
  rename auw
  vid updates
  notes
This commit is contained in:
Chris Ham
2018-10-22 11:08:30 -07:00
4 changed files with 73 additions and 3 deletions

View File

@@ -12223,5 +12223,65 @@
"fps": 60,
"length": 48.933984
}
},
{
"id": 817,
"shortPath": "/comparisons/desert-exit.mp4",
"winPath": "\\comparisons\\desert-exit.mp4",
"dungeonId": "04",
"dungeonName": "hera",
"roomId": "01",
"roomName": "desert-exit-comparisons",
"videoData": {
"width": 960,
"height": 720,
"fps": 60,
"length": 14.183
}
},
{
"id": 818,
"shortPath": "/comparisons/bnc.mp4",
"winPath": "\\comparisons\\bnc.mp4",
"dungeonId": "01",
"dungeonName": "escape",
"roomId": "20",
"roomName": "bnc-comparisons",
"videoData": {
"width": 960,
"height": 720,
"fps": 60,
"length": 12.27
}
},
{
"id": 819,
"shortPath": "/comparisons/escape-1st-keyguard.mp4",
"winPath": "\\comparisons\\escape-1st-keyguard.mp4",
"dungeonId": "01",
"dungeonName": "escape",
"roomId": "11",
"roomName": "1st-keyguard-comparisons",
"videoData": {
"width": 960,
"height": 720,
"fps": 60,
"length": 5.78
}
},
{
"id": 820,
"shortPath": "/comparisons/pod-arrow-statue-dash-vs-walk.mp4",
"winPath": "\\comparisons\\pod-arrow-statue-dash-vs-walk.mp4",
"dungeonId": "06",
"dungeonName": "pod",
"roomId": "30",
"roomName": "pod-arrow-statue-comparisons",
"videoData": {
"width": 960,
"height": 720,
"fps": 60,
"length": 24.52
}
}
]

View File

@@ -498,12 +498,12 @@
{
"id": "pb-any-no-eg",
"category": "Personal Best",
"label": "Personal Best: Any% No EG (30:28) [2018-09-09]",
"label": "Personal Best: Any% No EG (29:05) [2018-10-14]",
"name": "Any% No EG (PB)",
"chatName": "Any% No EG (PB)",
"filePath": "Y:\\media\\videos\\ALttP\\my-vids\\personal-bests\\any%-no-eg\\2018-09-09-no-eg-3028.mp4",
"filePath": "Y:\\media\\videos\\ALttP\\my-vids\\personal-bests\\any%-no-eg\\2018-10-14-no-eg-2905.mp4",
"sceneItem": "16x9ph",
"length": 1833,
"length": 1777,
"includeInShuffle": true
},
{

View File

@@ -36,6 +36,16 @@ Ideas:
☐ Web interface for viewers to issue commands -- twitch extension?!
☐ Support songrequests -- play through discord?
StreamWebRemote:
- OBS Websocket Connection Mgmt
- Stream Start/Stop/Restart
- Video Queue Mgmt
- Video DB Mgmt
Users:
- use twitch login
- video requests
- room requests
___________________
Archive:
✔ video length @done (18-09-28 09:33) @project(TODO)