seb/NightTrainToBudapest
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
667 Commits 1 Branch 0 Tags
master
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastian Lenzlinger ad155b76cd Added the Software Arch document and a respective diary entry. 2022-05-18 16:40:40 +02:00
Sebastian Lenzlinger 2429844ec6 Merge remote-tracking branch 'origin/master' 2022-05-18 13:40:41 +02:00
Sebastian Lenzlinger 0ff36ac0fc deleted unused imports 2022-05-18 13:40:33 +02:00
Sebastian Lenzlinger 4d5cd0e05f deleted unused imports 2022-05-13 15:49:11 +02:00
Sebastian Lenzlinger beeed8f2fd deleted ClientListView initialization artefacts 2022-05-13 12:50:11 +02:00
Sebastian Lenzlinger 7ecb910c83 Merge remote-tracking branch 'origin/master' 2022-05-13 12:47:21 +02:00
Sebastian Lenzlinger 86a36368c0 deletet ClientController.java and ClientView.java 2022-05-13 12:46:56 +02:00
Sebastian Lenzlinger 65303a4bb6 Deleted more methods associated with the player list that are not needed anymore. 
The ChatView is now directly added to the anchor pone in the "Bottom"Child of the BorderPane representing the LoungeSceneView.fxml Root
 2022-05-13 12:04:32 +02:00
Sebastian Lenzlinger b605669395 HighScore and Players lists now on the left side and not on the bottom right of the loungeSceneView anymore 2022-05-13 11:43:24 +02:00
Sebastian Lenzlinger 651a07e32e removal of Lobby now runs on Platform.runLater(). Untested. 2022-05-02 00:53:25 +02:00
Sebastian Lenzlinger 62992ae84c Adding functionality for removing lobby from view. ClientHandler, GuiParameters Client and LoungeView now atleast have 
the correspondingly named functions. No functionality tested yet.
 2022-05-02 00:42:33 +02:00
Sebastian Lenzlinger d7f12d760d HERE THE CHAT WORKS WELL GO HERE TO GET IT! 2022-05-02 00:17:27 +02:00
Sebastian Lenzlinger 802b8d1154 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/Client.java
 2022-05-02 00:17:18 +02:00
Sebastian Lenzlinger 7b9c1f964a HERE THE CHAT WORKS WELL GO HERE TO GET IT! 2022-05-02 00:11:24 +02:00
Sebastian Lenzlinger d6f28a63e8 no list of who is in lobby yet but at least functionally one is in a lobby and can play a game 2022-05-01 16:53:40 +02:00
Sebastian Lenzlinger a4a12fc9d2 trying to get the join button to work 2022-05-01 16:24:53 +02:00
Sebastian Lenzlinger e58f01e4b6 .getID() from lobbylistview for debugging 2022-05-01 15:55:32 +02:00
Sebastian Lenzlinger 115e39c34f .getID() from lobbylistview for debugging 2022-05-01 15:37:47 +02:00
Sebastian Lenzlinger c333d4486f Merge remote-tracking branch 'origin/Application' into Application 2022-05-01 15:30:35 +02:00
Sebastian Lenzlinger 5dfa53c001 added RMVLSt command to remove a client from gui 2022-05-01 15:30:30 +02:00
Sebastian Lenzlinger 58e2d693bb added RMVLSt command to remove a client from gui 2022-05-01 15:15:06 +02:00
Sebastian Lenzlinger 578016d11d Added method to add new player to loungeview withing Client.java 2022-05-01 15:07:54 +02:00
Sebastian Lenzlinger 927416f224 added MSG to add new client to the gui of whoever is on the server 2022-05-01 15:03:20 +02:00
Sebastian Lenzlinger 111bd67bd4 error correcting type refactor 2022-05-01 14:56:44 +02:00
Sebastian Lenzlinger b58c371b7b Merge remote-tracking branch 'origin/Application' into Application 
# Conflicts:
#	src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/LoungeSceneViewController.java
 2022-05-01 14:54:14 +02:00
