63d24c001f
Added position update in yacht #story[1047]
2017-07-19 19:41:07 +12:00
dbbb41e12f
Multiple clients are now shown in lobby of host.
...
When multiple clients connect to the host, the lobby table now fills up with the names of the threads (will need to be changed later). Re-enabled multiple people connecting and the lobby table. Formatting changes in the lobby screen also made.
#story[1047]
2017-07-19 16:05:21 +12:00
45053ba507
Added XML Generation
...
- Implemented a wrapper for Apache Freemake
- Implemented the regatta XML generator
Tags: #story[984]
2017-07-19 14:47:16 +12:00
d9f5f7a137
Refactoring view for game development
...
#story[987]
2017-07-18 14:00:24 +12:00
b301ce5d27
fixed build (i think?)
...
tags: #story[1055] pair[wmu16, zyt10]
2017-07-18 12:26:47 +12:00
f02bd3b3f8
Merge remote-tracking branch 'origin/Story62_Reading_Keystrokes' into Story62_Reading_Keystrokes
2017-07-18 12:23:09 +12:00
e83eaa38e1
Upon hosting, and then creating a new instance and connecting to that IP, button transmissions work and print out on server!! :D
...
Took the send method out of the Message class as it didnt make sense to have it there. This meant taking it out of all subclasses too
tags: #story[1055] pair[wmu16, zyt10]
2017-07-18 12:22:58 +12:00
102b5f3ca1
Added a program icon that I snipped from the logo using photoshop.
2017-07-18 10:46:41 +12:00
63958a6717
WIP: Implemented a temporary workaround to send an instance test to client server upon connection.
...
Still needs reengineering to change socket channels for sending to ouput stream in the message class.
Only client to server "working".
#story[1047] #pair[hyi25, wmu16] #pair[cir27, zyt10]
2017-07-17 17:00:04 +12:00
4b8ac32ca9
Merge branch '1047_Hosting_Game' into Story62_Reading_Keystrokes
2017-07-17 10:55:17 +12:00
00b29a1890
Merge remote-tracking branch 'origin/develop' into Story62_Reading_Keystrokes
2017-07-17 10:55:08 +12:00
c7e5f93bc4
Merged GeoUtility and GeometryUtils classes
...
#story[1047]
2017-07-16 21:58:40 +12:00
e4d87c91a2
Merge branch 'develop' into 1047_Hosting_Game
2017-07-16 21:54:08 +12:00
f84091e54e
Removed (fxml) table view and its table column from lobby controller because the table view is removed from LobbyView.fxml
...
#story[988]
2017-07-14 18:27:54 +12:00
e03e8825b2
Merge remote-tracking branch 'origin/1047_Hosting_Game' into Story62_Reading_Keystrokes
2017-07-14 18:23:28 +12:00
355f8543f5
Implemented a more reliable way for keystroke input and added boat action packet type so stream parser is able to read and decode the message appropriately.
...
#story[988] #pair[hyi25, zyt10]
2017-07-14 18:23:07 +12:00
77e7db79cc
WIP: Worked on new server thread class that would create and store multiple THREADS of connections. Researched Authorative server structures.
...
Fixed the current structure of the server to work with the old StreamReciever style and hook up to the Stream Parser
tags: #story[1047] pair[wmu16, mra106]
2017-07-14 17:09:33 +12:00
2809d0d832
Merge branch '1047_Hosting_Game' into Story62_Reading_Keystrokes
...
# Conflicts:
# src/main/resources/views/RaceView.fxml
2017-07-14 16:28:42 +12:00
5b908ec355
Merge remote-tracking branch 'origin/1047_Hosting_Game' into 1047_Hosting_Game
...
# Conflicts:
# src/main/java/seng302/gameServer/GameServerThread.java
2017-07-13 22:55:49 +12:00
c480fca72a
WIP: Worked on new server thread class that would create and store multiple THREADS of connections. Researched Authorative server structures
...
tags: #story[1047]
2017-07-13 22:55:03 +12:00
c19f66a6a4
Added garbage collection for disconnected players
...
- Heartbeat messages are sent out from their own thread to each player
- If a heartbeat message can't be sent to a player, they are removed from the list of players
- Added equals method for players
Tags: #story[1047]
2017-07-13 22:07:03 +12:00
1e6fd1af09
Fixed bug where players were being added to the GameState twice
...
#story[1047]
2017-07-13 19:27:47 +12:00
55db2c9961
Fixed buffer overflow in message header
...
- Fixed buffer overflow by adding a reset method that clears the buffer and sets the position to zero before re-writing the header
Tags: #story[1047]
2017-07-13 19:15:45 +12:00
6ec8b0c3c5
Terminated the game server socket when click exit lobby button
...
- the whole server thread should be terminated instead. To be fixed in the future.
#story[1047] #issue[28]
2017-07-13 17:51:25 +12:00
78557a4536
Key presses are transmitted to a host (but there is no host currently connected)
...
#pair[kre39,zyt10] #story[988]
2017-07-13 15:39:48 +12:00
8090cd7985
WIP: Adapted the old server thread class to the GameServerThread class to allow multiple clients to connect
...
tags: #story[1047] #pair[wmu16]
2017-07-13 14:40:11 +12:00
5ce34bed92
Key presses now assigned to enum and empty packet class is constructed.
...
#pair[kre39,zyt10] #story[988]
2017-07-13 14:35:41 +12:00
035841f221
WIP: Adapted the old server thread class to the GameServerThread class to allow multiple clients to connect
...
tags: #story[1047] #pair[wmu16, mra106]
2017-07-11 17:03:32 +12:00
ef61a687d6
Researched and implemented a way for the game to listen for key presses. When one of the valid key controls are pressed, feedback is given in the console. Has yet to be connected to a method which will create and send a message to the server.
...
#pair[kre39,zyt10] #story[988]
2017-07-11 16:32:15 +12:00
fcb1e5e593
Removed unnecessary Position and GeoPoint classes to clear the code base.
...
- put utility classes in a package
#story[1047]
2017-07-10 23:51:01 +12:00
752863a0d3
WIP: Created some basic controllers for the UI and started implementing backend for server stuff
...
Created GameState Class. Static, contains all info about current state of game: list of players and their respective details (coords etc) also Host info
Clients will observe this GameState class
Upon pressing host, new GameState is created and new GameConnectionListener created which listens for connections
Player class created which will be used to take each connection and store it as a player with other info about them regarding the game in the GameState class
tags: #story[1047] #pair[wmu16, zyt10]
2017-07-10 16:03:13 +12:00
1a3e330eb4
Created some basic UI for new start screen (host and connect) and a lobby
...
tags: #story[1047] #pair[wmu16, zyt10]
2017-07-10 13:43:25 +12:00
5f9da6b40a
Fixed the bug where the polar file could not be read after being packaged
...
tags: #story[955] #pair[wmu16, zyt10]
2017-07-10 12:36:32 +12:00
aee62c29fe
Merge remote-tracking branch 'origin/develop' into develop
2017-05-26 09:07:22 +12:00
fe76ef9cdc
Merge remote-tracking branch 'origin/develop'
2017-05-25 16:58:01 +12:00
acbaa838ec
Change default port to 4940
...
#story[956] #pair[wmu16, mra106]
2017-05-25 16:56:41 +12:00
24cc10e1cd
Merge remote-tracking branch 'origin/develop' into issue#8_create_finish_screen
...
# Conflicts:
# src/main/java/seng302/controllers/CanvasController.java
2017-05-25 16:51:32 +12:00
20b79b40f2
Fix the button position #story[923]
2017-05-25 16:45:35 +12:00
72e2776b7e
Fix the finish screen size #story[923]
2017-05-25 16:41:59 +12:00
49e4c92da6
Merge branch 'develop'
2017-05-25 16:40:24 +12:00
c1aa1d8eae
merged with dev
2017-05-25 16:32:25 +12:00
4231c3ccd8
Merge remote-tracking branch 'origin/develop' into remove_observers
2017-05-25 16:30:15 +12:00
65223ceaaf
shifted annotation layers. Merged with dev.
2017-05-25 16:29:27 +12:00
ca22615c08
Add scroll bar to the side panel to cater for smaller screen.
2017-05-25 16:18:47 +12:00
559a9f38c0
Merge remote-tracking branch 'origin/develop' into issue#8_create_finish_screen
...
# Conflicts:
# src/main/java/seng302/controllers/CanvasController.java
# src/main/java/seng302/models/stream/StreamParser.java
2017-05-25 16:12:44 +12:00
835f79b113
Swapped to the local stream as default
2017-05-25 15:56:02 +12:00
3bd8added4
Merge remote-tracking branch 'origin/develop' into develop
2017-05-25 14:56:11 +12:00
cec7014856
Set axis ons parkline style
2017-05-25 14:54:34 +12:00
ba527a1979
Merge remote-tracking branch 'origin/develop' into develop
2017-05-25 14:54:28 +12:00
b73e4c89db
Merge remote-tracking branch 'origin/develop' into remove_observers
...
# Conflicts:
# src/main/java/seng302/controllers/CanvasController.java
# src/main/java/seng302/controllers/RaceViewController.java
# src/main/java/seng302/fxObjects/BoatGroup.java
# src/main/java/seng302/fxObjects/MarkGroup.java
# src/main/java/seng302/models/Yacht.java
2017-05-25 14:52:54 +12:00
Peter Galloway
Kusal Ekanayake
Michael Rausch
Calum
William Muir
Haoming Yin
Zhi You Tan