Skip to content

Commit 3eb93a3

Browse files
authored
Merge pull request #7 from ILW8/feature/obs-control
OBS control & autoadvance
2 parents f17fa3d + 6b83cd0 commit 3eb93a3

File tree

25 files changed

+931
-84
lines changed

25 files changed

+931
-84
lines changed

.idea/workspace.xml

Lines changed: 73 additions & 48 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

4wc-nodecg-bundle/.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,3 +135,6 @@ dist
135135
/extension/*
136136
!/extension/index.js
137137
/graphics/
138+
139+
# don't share db in VCS
140+
db/nodecg.sqlite3
-100 KB
Binary file not shown.

4wc-nodecg-bundle/package-lock.json

Lines changed: 61 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

4wc-nodecg-bundle/package.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
"node-cache": "^5.1.2",
5656
"nodecg": "^2.5.3",
5757
"npm": "^11.4.1",
58+
"obs-websocket-js": "^5.0.6",
5859
"osu-web.js": "^2.6.0",
5960
"patch-package": "^8.0.0",
6061
"socket.io-client": "^4.7.4",
@@ -108,7 +109,13 @@
108109
"name": "gosumemory",
109110
"title": "gosumemory",
110111
"file": "gosumemory.html",
111-
"width": 4
112+
"width": 3
113+
},
114+
{
115+
"name": "obs ws",
116+
"title": "obs websocket",
117+
"file": "obsWs.html",
118+
"width": 3
112119
},
113120
{
114121
"name": "picksAndBans",
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
!obs*.json

0 commit comments

Comments
 (0)