8b7407bf89
Various bug fixes
...
- Closed socket when discovery server crashes, so it can be restarted
- Flattened water on terrain mesh
- Added checks to ensure server is started before connecting
- Added a check to ensure client has started before connecting to the server
- Fixed concurrency issue in server-> client thread list
Tags: #story[1281]
2017-09-28 01:58:49 +13:00
5cc4898ab5
Fixed failing tests & other bug fixes
...
- Fixed server capacity in server list
- Fixed failing unit tests for chat
Tags: #story[1281] #pair[mra106, cir27]
2017-09-27 20:37:29 +13:00
7db387bdec
Merged Host Customisation onto 1273_Skybox
2017-09-27 15:31:54 +13:00
00ff771fc3
Merge remote-tracking branch 'origin/story1275_host_customization' into 1273_Skybox
...
# Conflicts:
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/gameServer/MainServerThread.java
# src/main/java/seng302/gameServer/ServerToClientThread.java
# src/main/java/seng302/visualiser/ClientToServerThread.java
# src/main/java/seng302/visualiser/GameView.java
# src/main/java/seng302/visualiser/GameView3D.java
# src/main/java/seng302/visualiser/controllers/dialogs/ServerCreationController.java
2017-09-27 14:56:09 +13:00
78f64557c3
Merged dev onto 1273_Skybox
2017-09-27 14:46:12 +13:00
982fac38a0
Merge remote-tracking branch 'origin/develop' into 1273_Skybox
...
# Conflicts:
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/gameServer/MainServerThread.java
# src/main/java/seng302/gameServer/MessageFactory.java
# src/main/java/seng302/gameServer/ServerToClientThread.java
# src/main/java/seng302/model/ClientYacht.java
# src/main/java/seng302/model/mark/MarkOrder.java
# src/main/java/seng302/visualiser/GameClient.java
# src/main/java/seng302/visualiser/GameView3D.java
# src/main/java/seng302/visualiser/controllers/ServerListController.java
# src/main/java/seng302/visualiser/controllers/dialogs/ServerCreationController.java
# src/main/resources/icons/bumperIcon.png
# src/main/resources/icons/handlingIcon.png
# src/main/resources/icons/velocity.png
# src/main/resources/icons/windWalkerIcon.png
# src/main/resources/views/RaceView.fxml
# src/main/resources/views/dialogs/ServerCreationDialog.fxml
2017-09-27 14:23:38 +13:00
daf3867433
Server discovery bug fixes & error handling improvements
...
- Fixed concurrency bug that prevented players from connecting to servers
- Discovery server can restart itself if it crashes
- Added nicer error handling for server discovery.
- Using AWS to get servers external IP address.
Tags: #story[1281]
2017-09-27 12:32:17 +13:00
c0bd498f1b
Added debugs for missing xml
2017-09-27 02:50:36 +13:00
e9881bb24a
Added per map max player count. Handles case when map cannot fit players behind start mark. Added initial implementation for spacing out yachts.
...
#implement #story[1275]
2017-09-27 02:04:24 +13:00
df7264cc1f
Added per map max player count. Handles case when map cannot fit players behind start mark. Added initial implementation for spacing out yachts.
...
#implement.
2017-09-26 23:34:19 +13:00
9b00ba654a
Added a race importer. Added imported races to visualizer. Made it so that the host sets the race. Refactored server to no longer be dependant on a specific race. Tested functionality of map manually. Some bugs found and listed below.
...
#implement #testmanual #story[1275]
Known bugs:
* Can't move
* Map is off center in lobby view.
* 3D Map is off center
2017-09-23 22:45:53 +12:00
e61b6d50a1
Small refactor. Fixed tokens to spawn on the minute mark.
...
Moved updates of wind and token timers into gamestate from mainserver thread. Now triggered upon GameState change to start
#story[1293]
2017-09-23 11:33:01 +12:00
40a7f9bc5b
New server creation view created. Added templates for custom races. Updated xml generator to remove all hard coded values. Updated XMLParser to parse custom race files. No unit tests exists currently.
...
#implement #story[1275]
2017-09-21 12:59:37 +12:00
7e0c2abbfd
- Fixed a shutdown bug that left the game process running long after the window shut
...
- Changed SVG Icon for volume toggle to something a bit nicer
tags : #story[1245]
2017-09-14 12:31:49 +12:00
7ee6a09626
Fixed that wind speed did not updated frequently and UI polishing.
...
- added shadow for raceview boxes
- split up message history and input text block
- changed timer font
#story[1245]
2017-09-13 21:11:40 +12:00
1e74321aab
- Lobby Disconnection works.
...
tags : #story[1245]
2017-09-12 18:26:25 +12:00
6b4f7eb42b
Merge develop into NewUI, and 3D
...
tags: #story[1245]
2017-09-11 18:56:26 +12:00
0bf83aa858
Merge remote-tracking branch 'origin/develop' into NewUI_merge
...
# Conflicts:
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/gameServer/MainServerThread.java
# src/main/java/seng302/gameServer/ServerToClientThread.java
# src/main/java/seng302/visualiser/GameClient.java
# src/main/java/seng302/visualiser/GameView.java
# src/main/java/seng302/visualiser/controllers/FinishScreenViewController.java
# src/main/java/seng302/visualiser/controllers/LobbyController.java
# src/main/java/seng302/visualiser/controllers/RaceViewController.java
# src/main/java/seng302/visualiser/controllers/StartScreenController.java
# src/main/resources/views/LobbyView.fxml
# src/main/resources/views/RaceView.fxml
# src/main/resources/views/StartScreenView.fxml
2017-09-11 18:15:08 +12:00
fdfb5959fa
Minor change so that boats still are checked for collision after passing the finish line
...
#story[1250]
2017-09-11 16:53:12 +12:00
1fec620427
Merged 3d branch into new UI
...
Tags: #story[1245]
2017-09-11 15:50:22 +12:00
76a1a3c7a0
Merge remote-tracking branch 'origin/story1266_3d_model_factory' into NewUI_merge
...
# Conflicts:
# pom.xml
# src/main/java/seng302/App.java
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/gameServer/MainServerThread.java
# src/main/java/seng302/gameServer/ServerToClientThread.java
# src/main/java/seng302/utilities/XMLGenerator.java
# src/main/java/seng302/visualiser/GameClient.java
# src/main/java/seng302/visualiser/controllers/RaceViewController.java
# src/main/resources/views/RaceView.fxml
# src/main/resources/views/StartScreenView.fxml
2017-09-11 15:29:33 +12:00
bd7ea920b6
Fixed Client connection delegate bug
...
#story[1250]
2017-09-09 14:46:42 +12:00
4a170f8179
Merged new develop on
...
#story[1250]
2017-09-09 14:13:50 +12:00
1f9e6154ae
Merge branch 'develop' into 1250_SendingGameObjects
...
# Conflicts:
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/gameServer/MainServerThread.java
# src/main/java/seng302/visualiser/GameView.java
# src/main/java/seng302/visualiser/controllers/RaceViewController.java
2017-09-09 14:02:12 +12:00
8ba28ffda0
Minor refactor moving Spawning and token creation to game state
...
#story[1250]
2017-09-09 13:11:44 +12:00
cf4f8813d2
re-implemented existing functionality in UI
...
- Correct player count is shown in server list
- Servers now advertise their capacity and number of players connected
- Players can click join on the servers in the server list
- Direct connect works
- Can set max players / server name in host dialog
- Server starts correctly when host clicked
- Implemented boat customization
- Implemented 'begin race button', and disabled it for players that aren't hosts
- Added countdown timer in lobby
- Fixed bug where app wouldn't close
Tags: #story[1245]
2017-09-08 18:00:09 +12:00
1a755cec33
Fixed bug that caused mark arrows to be rendered on Marker id not LegNumber
...
#bugs
2017-09-07 16:25:55 +12:00
47f3f6e27d
Created a new chat history class that allows for rich formatting of individual messages. Current implementation allows for bold and coloured text only. Has been manually tested. Fixed 3/5 chat command tests.
...
#implement #test #story[1246]
2017-09-04 23:10:54 +12:00
5026c568a7
Wrote tests that are currently broken for sending server commands through text chat.
...
#tests
2017-09-03 20:38:31 +12:00
88d1e91b6f
Added processing of input from host via chat to manually trigger race finishing or to speed up boats.
...
#implement
2017-09-03 19:18:30 +12:00
b346d5a706
Implemented server re-registration when a server closes / updates
...
- When a server is closed, it will disappear from the server list
- When a player joins a server, the number of spaces left will decrease
- Servers now disappear instead of duplicating
- Added tests for ServerDescription
- Added documentation for new classes
Tags: #story[1247]
2017-09-01 16:05:47 +12:00
0c5d661995
Fixed discovery bug, implemented server list, added server parameters
...
- Resolved DNS bug by updating to a newer version of JmDNS
- Added server list, this is populated with new servers as they are discovered
- Added map name and spaces remaining to server advertisement
Tags: #story[1247]
2017-08-31 01:11:17 +12:00
4bd7291a4a
WIP: Yachts now power up upon collecting an item
...
Power up is speed boost x2 multiplier
Lasts 10 seconds
Do not stack
#story[1250]
2017-08-29 22:11:37 +12:00
0d0b2e59d5
WIP: Tokens works well with collection. Dissapear upon picking up across all clients.
...
Still bug with mark ordering and arrows :/
#story[1250]
2017-08-29 21:40:25 +12:00
ace48a8404
Refactored MainServer Class in prep for better sending out of XML messages
...
All messages are now created through MessageFactory class
Minor tweaks to improve code base server side
Removed observer from Server to Client threads
#story[1250]
2017-08-29 21:23:46 +12:00
201405d070
WIP: Marks randomly appear in course now. Mark arrows broken.
...
Something about sending raceXML during the course of the race breaks the mark rounding arrows functionallity, crashing the game.
#story[1250]
2017-08-29 19:13:48 +12:00
c15f13bc2c
Refactored some of the XMLGenerator code. Added tokens to the generated XML
...
Refactor not complete. Generation needs some tidying.
#story[1250]
2017-08-29 14:56:06 +12:00
5fb8a0c2c1
Merge branch 'issue47_disconnect_crash_rebranch' into 'develop'
...
Issue47 disconnect crash rebranch
Fix for all disconnection issues. Fix is not robust. Need consistent interface between disconnection of ServerToClientThreads and MainServerThread.
See merge request !66
2017-08-17 14:55:45 +12:00
3c91db59f3
Changed wind change variation
2017-08-17 14:49:39 +12:00
d0565503e8
Merge branch 'develop' into issue47_disconnect_crash_rebranch
...
# Conflicts:
# src/main/java/seng302/gameServer/ServerToClientThread.java
# src/main/java/seng302/visualiser/ClientToServerThread.java
# src/main/java/seng302/visualiser/GameClient.java
2017-08-17 14:15:27 +12:00
0276911b88
Fixed disconnection issues. Fix is only temporary until a consistent interface for disconnections exists.
...
#bug #implement
2017-08-17 14:02:18 +12:00
39cfaf6780
Merge remote-tracking branch 'origin/develop' into Story80_BoatCustomization
...
# Conflicts:
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/gameServer/ServerPacketParser.java
# src/main/java/seng302/gameServer/ServerToClientThread.java
# src/main/java/seng302/gameServer/messages/ChatterMessage.java
# src/main/java/seng302/gameServer/messages/MarkRoundingMessage.java
# src/main/java/seng302/model/ServerYacht.java
# src/main/java/seng302/visualiser/ClientToServerThread.java
# src/main/java/seng302/visualiser/GameClient.java
# src/main/java/seng302/visualiser/GameView.java
2017-08-17 13:31:27 +12:00
faf4600f51
Fixed some weird bug with the messages package, trying to add some small QoL changes with potential interaction bugs with the customization/lobby menu.
...
tags : #story[1142]
2017-08-17 13:13:07 +12:00
7bda2bc580
Fixed:
...
- Fixed regularPacketsTest unit test, which checks how regularly packets are sent from C2S thread.
- Removed misused GameClient in main server thread.
tags: #story[1124]
2017-08-17 11:46:14 +12:00
7b4a70817b
Merged onto develop.
...
#mergre #refactor
2017-08-17 01:03:14 +12:00
87acce71ea
Merge branch 'develop' into story1118_map_arrows
...
# Conflicts:
# src/main/java/seng302/gameServer/MainServerThread.java
# src/main/java/seng302/model/RaceState.java
# src/main/java/seng302/visualiser/GameClient.java
# src/main/java/seng302/visualiser/controllers/RaceViewController.java
2017-08-17 00:52:41 +12:00
9727e86249
Merge remote-tracking branch 'origin/story1118_map_arrows' into 1124_Fixing_Order_And_Finish_Screen
...
# Conflicts:
# src/main/java/seng302/gameServer/MainServerThread.java
# src/main/java/seng302/visualiser/GameClient.java
# src/main/java/seng302/visualiser/controllers/RaceViewController.java
# src/main/resources/server_config/xml_templates/race.ftlh
2017-08-16 22:40:32 +12:00
85899e3fbe
Merged with develop functionality.
2017-08-16 21:11:34 +12:00
87d6799c10
Re-added wind speed & direction variations
...
- Wind speed & direction are randomly updated
- Removed two duplicate threads ;)
Tags: #story[1124]
2017-08-16 20:48:37 +12:00
67f0c213c2
Everything works. Needs a bit of polish, and possibly look at boat shapes next.
...
tags: #story[1142]
2017-08-16 20:38:11 +12:00
Michael Rausch
Calum
William Muir
Alistair McIntyre
Haoming Yin
hyi25
Haoming Yin