seb/NightTrainToBudapest
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
621 Commits 1 Branch 0 Tags
c1af75e2edfa8a4ba33b38c1208d0cd5a8759e87
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonas c1af75e2ed Merge remote-tracking branch 'origin/master' 2022-05-16 20:21:01 +02:00
Jonas 2e901490b2 Updated Bell timing for performance optimization, changed some values in Timer class to make gameplay less hectic 2022-05-16 20:20:49 +02:00
Jonas 7a81987316 Bells only start during the day, also ghosts now make noises as originally intended 2022-05-16 12:36:48 +02:00
Jonas 977f126073 Merge remote-tracking branch 'origin/master' 2022-05-15 21:06:01 +02:00
Jonas 1042c331c2 Implemented background sounds, bells and music 2022-05-15 21:02:03 +02:00
Jonas 79b21df2ce uploaded background crop image 2022-05-15 18:16:07 +02:00
Jonas 635c758669 made sounds louder 2022-05-15 17:30:55 +02:00
Jonas 68e2494be5 Working on Sound.java, all audio files loaded as audioClips - commit (2/2) 2022-05-14 17:06:20 +02:00
Jonas 9bdfa6ad02 Merge remote-tracking branch 'origin/master' 2022-05-14 17:04:34 +02:00
Jonas e945557753 Working on Sound.java, all audio files loaded as audioClips - commit (1/2) 2022-05-14 17:01:47 +02:00
Jonas 3d032be305 Bell fades in 2022-05-14 12:39:16 +02:00
Jonas 00efb47b78 Merge remote-tracking branch 'origin/master' 2022-05-14 12:12:39 +02:00
Jonas 87cfa23185 All sound effects uploaded. 2022-05-14 11:50:10 +02:00
Jonas 92f5568f1d Merge remote-tracking branch 'origin/master' 2022-05-13 10:57:48 +02:00
Jonas c08d04ad90 Uploaded night back- & foreground, deleted unused background files, updated night loki 2022-05-12 13:41:05 +02:00
Jonas 39e52b20aa Merge remote-tracking branch 'origin/master' 2022-05-11 13:14:17 +02:00
Jonas 46723baca8 Smaller versions of BG & foreground sprites 2022-05-11 13:13:54 +02:00
Jonas 694ed748d2 Uploaded some sprites for the night. Still missing: Background, foreground, animated wheels. 2022-05-10 16:21:00 +02:00
Jonas 6d61dfce32 Uploaded new foreground day sprite 2022-05-09 22:53:29 +02:00
Jonas d8717972af updated foreground sprite 2022-05-09 22:04:31 +02:00
Jonas d5d89d78d8 Uploaded final Sprites for Day. 2022-05-09 13:20:13 +02:00
Jonas fc737012c7 Timers fully implemented. 2022-04-29 21:25:03 +02:00
Jonas 96812a04ae High score fully implemented. 2022-04-28 15:29:36 +02:00
Jonas 5fbee579a9 made OgGhostHighScore.java, see documentation for details 2022-04-28 13:35:48 +02:00
Jonas a7cf0959f9 uploaded day sprites 2022-04-27 14:58:03 +02:00
Jonas 70d4c61b54 night sprites 2022-04-27 13:32:37 +02:00
Jonas 03669ac6d5 Uploaded night wheels sprites 2022-04-27 13:17:22 +02:00
Jonas a3af5d8911 Updated Diary 2022-04-26 11:34:56 +02:00
Jonas 743ac7b1c4 Uploaded Presentation 2022-04-20 16:43:51 +02:00
Jonas 3fedb8d739 Added manual as pdf 2022-04-18 23:14:06 +02:00
Jonas 1ca21a5b0e Added diary entry. 2022-04-18 23:12:07 +02:00
Jonas 814eed9442 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	src/main/java/ch/unibas/dmi/dbis/cs108/gamelogic/Game.java
#	src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/chat/ChatApp.java
 2022-04-18 22:42:09 +02:00
Jonas 1247bc2035 closing lobby during game adds game to finished games list. 2022-04-18 22:39:10 +02:00
Jonas 15d342f14b Merge remote-tracking branch 'origin/master' 2022-04-18 20:17:51 +02:00
Jonas c89eb7c5de Chat adjustments: 
-Multiple lines are now cut off before sending, and are not printed to sender chat
-"something went wrong while whispering" is now printed to chat rather than console
-Chat message is sent to lobby rather than broadcast, from the start
-whispering person sees who they whisper to
 2022-04-18 20:17:24 +02:00
Jonas 40c528612b Merge remote-tracking branch 'origin/master' 2022-04-17 21:13:10 +02:00
Jonas b717a73a38 Added human-readable protocol. 2022-04-17 21:12:22 +02:00
Jonas bf31670ec1 tried to implement build-cs108 task 2022-04-17 20:07:15 +02:00
Jonas 2f34de0136 Merge remote-tracking branch 'origin/master' 2022-04-16 12:45:36 +02:00
Jonas b454cbee96 implemented Lobby.gameIsRunning, Lobby.getLobbyIsOpen updates on method call and considers both the number of players in the lobby as well as whether a game has already started in that lobby. 2022-04-16 12:45:24 +02:00
Jonas 004f70ba44 Implemented starting everything from NightTrainToBudapest class. 2022-04-14 13:19:23 +02:00
Jonas 503808941b Deleted unused classes, implemented whisper chat, other small fixes & adjustments. 2022-04-12 22:16:34 +02:00
Jonas 8aad32bd2d Several small adjustments. Nothing major, pushing so i can continue coding on other PC 2022-04-12 20:04:23 +02:00
Jonas 920ea3fba9 Implemented broadcast to all clients across lobbies (/b), other small changes to chat & leaving lobbies: 
-bugfix for LEAVL
-/c now defaults to message within lobby
-broadcast chat to lobby when called by someone outside lobby just broadcasts to all clients not in lobbies
 2022-04-12 11:38:40 +02:00
Jonas 01b08e41b8 Implemented (almost) all required Lobby functionality. Also added Client_01 and CLient_02 for testing inside intelliJ 2022-04-11 23:05:39 +02:00
Jonas 33cbb4e57d Client Login into Lobby as well as creating a lobby now works and client can only be in one lobby at the same time. 2022-04-11 18:08:39 +02:00
Jonas 42e2720016 Merge remote-tracking branch 'origin/master' into buddaLobbySebastian 
# Conflicts:
#	src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/helpers/Protocol.java
 2022-04-11 16:19:58 +02:00
Jonas 240a44d1c3 Several small adjustments to lobby structure 2022-04-11 16:17:35 +02:00
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