fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,519 Commits 1 Branch 0 Tags
6187b8352498a167618963615b42d762bedc4f0d
Commit Graph
1519 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
zwu18 e2ea6a5f03 Fixed issue with speedometer and sails interaction. #story[1311] 2017-09-22 02:40:54 +12:00
Connor Taylor-Brown 1b4b980081 Exponentially decrease speed as boat loses health 
- Boat halves in speed after 90% health loss

#story[1291]
 2017-09-22 00:49:36 +12:00
Connor Taylor-Brown 16da9e009b Cherry-picked FXML changes from Development 
#story[1291]
 2017-09-22 00:21:56 +12:00
Connor Taylor-Brown 985f784066 Removed broken stuff from FXML after merge 2017-09-21 23:41:18 +12:00
Connor Taylor-Brown dc9445a8a6 Merge branch 'master' into story1291-hp 
# Conflicts:
#	racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
 2017-09-21 23:40:46 +12:00
Joseph 4cf9b67db8 Merge remote-tracking branch 'origin/master' into story1299_next_mark_direction 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
 2017-09-21 22:44:30 +12:00
Joseph 322d7b38b6 Merge remote-tracking branch 'origin/master' into story1298_boat_highlight 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java
 2017-09-21 22:33:31 +12:00
Joseph Gardner b1657e8bfc Merge branch 'minimap_test' into 'master' 
Minimap

AC's:
-Minimap of current map with player boats is shown
-Boats and marks are shown on the minimap
-Minimap can be minimized and maximised
-Some annotations displayed on maximised minimap

See merge request !55
 2017-09-21 22:27:57 +12:00
Joseph 91c442e465 Set up architecture for next mark arrow and did a 2d template when the camera is zoomed out. #story[1299] 2017-09-21 22:25:39 +12:00
hba56 4242d05279 fixed issue with being unable to click through minimap 
#story[1295]
 2017-09-21 20:34:21 +12:00
Joseph 2cf0cca157 Can no longer click around the boat highlighting. #fix #story[1298] 2017-09-21 16:51:00 +12:00
Connor Taylor-Brown 5473fde731 Merge remote-tracking branch 'remotes/origin/master' into story1291-hp 2017-09-21 12:49:27 +12:00
David Wu eee0b414f8 made trackpoints cap at 50. This fixes fps issues with the minimap. #fix #story[1295] 2017-09-21 12:42:09 +12:00
Connor Taylor-Brown 6c78e5d0b5 Tomato now depletes as expected 
#story[1291]
 2017-09-21 12:10:33 +12:00
Fan-Wu Yang cf9acabd97 Boat sails now luff and stay when in the direction of the wind #story[1297] 2017-09-21 02:35:01 +12:00
Fan-Wu Yang c9177da85c Deleted another dead line #story[1297] 2017-09-21 02:22:34 +12:00
Fan-Wu Yang ed11f7d56c forgot to removed a dead line #story[1297] 2017-09-21 02:22:04 +12:00
Fan-Wu Yang 2389aa361c Boats sails can luff and are now two piece. #story[1297] 2017-09-21 02:21:02 +12:00
Connor Taylor-Brown 10008f5452 Depleting tomato now watches player health 
- [BUG] Tomato fills up instead of depleting

#story[1291]
 2017-09-21 01:42:53 +12:00
hba56 add1d3996d Set map colour back to a lighter colour as it didnt work as well on lower grade monitors 
#story[1195]
 2017-09-21 00:04:07 +12:00
hba56 dacaf58271 Merge remote-tracking branch 'remotes/origin/master' into minimap_test 2017-09-20 23:46:02 +12:00
David Wu 951c3771fa Merge branch 'newHostServer' into 'master' 
Nullptr finish race arrow + race xml issues + Host Discovery + Scaling Race

Acceptance Criteria:

When a game starts I should see it reflected in the host lobby within 5 seconds.  
When a game ends it should not remain in the host lobby for more than 5 seconds.  
Changing the windspeed and the milliseconds value on Event.java line 124 should make the race larger or smaller.  
  
This should fix the race xml issues where the player didn't have a boat / last player joining not seeing their boat. Somehow the client was receiving xml files out of order, and it didn't check the order, so it would use race xml file 1, then replace it with race xml file 0, which was out of date.

See merge request !54
 2017-09-20 22:55:42 +12:00