Sebastian Lenzlinger fdc7ba6668 Debugging NewLobby() 2022-05-01 14:49:46 +02:00
Sebastian Lenzlinger 70c553d608 refactored newLobby and addClientToList. Changed the leaveLobby response to go to lounge view. 2022-05-01 13:58:36 +02:00
Sebastian Lenzlinger 4a987ffc1c Deleted an unused method 2022-05-01 13:36:14 +02:00
Sebastian Lenzlinger 0abf86731a Merge remote-tracking branch 'origin/Application' into Application 
# Conflicts:
#	src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/LoungeSceneViewController.java
 2022-05-01 13:35:01 +02:00
Sebastian Lenzlinger 5244742c84 added cell factories for the lists 2022-05-01 13:32:11 +02:00
Sebastian Lenzlinger ff33163cb6 Merge remote-tracking branch 'origin/Application' into Application 
# Conflicts:
#	src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/Client.java
#	src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/ChatApp.java
#	src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/GUI.java
#	src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/helpers/GuiParameters.java
 2022-05-01 08:56:55 +02:00
Sebastian Lenzlinger 2e9a47cbd4 Fever dream 2022-05-01 08:52:58 +02:00
Sebastian Lenzlinger 9007870d19 In Client: added 3 new methods 
GuiParameters: added 3 new Params
Lounge: added Maps, changed names and implemented methods
 2022-04-30 22:18:15 +02:00
Sebastian Lenzlinger 6e00128997 added method for adding a lobby to lobbylistview 2022-04-30 19:29:57 +02:00
Sebastian Lenzlinger 77d1976332 No more errors 2022-04-30 18:51:47 +02:00
Sebastian Lenzlinger 017a8a1c99 C 2022-04-30 18:51:10 +02:00
Sebastian Lenzlinger 6a520ca83a Added Method for adding clients to gui view 2022-04-30 17:44:30 +02:00
Sebastian Lenzlinger 9f7fc2556b Adding Functionality to the view 2022-04-30 16:35:54 +02:00
Sebastian Lenzlinger d2907aa8ac Cleaned up ChatController a bit and added a chat label configurator classed used by the chat controller. 2022-04-30 13:48:21 +02:00
Sebastian Lenzlinger b769991c36 Minor Changes to ChatController adding a TODO and created a LobbyListItem class to represent members of the lobby list view, or at least the data therein. 2022-04-28 13:41:45 +02:00
Sebastian Lenzlinger 2bc79b53a7 Adding Wrapper Classes for Controlls and corresponding EventHandlers. added different fxml views. 2022-04-28 12:04:08 +02:00
Sebastian Lenzlinger ee000c73fa updated ChatView.fxml and it's corresponding controller to new design 
added LobbyListView and corresponding controller class skeleton
 2022-04-27 21:17:24 +02:00
Sebastian Lenzlinger cee9f136c6 Merge remote-tracking branch 'origin/master' 2022-04-21 08:22:12 +02:00
Sebastian Lenzlinger 73df828aa2 changed vote wait times to 10 seconds 2022-04-21 08:22:02 +02:00
Sebastian Lenzlinger 2c81133c43 standard encoding for myJavadoc gradle task now also utf-8 2022-04-18 15:32:08 +02:00
Sebastian Lenzlinger e9a4a61737 Reformatted to googlestyle and now gui colorcodes if you whisper and differentiates for all 2022-04-18 15:27:27 +02:00
Sebastian Lenzlinger 8926eaa8f8 CHATA now doesn't send chatmsg to sender gui 2022-04-18 15:01:03 +02:00
Sebastian Lenzlinger 5e50905f81 msg wont be sent to self from server now even when not in lobby 2022-04-18 14:49:37 +02:00
Sebastian Lenzlinger 5cd0612022 Diary update 2022-04-17 16:36:45 +02:00
Sebastian Lenzlinger ce4d84c9d7 Server shouldn't be sending chat messages back to the sender now 2022-04-17 16:31:43 +02:00
Sebastian Lenzlinger ef8111553e whisper chat messages now have a different background color than normal messages 2022-04-17 16:28:10 +02:00
Sebastian Lenzlinger 61697d7597 whisper is functional in with gui. decode whisper msg added to client handler and used in JServerProtcolParser now to correctly decode the messages 2022-04-17 15:38:40 +02:00
Sebastian Lenzlinger 74fdca0efd added whisper functionality for whisper in ClientHandler and Gui and deleted old recources that aren't needed. 2022-04-17 15:06:24 +02:00
Sebastian Lenzlinger 7ba20a9f62 lamdas were a bad idea 2022-04-17 12:14:16 +02:00
Sebastian Lenzlinger bd5aa011a1 Merge branch 'revert-660883f7' into 'master' 
Revert "worked through a few warnings, changed a few anonymous classes to lambdas"

