Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

BattleArena
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

7d073296

Commit 7d073296 authored 1 year ago by Busch Elias

Downloads
- Plain Diff

Merge branch 'Multiplayer' into 'development'

Multiplayer

See merge request !51

parents 9caa3aef 5017cac3

Branches

Tags v0.5.1

5 merge requests!74V1,!73Initial commit,!71Merge DataBase into Development,!54Update: coreMaps.json (added new maps),!51Multiplayer

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/de/hdm_stuttgart/battlearena/Model/Multiplayer/Client.java 1 addition, 2 deletions

...e/hdm_stuttgart/battlearena/Model/Multiplayer/Client.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Multiplayer/ConnectionHandler.java 1 addition, 1 deletion

...gart/battlearena/Model/Multiplayer/ConnectionHandler.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Multiplayer/Server.java 18 additions, 8 deletions

...e/hdm_stuttgart/battlearena/Model/Multiplayer/Server.java
src/test/java/de/hdm_stuttgart/battlearena/Model/Multiplayer/ClientTest.java 18 additions, 0 deletions

...m_stuttgart/battlearena/Model/Multiplayer/ClientTest.java
src/test/java/de/hdm_stuttgart/battlearena/Model/Multiplayer/ConnectionHandlerTest.java 143 additions, 0 deletions

.../battlearena/Model/Multiplayer/ConnectionHandlerTest.java
src/test/java/de/hdm_stuttgart/battlearena/Model/Multiplayer/ServerTest.java 43 additions, 0 deletions

...m_stuttgart/battlearena/Model/Multiplayer/ServerTest.java

with 224 additions and 11 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment