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.

Sign up for GitHub

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

Jump to bottom

feat: add online network play. #767

Merged
merged 1 commit into from
Apr 19, 2023
Merged

feat: add online network play. #767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ rustls = { version = "0.20.7", features = ["dangerous_configurat
postcard = { version = "1.0.4", features = ["alloc"] }
bytes = "1.4.0"
ping-rs = "0.1.2"
bones_matchmaker_proto = "0.1.0"

# Optimize dependencies even in development
[profile.dev.package."*"]
Expand Down
2 changes: 1 addition & 1 deletion assets/default.game.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ main_menu:
menu_width: 350

default_settings:
matchmaking_server: localhost:8943
matchmaking_server: matchmaker.bones.fishfolk.org:65534
player_controls:
# Gamepad controls
gamepad:
Expand Down
2 changes: 2 additions & 0 deletions assets/locales/en-US/network-game.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ stop-server = Stop Server
fish-fight = Fish Fight
configure-match = Configure Match
player-count = Player Count
search = Search
searching = Searching...
search-for-match = Search for Match
connecting = Connecting...
joining = Joining...
Expand Down
3 changes: 3 additions & 0 deletions src/networking.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ use proto::*;
pub use lan::*;
mod lan;

pub use online::*;
mod online;

pub struct NetworkingPlugin;

impl Plugin for NetworkingPlugin {
Expand Down
Loading