Skip to content

Commit

Permalink
Merge pull request Tarnadas#114 from Tarnadas/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
Tarnadas committed Jan 7, 2020
2 parents 33cf24a + 059db51 commit e2b8680
Show file tree
Hide file tree
Showing 7 changed files with 771 additions and 516 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@
!/build/processlist.node
/release/
yarn-error.log
.vscode/settings.json
Binary file modified build/patches/ffa000
Binary file not shown.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"build:proto": "pbjs -t static-module -w commonjs -p ./proto -o ./proto/ServerClientMessage.js ./proto/ServerClientMessage.proto && pbts -o ./proto/ServerClientMessage.d.ts ./proto/ServerClientMessage.js && pbjs -t static-module -w commonjs -p ./proto -o ./proto/ClientServerMessage.js ./proto/ClientServerMessage.proto && pbts -o ./proto/ClientServerMessage.d.ts ./proto/ClientServerMessage.js",
"prebuild:win": "electron-rebuild -v 2.0.17 -f -w winprocess,process-list",
"prebuild:linux": "electron-rebuild -v 2.0.17 -f -w process-list",
"prebuild:move": "mv node_modules/process-list/bin/linux-x64-57/process-list.node build/processlist-linux.node",
"prebuild:move": "mv node_modules/process-list/build/Release/processlist.node build/processlist-linux.node",
"lint": "eslint --ext .js,.jsx,.ts,.tsx src",
"test": "jest spec",
"tsc": "tsc --noEmit",
Expand Down
2 changes: 1 addition & 1 deletion src/asm/ffa000.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1846,7 +1846,7 @@ nop
addiu a1, r0, $0096
lui a2, $1300
jal $29edcc
ori a2, a2, $31ac
ori a2, a2, $2AD0

!checkcoll22244:
!nowings44:
Expand Down
1 change: 1 addition & 0 deletions src/renderer/components/panels/WarningPanel.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
justify-content: center;
margin: 0 20px;
font-size: 18px;
min-width: 100%;
}

& img {
Expand Down
4 changes: 2 additions & 2 deletions src/renderer/middlewares/server-middleware.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ function listenToProcessOutput (process: ChildProcess, dispatch: Dispatch<any>):
process.on('error', (err: Error) => {
console.error(err)
})
process.stdout.on('data', (chunk: Buffer) => {
process.stdout!.on('data', (chunk: Buffer) => {
dispatch(addServerMessage(decoder.decode(chunk)))
})
process.stderr.on('data', (chunk: Buffer) => {
process.stderr!.on('data', (chunk: Buffer) => {
dispatch(addServerMessage(decoder.decode(chunk), true))
})
}
1,277 changes: 765 additions & 512 deletions yarn.lock

Large diffs are not rendered by default.

0 comments on commit e2b8680

Please sign in to comment.