Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rust server #131

Merged
merged 70 commits into from Nov 26, 2020
Merged

Rust server #131

merged 70 commits into from Nov 26, 2020

Conversation

Tarnadas
Copy link
Collaborator

No description provided.

src/index.js Show resolved Hide resolved
proto/mario.proto Show resolved Hide resolved
src/game/MultiMarioManager.js Outdated Show resolved Hide resolved
@@ -16,7 +15,7 @@ window.addEventListener("keydown", (e) => {
$("#banbox").is(':focus')

if ($("#chatbox").is(':focus') && e.keyCode == 13) {
sendChat(document.getElementById('chatbox').value)
//sendChat(document.getElementById('chatbox').value)
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TODO: reenable

@@ -213,10 +217,8 @@ export const post_main_loop_one_iteration = (frame) => {
}
}

decrementChat()
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TODO: readd

src/socket.js Show resolved Hide resolved
@Tarnadas Tarnadas changed the title [WIP] Rust server Rust server Nov 24, 2020
@sm64js sm64js changed the base branch from MMO to MMO_ November 26, 2020 01:48
@sm64js sm64js merged commit 67e8d57 into MMO_ Nov 26, 2020
@Tarnadas Tarnadas deleted the MMO_benchmark_rust branch December 2, 2020 04:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants