Commit Graph
85 Commits
Author SHA1 Message Date
Jonas 9583cd56e1 added all necessary documentation to Protocol.java 2022-04-08 18:02:23 +02:00
Jonas c3096d7088 Merge remote-tracking branch 'origin/master' 2022-04-08 13:03:41 +02:00
Jonas e348840169 protocol is now fully in the protocol.java class 2022-04-08 13:03:32 +02:00
Jonas 1d9ee624fe Merge remote-tracking branch 'origin/master' 2022-04-08 12:36:41 +02:00
Jonas b6d2a04e76 Working on putting all protocol messages through Protocol.java.
Some small adjustments & bugfixes to how naming is handled.
Added loggedIn boolean for ClientHandler, not meaningfully implemented yet though.
Other minor changes.
2022-04-08 12:36:30 +02:00
Jonas 3c94bd5324 Merge remote-tracking branch 'origin/master' 2022-04-08 11:11:14 +02:00
Jonas 782f6e0f22 Updated Diary.txt 2022-04-08 11:11:01 +02:00
Jonas 1b27a601f0 updated nameDuplicateChecker to remove $ and : and deal with empty names. Also renamed singularName() to checkName().
Some other minor adjustments
2022-04-07 13:13:09 +02:00
Jonas 2789779d62 Merge remote-tracking branch 'origin/master' 2022-04-07 12:29:59 +02:00
Jonas faa2b61acb Call me Joni Mitchell because quit due to connection loss works on both sides now. 2022-04-07 12:29:36 +02:00
Jonas de69ea27bb Merge remote-tracking branch 'origin/master' 2022-04-07 11:33:18 +02:00
Jonas 02c0676ecf every message is sent via the sendMsgToClient / sendMsgToServer methods. Logger for debugging what happens when someone accidentally quits 2022-04-07 11:33:06 +02:00
Jonas f26bdec457 added fun Agatha Christie reference for nerds.
(default system name is U.N. Owen)
2022-04-06 23:47:14 +02:00
Jonas d114d69595 Simplified Login, updated name-duplicate-checking and added fun suffixes 2022-04-06 23:30:30 +02:00
Jonas c64c754d22 Another complete overhaul of client-server communication:
-Added broadcastAnnouncement message to ClientHandler
-Bugfix: "Connection lost" at startup
-Added LOGIN$username to protocol
2022-04-06 21:57:21 +02:00
Jonas 51d969e298 Merge remote-tracking branch 'origin/master' 2022-04-06 19:32:05 +02:00
Jonas 033a7e3bb6 /q now works without throwing any errors 2022-04-04 14:36:29 +02:00
Jonas f677f5cb71 complete overhaul of client / server communication. Several methods renamed, tweaked protocol. 2022-04-02 17:10:29 +02:00
Jonas 5010b66d4c Made several small adjustments:
-regarding disconnection handling
-corrected import statements in GameFunctions.java
2022-04-01 12:18:16 +02:00
Jonas fd8ee64e50 applied google style 2022-03-28 00:15:34 +02:00
Jonas a2fbd2c86e Merge remote-tracking branch 'origin/master' 2022-03-28 00:04:25 +02:00
Jonas a72c5239ff Added in-code documentation for client & server protocol parsers. 2022-03-28 00:04:06 +02:00
Jonas ae7bff2a6f Some documentation stuff 2022-03-27 23:57:06 +02:00
Jonas 5d535c35e0 Pings dont start immediately 2022-03-27 17:43:29 +02:00
Jonas 535edcc54c changed ping time to 5 seconds 2022-03-27 17:14:29 +02:00
Jonas b344e59b23 Merge remote-tracking branch 'origin/Jonas_Stuff' into Jonas_Stuff
# Conflicts:
#	src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/Client.java
2022-03-27 17:09:44 +02:00
Jonas 841a6f095c formatting 2022-03-27 14:22:55 +02:00
Jonas 4eb70bd028 friendship ended with :, now $ is my best friend
(changed : in protocol.txt to $)
2022-03-27 14:06:20 +02:00
Jonas cdb2bb402b Merge remote-tracking branch 'origin/Jonas_Stuff' into Jonas_Stuff 2022-03-27 13:57:41 +02:00
Jonas 467d72b17c Added protocol.txt 2022-03-27 13:56:32 +02:00
Jonas 2f7db70df7 Merge remote-tracking branch 'origin/Jonas_Stuff' into Jonas_Stuff 2022-03-27 13:29:16 +02:00
Jonas 141a4783b9 Formatting of how chat messages are displayed, too short a protocol message doesnt print exception stack trace. 2022-03-27 13:29:02 +02:00
Jonas 6071ea4b2f Cleaned up, deleted unused files, reformatted all code 2022-03-27 13:06:08 +02:00
Jonas d2c2ca1732 Chat works. 2022-03-27 12:07:21 +02:00
Jonas 63a8e21f6c Ping(back) works on both client and server side. 2022-03-27 11:58:48 +02:00
Jonas 146ff4ea82 Working on JClientProtocolParser 2022-03-27 11:54:01 +02:00
Jonas ac11bc4991 implemented JServerProtocolParser, started writing JClientProtocolParser 2022-03-27 10:41:37 +02:00
Jonas 80644a934c New Parser structure 2022-03-27 10:03:27 +02:00
Jonas f5dd739dd4 spelling 2022-03-27 10:01:08 +02:00
Jonas c48457e9b6 spelling 2022-03-26 11:50:35 +01:00
Jonas 111e310d00 Merge remote-tracking branch 'origin/master' 2022-03-26 11:38:25 +01:00
Jonas 9371f8551d formatting & lower case folders 2022-03-26 11:37:57 +01:00
Jonas 002e9a5e57 updated Diary.txt 2022-03-25 13:56:18 +01:00
Jonas 5dc4747f6e Merge remote-tracking branch 'origin/master' 2022-03-25 13:30:25 +01:00
Jonas 7a3dc4abd6 Client can specify host IP 2022-03-25 13:30:03 +01:00
Jonas 7f967f6818 ClientPinger and ServerPinger "merged" from the ping branch 2022-03-25 12:39:20 +01:00
Jonas 47703e481e Updated ServerPinger and ClientPinger to terminate if the socket is closed 2022-03-24 20:22:40 +01:00
Jonas 909abd81b1 added ServerPinger.java and updated client & server pingers 2022-03-24 15:34:38 +01:00
Jonas 3e9888e662 updated documentation for humanNPC 2022-03-24 11:23:41 +01:00
Jonas 7bb1407ef7 MANY UPDATES TO CLIENT/SERVER:Introduced a protocol parser interface and created an implementing class.
Introduced Input-Type Interface which is implemendet by the parameter class. This allowes the clients parser to more easily create an the NTtB-Protocol adhering message.
furthermore a ProtocolMessage interface implemented by NTtBFormatMsg abstract class.
parseMsg in NTtBProtocolParser
2022-03-23 19:07:38 +01:00
Jonas 784e4ae9f3 tiny formatting adjustment 2022-03-23 12:59:30 +01:00
Jonas c928119bbc updated player / npc classes to work with ClientHandlers 2022-03-22 15:24:53 +01:00
Jonas 66b34dce60 added getClientUserName() method 2022-03-22 15:16:31 +01:00
Jonas Nicolas Biedermann 076c3aca3a Update .gitignore to add .idea 2022-03-21 12:51:38 +00:00
Jonas 236024751c did the things to ignore idea 2022-03-21 13:36:53 +01:00
Jonas ea2fdc7a50 test commit to see if deleted folders will push 2022-03-21 13:33:08 +01:00
Jonas b6c21e2f3e finished HumanPlayer class 2022-03-21 12:47:13 +01:00
Jonas 166dc5151b small adjustments & comments to passenger & subclasses 2022-03-17 14:56:29 +01:00
Jonas f2c1cbc17c added all needed subclasses, worked on Ghost classes. 2022-03-17 14:27:54 +01:00
Jonas b053561dfc Merge remote-tracking branch 'origin/master' 2022-03-17 14:05:43 +01:00
Jonas 98a2fdb082 Added Passenger, Ghost, GhostNPC classes 2022-03-17 14:05:27 +01:00
Jonas 052524df32 Adjusted stuff in Meilenstein I folder to meet the requirements (available in pdf) as well as adding README.txt 2022-03-16 16:18:00 +01:00
Jonas c74711ae07 Cleaned up & polished BudaClientServerStuff 2022-03-16 16:07:17 +01:00
Jonas bdcdd1d025 Added README.txt to BudaClientServerStuff 2022-03-16 15:35:49 +01:00
Jonas 65e3596433 Added README.txt to BudaClientServerStuff 2022-03-16 15:35:23 +01:00
Jonas 3f4b3e0f17 put protocol in Milestone I folder 2022-03-16 12:39:24 +01:00
Jonas 2d057d5954 Added URL link to Google Slides 2022-03-15 14:04:01 +01:00
Jonas 7ba2053daa Merge branch 'master' of https://git.scicore.unibas.ch/cs108-fs22/Gruppe-8
# Conflicts:
#	.gradle/6.9.2/executionHistory/executionHistory.lock
#	.gradle/6.9.2/fileHashes/fileHashes.lock
#	.gradle/buildOutputCleanup/buildOutputCleanup.lock
2022-03-14 14:00:59 +01:00
Jonas 251dc27c72 moved BudaClientServerStuff 2022-03-14 13:56:49 +01:00
Jonas e6e9caea6e Added diary as txt to Meilenstein I folder. 2022-03-14 10:00:12 +01:00
Jonas afb5348fff Moved BudaClientServerStuff to Meilenstein I folder 2022-03-13 21:12:00 +01:00
Jonas 687e68be6c added BudaClientServerStuff, an example for some client server functionality. 2022-03-11 10:10:14 +01:00
Jonas eeb259af92 Merge branch 'master' of https://git.scicore.unibas.ch/cs108-fs22/Gruppe-8 2022-03-08 16:05:51 +01:00
Jonas ebf3f2db31 added protocol draft as xls 2022-03-08 16:05:34 +01:00
Jonas 3d0289c778 Merge branch 'master' of https://git.scicore.unibas.ch/cs108-fs22/Gruppe-8 2022-03-08 13:16:08 +01:00
Jonas 2cbbd7f625 Updated possible game rules 2022-03-08 13:15:49 +01:00
Jonas b610931e47 Updated Protokoll to mention that it's on a train 2022-03-04 14:11:17 +01:00
Jonas d6951d1d7a Added a .rtf about possible game rules which could be implemented to balance the game / make it more interesting. 2022-03-04 14:02:32 +01:00
Jonas 4803b3f086 Cleaned some stuff up, created documentation folder. 2022-03-02 13:56:54 +01:00
Jonas Nicolas Biedermann d5f999954b Delete alex.txt.txt 2022-03-02 12:46:45 +00:00
Jonas Nicolas Biedermann ddb0571c31 Delete CONTRIBUTORS.txt.txt 2022-03-02 12:46:27 +00:00
Jonas Nicolas Biedermann 2d60422ea2 Auf https://scratch.mit.edu/projects/editor/
File => Load from your computer
2022-03-02 12:43:39 +00:00
Jonas 4c1858eb37 Removed .txt.txt, added my name to CONTRIBUTORS.txt - second try 2022-03-02 12:28:54 +01:00
Jonas c77de4658e removed .txt.txt 2022-03-02 12:19:03 +01:00
Jonas 4c99d98718 Textdatei Jonas.txt hinzugefügt. 2022-02-28 13:11:17 +01:00