See merge request cs108-fs22/Gruppe-8!5
 2022-04-17 10:13:28 +00:00
Sebastian Lenzlinger cb8dc1c56a Revert "worked through a few warnings, changed a few anonymous classes to lambdas" 
This reverts commit 660883f732
 2022-04-17 10:12:58 +00:00
Sebastian Lenzlinger 660883f732 worked through a few warnings, changed a few anonymous classes to lambdas 2022-04-17 11:35:16 +02:00
Sebastian Lenzlinger 4d82af32f4 added javafx.graphics module 2022-04-16 17:23:33 +02:00
Sebastian Lenzlinger 11897a6a68 deleted unsupported modules 2022-04-16 17:20:35 +02:00
Sebastian Lenzlinger f7324f2300 added needed javafx modules to build since I'm getting the following message at runtime: 
"JavaFX runtime components are missing, and are required to run this application"
 2022-04-16 17:06:27 +02:00
Sebastian Lenzlinger 0270202c3f Extending functionality to connect the incoming msgs to the gui via buffered readers. 2022-04-16 16:05:21 +02:00
Sebastian Lenzlinger 504aa9aef2 Commit to make sure everything is here as I accidentally deleted large portions of my local code. 2022-04-16 14:28:02 +02:00
Sebastian Lenzlinger 3880b3f14f ChatController fields slowly all initialized. 2022-04-16 12:41:14 +02:00
Sebastian Lenzlinger b30f44df6c Added ChatApp class, ChatController class and the fxml representing the view of the chat gui. 2022-04-16 10:49:40 +02:00
Sebastian Lenzlinger 6986a9906f deleted unused classes 2022-04-16 10:41:41 +02:00
Sebastian Lenzlinger 85fca301ff Merge remote-tracking branch 'origin/master' 2022-04-14 16:26:07 +02:00
Sebastian Lenzlinger 13e8002d79 Added GuiChat fxml file 2022-04-14 16:25:59 +02:00
Sebastian Lenzlinger 3290009640 Merge remote-tracking branch 'origin/master' 2022-04-14 14:02:36 +02:00
Sebastian Lenzlinger 17783cb591 Merged Onto Master 2022-04-14 14:02:27 +02:00
Sebastian Lenzlinger 5a36988cd2 Merge branch 'guiSeb' into 'master' 
Client GUI Application Elements, namely the Chat

See merge request cs108-fs22/Gruppe-8!3
 2022-04-14 10:53:46 +00:00
Sebastian Lenzlinger a6d416e457 final tiny touch ups 2022-04-13 01:47:25 +02:00
Sebastian Lenzlinger 76e1ed3ff1 Added a missing return statement 2022-04-13 01:46:28 +02:00
Sebastian Lenzlinger 3e2288026b Further Building the scene 2022-04-13 01:45:32 +02:00
Sebastian Lenzlinger e4f9776f7f Slowly building the SceneGraph from the bottom. 
Created a abstract class that imlements the Toggle interface for toggling between who one wants to chat.
 2022-04-13 01:07:49 +02:00