hba56 b787b5a71b changed map to dodgerblue 2017-09-20 22:25:18 +12:00
hba56 afc42cf2ab lowered opacity 2017-09-20 22:22:07 +12:00
Fan-Wu Yang 1ffef51d7c Changed local ip detection to use regex 2017-09-20 22:07:46 +12:00
hba56 50125e0151 moved minimap to left so does not overlap with speedo 2017-09-20 22:03:22 +12:00
Fan-Wu Yang ffa1d8b0c4 Deleted Print Statement 2017-09-20 21:39:33 +12:00
Fan-Wu Yang 52271d580f CHanged ip to local ip because port forwarding may be subjective to change. 2017-09-20 21:38:49 +12:00
Fan-Wu Yang 3d292f784b Users can now resee the lobby after exit and reentering, and fixed concurrent alteration issue which was stopping players from exiting the lobby. 2017-09-20 18:46:33 +12:00
Connor Taylor-Brown b0bc7f50f2 Updated FXMLs to add depleting tomato 
- Tab view now contains health column
- BoatStateCommand now fails silently if command is received before race state is set up

#story[1291]
 2017-09-20 18:22:14 +12:00
Fan-Wu Yang fec421da00 Removed println messages 2017-09-20 15:16:32 +12:00
Fan-Wu Yang 30087ed9bd Merge branch 'master' into newHostServer 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
 2017-09-20 15:14:19 +12:00
Fan-Wu Yang 3c9e520d9f Merged in null pointer issue. 2017-09-20 15:07:22 +12:00
Fan-Wu Yang bb0c1d1780 Merge branch 'nullptr_finish_race_arrow' into newHostServer 2017-09-20 15:06:20 +12:00
Fan-Wu Yang b0857debeb Merge remote-tracking branch 'origin/nullptr_finish_race_arrow' into newHostServer 2017-09-20 15:05:26 +12:00
Fan-Wu Yang b550afcca7 Merged race scaling with Http Match Discovery. 2017-09-20 15:05:08 +12:00
Connor Taylor-Brown 23040ecff4 Created separate listeners for all boats' and player boat health 
#story[1291]
 2017-09-20 14:34:22 +12:00
Fan-Wu Yang ac5423263c Merge remote-tracking branch 'origin/scale_maps_spike' into newHostServer 2017-09-20 14:29:44 +12:00
Connor Taylor-Brown 0d89574c1f RaceViewController listens to health changes on the local player's boat 
#story[1291]
 2017-09-20 14:29:31 +12:00
Connor Taylor-Brown 7eb59cdcfc Allowed fractional health deductions per frame 
- Fixed boundary penalty system

#story[1291]
 2017-09-20 14:18:39 +12:00
Connor Taylor-Brown 50d5dd02a2 BoatState message can be received from mock by visualiser 
- Basic penalties have been made for out of bounds and collisions
- RaceServer packages and sends BoatState messages for each boat
- ServerConnection routes BoatState messages instead of dropping by default
- VisualiserRaceCommandFactory produces BoatStateCommands

#story[1291]
 2017-09-20 14:07:50 +12:00
Connor Taylor-Brown a295728e89 Created encoder and decoder for BoatState messages (HP packets) 
- Added new MessageType.BOATSTATE enum to support new message type
- Modified EncoderFactory and DecoderFactory to support new enum
- Verify that original and decoded messages match

#story[1291]
 2017-09-20 00:52:06 +12:00
hba56 f7d866144a Map now only shows annotations when in full screen 
#story[1295]
 2017-09-19 22:08:27 +12:00
zwu18 4132b6733b Fixed small display error with current position. #story[1311] 2017-09-19 21:55:38 +12:00
zwu18 051811b97d Merge branch 'master' into story_speedometer 2017-09-19 21:45:00 +12:00
zwu18 be9feff6fd Layout changes to speedometer UI. #story[1311] 2017-09-19 21:39:40 +12:00
Hamish Ball ccbe3f86ea Merge branch 'spectate_mode_basic' into 'master' 
Spectate mode basic

Client can now select spectate when connecting to a race.
- The "Join game" button has been split into "Participate" and "Spectate".
- Selecting spectate should join the game, but not assign a boat.
- Spectator cannot control any boats, or have an effect on game.
- Can spectate a game even if it is full.


See merge request !49
 2017-09-19 21:23:14 +12:00
zwu18 201b9f0051 Linked users boat speed up with speedometer UI. #story[1311] 2017-09-19 21:10:48 +12:00
zwu18 eea394372f Race is now showing a speedometer in the bottom right corner. Next step is to update with speed of boat and improve appearance. #story[1311] 2017-09-19 18:23:45 +12:00
Joseph Gardner a82d3081fc Replace the class use of highlight with shockwave. #story[1298] 2017-09-19 15:43:22 +12:00