Brian's Branch #1
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Here's all my code for the console version of the game.
Conflicts: .DS_Store
Edited Tom's client side code
We decided that having working code was too easy, so we changed everything. It does look a lot better though.
Conflicts: Login/bin/Login.apk
Conflicts: ShanghaiHoldEmServer/bin/ServerConnect.class ShanghaiHoldEmServer/bin/ServerHello.class
... i think
Commented out later gameplay code to test login stuff
This reverts commit be6dcd1.
Wrote 4 & 5 for MyMessage, handleMessage and play in GameScreen
This can be used as an example for how we want to approach the service for the real app
it's making me do this...
Conflicts: LiuNewSocket/Client/bin/Client.apk LiuNewSocket/Client/bin/classes.dex LiuNewSocket/Client/bin/classes/com/example/client/GameScreen$Connect.cl ass LiuNewSocket/Client/bin/classes/com/example/client/ReadyScreen$Connect.c lass LiuNewSocket/Client/bin/resources.ap_ Server/bin/mytcp/NioServer$2.class Server/bin/mytcp/NioServer$makeFlagFalse.class Server/bin/mytcp/NioServer.class Server/src/mytcp/NioServer.java
Deleted everythign except projects that are actually being used toward game
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.