Sebastian Lenzlinger 68248c7175 (noch sehr kurzer) Dairy Update 2022-04-12 23:50:30 +02:00
Sebastian Lenzlinger ca1256f01f Created Classes and Interfaces. Trying to adhere to the MVC pattern 2022-04-12 23:46:38 +02:00
Sebastian Lenzlinger 7df07b490a Getting fuzzyyy. Added LLIST server response. cannot continue. 2022-04-08 19:47:27 +02:00
Sebastian Lenzlinger e9cade1528 listAllLobbiesToClient still does not work properly: TODO added. 2022-04-08 19:30:50 +02:00
Sebastian Lenzlinger da5189311e Changed functionality of listAllLobbiesToClient(): 
Now it writes to the OutPutStream itself instead of sending a CHATM to client. Hope is that the JClientParser only has to parse once.
 2022-04-08 19:28:01 +02:00
Sebastian Lenzlinger e23a749f55 Changed the way LISTL was implemented since it caused problems for the parser of the client. 2022-04-08 19:12:02 +02:00
Sebastian Lenzlinger a10ea16d35 Added some Documenting. Added some fields to ClientAttributes.java that might be useful in case we need this class. 2022-04-08 18:55:21 +02:00
Sebastian Lenzlinger d8692152b4 If a client connection is closed the ClientHandleris now removed from the set of all clients on the server and from any lobby he was in. 2022-04-08 18:38:59 +02:00
Sebastian Lenzlinger b55494c106 Added ClientAttributes.java for possible future use. 2022-04-08 17:58:12 +02:00
Sebastian Lenzlinger 24dceee1d8 Added method to remove disconnected client from central data. client handler uses it. 2022-04-08 17:50:49 +02:00
Sebastian Lenzlinger 709e5323e8 actually call method when LISTL is recieved. 2022-04-08 17:24:20 +02:00
Sebastian Lenzlinger 6297439c3c finnished listAllLobbiesToClient() 2022-04-08 17:21:13 +02:00
Sebastian Lenzlinger 922561d522 added getIdAndAdminForList() method in Lobby to facilitate sending a list of lobbies to a client 2022-04-08 17:09:17 +02:00
Sebastian Lenzlinger f910775f96 listAllLobbies() method started 2022-04-08 16:59:48 +02:00
Sebastian Lenzlinger 372a02a093 synchronized addPlayer() in Lobby.addPlayer 2022-04-08 16:54:57 +02:00
Sebastian Lenzlinger 37a8caa64d Imlemented creating a lobby in the ClientHandler. Added getLobbyID() method to Lobby.java 2022-04-08 16:50:26 +02:00
Sebastian Lenzlinger 8ea39356f2 synchronized adding to shared resources 2022-04-08 16:42:04 +02:00
Sebastian Lenzlinger b0ebbc9c77 Extending CentralServerData to enable lobby creation and joining 2022-04-08 16:34:25 +02:00
Sebastian Lenzlinger 4557b4801b Client chatListener now throws an IO exception of the chatMSg from the server is null. 2022-04-08 16:15:04 +02:00
Sebastian Lenzlinger 968cb94f21 Now the client disconnects if: 
1. no pingback recieved
2. isConnected has already been set to false
In this case it looks to be a case where the client isn't responding correctly and the server may close the connection. Added a debog log statement at the respective place.
 2022-04-08 16:12:19 +02:00
Sebastian Lenzlinger f57889431d minor change to addPlayer() method 2022-04-08 15:45:35 +02:00
Sebastian Lenzlinger 9e112b493a Test commit zum schauen ob meine Commits wieder richtig zugeordnet werden. 2022-04-08 15:37:08 +02:00
Sebastian Lenzlinger 15db9e4eb9 Some fields and methods where non-static and I changed them to static. 2022-03-26 14:46:05 +01:00
Sebastian Lenzlinger a244903fbb Finnished Dokumenting ClientMsgDecoder.java and removed 
unused imports.
 2022-03-26 14:11:14 +01:00
Sebastian Lenzlinger edfceb0048 Added Some javadoc to ClientMsgDecoder.java to explain 
the use of the class.
 2022-03-26 13:39:51 +01:00
Sebastian Lenzlinger 46ee78d298 Further work on CommandExecuter and adjustments to NightServerProtocol. 2022-03-26 13:32:27 +01:00