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

Host and join game #46

Merged
merged 39 commits into from
Apr 17, 2024
Merged

Host and join game #46

merged 39 commits into from
Apr 17, 2024

Conversation

SverreNystad
Copy link
Owner

@SverreNystad SverreNystad commented Apr 16, 2024 •
edited
Loading

Add multiplayer to the game.

Add player input getting from messengers

SverreNystad and others added 30 commits April 16, 2024 16:37
@SverreNystad
feat: Add actionDao to ServerMessenger so it can look for player actions
16e62c0
@SverreNystad
feat: Update game server to process pending player actions
f163214
@SverreNystad
Merge branch 'main' into host-and-join-game
ee1f16c
@Artewald
build: Change android manifest to include internet access needed for …
aa6e642 
…android app to access internet
@SverreNystad
feat: get game form optional after requesting gamestate on client
180a1f5
@SverreNystad
fix: get id from server if host
8e4d41b
@SverreNystad
refactor: add debug print statements
f885081
@SverreNystad
refactor: make debug print statements state if they are server or client
1a1e9a2
@Artewald
wip
9302c17
@SverreNystad
test: make update tests
c5eb979
@Artewald
fix: Entity equality was not done propperly. You could have multiple …
a992613 
…entities with same UUID. Fix by implement equals and hashcode
@Artewald
Merge branch 'host-and-join-game' of https://github.com/SverreNystad/…
6cd98f6 
…progark into host-and-join-game
@SverreNystad
test: remove redundant import
2aa918b
@SverreNystad
Merge branch 'host-and-join-game' of https://github.com/SverreNystad/…
377e2db 
…progark into host-and-join-game
@SverreNystad
feat: make client send card placement to server
8a17f50
@SverreNystad
feat: make player input have two constructors one for card placement …
c8e7807 
…and one generic
@SverreNystad
docs: correct look for pending actions signature and javadocs
06d6803
@SverreNystad
fix: correct looking for player actions in client and server messengers
cb38d8d
@SverreNystad
feat: add all logic from InGame to server
56be99f
@SverreNystad
docs: add todo for checking if one can buy a card
d2abe06
@Artewald
fix: Missing add entity to ECSManager in deserialize
0e3dc70
@Artewald
Merge branch 'host-and-join-game' of https://github.com/SverreNystad/…
bfc9143 
…progark into host-and-join-game
@SverreNystad
Merge branch 'main' into host-and-join-game
112a5b3
@SverreNystad
fix: gameserver placing of cards
9360f7c
@SverreNystad
feat: Add button components to entities without button component in I…
05d8335 
…nGame.java
@Artewald
feat: serialize and deserialize tile components
b1e5656
@SverreNystad
feat: add lateActivate
3fb5493
@SverreNystad
feat: add lateactivate for buttons to be init on client
aa65a81
@SverreNystad
feat: Add debug print statements for button initialization in InGame.…
1e9a5a3 
…java
@SverreNystad
feat: Add debug print statements for button initialization in InputSy…
00b735b 
…stem.java
@tobiasfremming tobiasfremming merged commit 62fc55b into main Apr 17, 2024
2 of 4 checks passed
@tobiasfremming
Copy link
Collaborator

Looks good to me:)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tobiasfremming tobiasfremming Awaiting requested review from tobiasfremming

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@SverreNystad @tobiasfremming @Artewald