michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 06:18:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,368 Commits 17 Branches 21 Tags
f7fd5494efc8f499b4adc312339c03b4f3c257a2
Commit Graph

306 Commits

Author SHA1 Message Date
Zhi You Tan 6fafb02a8f Merge branch 'develop' into wind_arrow 
# Conflicts:
#	src/main/java/seng302/visualiser/controllers/RaceViewController.java
#	src/main/resources/views/RaceView.fxml
 2017-09-28 16:36:34 +13:00
Michael Rausch 74c1219e0d Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	src/main/java/seng302/gameServer/MainServerThread.java
#	src/main/java/seng302/visualiser/GameClient.java
#	src/main/java/seng302/visualiser/controllers/dialogs/ServerCreationController.java
 2017-09-28 16:02:04 +13:00
Michael Rausch a05a41d5ec Added port number randomization 
- Servers all run on different ports, so multiple servers can run on one host
- Port is displayed in lobby

Tags: #story[1281]
 2017-09-28 15:57:59 +13:00
Haoming Yin 06bc3644bc Removed dead code in MeesageFactory and redundant classes 
tags: #story[1273]
 2017-09-28 15:54:09 +13:00
Haoming Yin 7620f0023e Removed dead code in MainServerThread 
tags: #story[1273]
 2017-09-28 15:43:35 +13:00
William Muir 74241ee819 Merge remote-tracking branch 'origin/develop' into develop 2017-09-28 15:23:50 +13:00
Michael Rausch 8810554ce9 Fixed bug where server wasn't being unregistered from discovery server 
- Added missing unregister() method call

Tags: #story[1281]
 2017-09-28 15:16:37 +13:00
William Muir c98297ea79 Merged dev changes back on to mini map 
#story[1273]
 2017-09-28 14:44:16 +13:00
Zhi You Tan 51078c82a0 Merge remote-tracking branch 'origin/develop' into wind_arrow 
# Conflicts:
#	src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelType.java
 2017-09-28 14:38:31 +13:00
Zhi You Tan 22fbb529ef Wind arrow follows wind data 
#story[1276]
 2017-09-28 14:37:46 +13:00
Michael Rausch 3345734efd Fixed memory leak by forcing garbage collection 2017-09-28 14:22:33 +13:00
Michael Rausch 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
Calum a266779709 Added new Wind Waker mesh 
#implement #story[1293]
 2017-09-28 00:24:34 +13:00
Calum 42d490d6fd Added new Wind Waker mesh 
#implement #story[1293]
 2017-09-27 23:35:51 +13:00
William Muir ff4c2cd5b6 Merge branch '1273_Skybox' into 'develop' 
1273 skybox

Server Discovery:
 - Created server discovery server.
 - Implemented protocols to support matchmaking & room code connection
 - Improved error handling for server disconnections

Skybox:
 - Added a skybox
 - Added a terrain mesh

See merge request !79
 2017-09-27 21:52:34 +13:00
Michael Rausch 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
Haoming Yin 22e1e57c24 Issue #73: If you change controls to 'Continuously turning' before moving into game, it is not applied 
- always send turning mode packet when race starts to sync the steering mode

#story[1278]
 2017-09-27 20:18:06 +13:00
Haoming Yin c5d2016733 Merge branch 'issue_#67_early_start' into 'develop' 
added a check in the start logic to make sure a boat can't cross the start line early



See merge request !74
 2017-09-27 19:42:05 +13:00
Michael Rausch 2b3a972ed5 Various bug fixes 
- Fixed bug where an invalid port number would crash the program
- Closed the stage before cleaning up resources. This speeds up closing the app.
- Added error handling for when the client looses connection to the server.

Tags: #story[1281]
 2017-09-27 17:14:55 +13:00
Michael Rausch 7db387bdec Merged Host Customisation onto 1273_Skybox 2017-09-27 15:31:54 +13:00
Michael Rausch 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
Michael Rausch 78f64557c3 Merged dev onto 1273_Skybox 2017-09-27 14:46:12 +13:00
Michael Rausch 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
William Muir 6f62efcc93 Updated the icons to be more uniform and transparent 
#story[1293]
 2017-09-27 12:44:22 +13:00
Michael Rausch 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
William Muir e5af7bf666 Minor fixes. Only one person can have wind walker now. Tokens spawn at 30s rather than 15 
#story[1293]
 2017-09-27 12:06:16 +13:00
William Muir 85ca91db96 Minor fixes. Only one person can have wind walker now. Tokens spawn at 30s rather than 15 
#story[1293]
 2017-09-27 11:55:40 +13:00
Calum c0bd498f1b Added debugs for missing xml 2017-09-27 02:50:36 +13:00
Calum 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
William Muir 6d51ea3574 Created a random place token generator. 
Generates a location between any leg of the race in a random angle / distance of the radius of the centre point of the two gates to one of the gates

#story[1293]
 2017-09-27 01:44:01 +13:00
Calum 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
William Muir 330ccd272d The random token now has a 50% chance of causing your boat to have a speed penalty 
#story[1293]
 2017-09-26 21:13:35 +13:00
William Muir 4b7dfe38c4 Fixed Boats powering up and down correctly. Icons respond correctly 
#story[1293]
 2017-09-26 19:43:32 +13:00
William Muir ab07c7f298 Merge remote-tracking branch 'origin/develop' into 1293_PowerUps 
# Conflicts:
#	src/main/java/seng302/visualiser/GameView3D.java
 2017-09-26 19:01:53 +13:00
William Muir b5076bc976 Fixed wind walker and bumper 
Added a hack to bumper so that the collision distance is larger than the regular collision distance
Wind walker now makes you go at you max speed rather than VMG speed

#story[1293]
 2017-09-26 18:57:15 +13:00
William Muir 8ba44d7476 Minor commit for testing 
#story[1293]
 2017-09-26 17:19:45 +13:00
Peter Galloway 870d7a6e82 added a check in the start logic to make sure a boat can't cross the start line prematurely (they will have to go back and go through it again) #fix #refactor 2017-09-26 15:25:24 +13:00
William Muir 7a4cdbe0c9 Fixed WindWalker 
#story[1293]
 2017-09-26 11:12:29 +13:00
Calum 06e5f4ae00 Merge remote-tracking branch 'origin/1273_Skybox' into 1273_Skybox 2017-09-26 01:35:07 +13:00
Calum d9c832168b Merge branch 'story1275_host_customization' into 1273_Skybox 
# Conflicts:
#	src/main/java/seng302/visualiser/GameView3D.java
#	src/main/java/seng302/visualiser/controllers/LobbyController.java
#	src/main/java/seng302/visualiser/controllers/ViewManager.java
#	src/main/resources/views/LobbyView.fxml
#	src/main/resources/views/RaceView.fxml
 2017-09-26 01:19:47 +13:00
Michael Rausch 9cfb3b9e5d Added functionality to automatically select a server 
- Added functionality on the DiscoveryServer to return a random server to the player
- Added elements to the UI to support auto-selecting a server
- Added client side code to request a random server

Tags: #story[1281]
 2017-09-26 01:14:02 +13:00
Calum 51747e2d13 Refactored the 2D and 3D game view class setups. Made scaling more logical. 
#refactor #story[1275]
 2017-09-26 00:55:28 +13:00
Calum b3981b19e0 Merge branch 'develop' into story1275_host_customization 
# Conflicts:
#	src/main/java/seng302/gameServer/GameState.java
#	src/main/java/seng302/gameServer/ServerToClientThread.java
#	src/main/java/seng302/model/ServerYacht.java
#	src/main/java/seng302/visualiser/ClientToServerThread.java
#	src/main/java/seng302/visualiser/controllers/LobbyController.java
#	src/test/java/seng302/models/YachtTest.java
 2017-09-25 23:25:33 +13:00
Calum 7027de80c4 Fixed issues with correct protocol implementation. 
#issue[64] #fix #testmanual
 2017-09-25 22:09:26 +13:00
Michael Rausch 9ca39d1a7c Merge branch '1273_Changing_Cameras' into 1273_Skybox 2017-09-25 18:40:15 +13:00
William Muir 0211f2df38 Merged dev back on 
#story[1293]
 2017-09-25 17:38:09 +13:00
William Muir dba5a5680f Merge remote-tracking branch 'origin/develop' into 1293_PowerUps 
# Conflicts:
#	src/main/java/seng302/model/ServerYacht.java
#	src/main/resources/views/RaceView.fxml
 2017-09-25 17:20:25 +13:00
William Muir 29b97a194d Merged dev back on 
#story[1293]
 2017-09-25 11:26:44 +13:00
William Muir 8a0ad8d6a9 Merge remote-tracking branch 'origin/develop' into 1293_PowerUps 
# Conflicts:
#	src/main/java/seng302/gameServer/GameState.java
#	src/main/java/seng302/model/ServerYacht.java
 2017-09-25 11:19:10 +13:00
Haoming Yin 44275aec04 Merge branch 'develop' into Story1278_keybindings 
# Conflicts:
#	src/main/java/seng302/model/ServerYacht.java
 2017-09-25 11:06:28 +13:00