fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,408 Commits 1 Branch 0 Tags
3a966fa6b8693338ebc2bbdc327e144a2e6865ac
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
David Wu 3a966fa6b8 Reworked visual displays for low hp boats. There is now a warning indication under boats that drop below 20hp. TODO: Create sfx and different display when boat is in critical hp/dead. #story[1292] 2017-09-25 02:15:09 +13:00
David Wu 45b2f0b6db Created more fire instances. #story[1292] 2017-09-24 22:50:12 +13:00
David Wu 1070842ada Fire is now rotated and standing up-write. Found problem with fire not being directly on the boat. #story[1292] 2017-09-24 22:05:37 +13:00
David Wu 4f838a3598 Fire follows boat. TODO: rotate fire. #story[1292] 2017-09-24 21:37:15 +13:00
David Wu c527ad0c52 Forgot to add image file. #story[1292] 2017-09-24 18:58:49 +13:00
David Wu 45eb557256 Displaying visual effect with imageview. #story[1292] 2017-09-24 18:58:19 +13:00
zwu18 1946bfd658 Added audio indication when the user boat is low on hp. Audio rate changes when hp is critically low. #story[1292] 2017-09-22 21:19:35 +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
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
David Wu e345ecdec1 Removed sout statements. 2017-09-14 16:52:45 +12:00
David Wu 43ee92fb95 Created enums and bound them to zoom in, zoom out and sails toggle for key bindings so that something expected shows up for key binding descriptions when changing key bindings. #story[1197] 2017-09-14 16:23:56 +12:00
David Wu 4cb0948aaf Merge branch 'wind_arrow_direction_5' into 'master' 
Wind arrow direction 5

This should fix the wind arrow direction.

The polars were actually backwards so wind was being simulated with: into wind = faster, away from wind = slower.

#### A.C:
- Downwind means the boat's bearing is aligned with the wind arrow.
- Upwind means the boat's bearing is facing directly into the wind arrow.
- Pressing the upwind key should turn the boat in the upwind direction.
- Pressing the downwind key should turn the boat in the downwind direction.
- Facing upwind should result in a boat speed of roughly 0kn.
- Facing downwind should result in non-zero boat speed (roughly 14kn with 12kn wind).


Fixes #51 

See merge request !45
 2017-09-14 14:45:51 +12:00
David Wu 913452de43 Merge branch 'master' into wind_arrow_direction_5 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java
 2017-09-14 14:30:45 +12:00
David Wu 39cfed961c Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 2017-09-14 14:29:01 +12:00
David Wu 550180f286 Removed countdown pane. 2017-09-14 14:28:42 +12:00
David Wu e3266c3b47 Pane removed. 2017-09-14 12:27:07 +12:00
David Wu 22b4b66049 Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java
#	racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml
 2017-09-13 15:28:13 +12:00
David Wu cccce9002b Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java
#	racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml
 2017-09-13 15:28:01 +12:00
David Wu 8cc4d7741c Fixed issue where games can't be hosted if you quit as host in the lobby menu. Added more doc.#story[1188] 2017-09-13 15:17:09 +12:00
David Wu 06bd637460 Added documentation. #story[1188] 2017-09-13 14:42:54 +12:00
David Wu 490aab3f8d Changes made to pre-race countdown. #story[1188] 2017-09-13 14:30:55 +12:00
David Wu f926355d1c Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77 2017-09-13 14:00:36 +12:00
David Wu 89ce8a7cc0 Pre-race countdown implementation. 2017-09-13 14:00:29 +12:00
David Wu c750b806e0 Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77 2017-09-13 13:00:34 +12:00
David Wu 202c8d80c8 Minor fxml adjustments. 2017-09-13 12:57:35 +12:00
David Wu 42a5d8ddc4 Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77 2017-09-13 12:49:11 +12:00
David Wu bdb68a89c0 Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77 2017-09-13 12:21:12 +12:00
David Wu 7cea1fb11c Reworking fxml for lobby. 2017-09-13 12:20:42 +12:00
David Wu 83c1aeba50 Merge branch 'controllerSplit' into 'master' 
Controller split

Only one scene is loaded at a time, instead of all at once.
Run through the race, tutorial, all options you can think of to try break it!

See merge request !41
 2017-09-12 17:00:03 +12:00
zwu18 b6c340614f Tutorial text disabled on actual races. #story[1261] 2017-09-12 16:54:36 +12:00
zwu18 1a9f24a3ba Forgot to hide race.fxml :P #story[1189] 2017-09-11 21:18:09 +12:00
zwu18 fc9a4898d6 Made changes based on DoD review. Class documentation and commenting added. Removed annotation features. Removed sout commands. #story[1189] 2017-09-11 21:07:52 +12:00
David Wu b976186c7d Merged current master in. Made changes to classes so tutorial again due to merge. #story[1189] 2017-09-11 15:31:18 +12:00
David Wu c97706d86e Merge branch 'master' into story70 
# Conflicts:
#	dedicatedServer/src/main/java/app/App.java
#	racevisionGame/src/main/java/mock/app/Event.java
#	racevisionGame/src/main/java/visualiser/Controllers/HostController.java
#	racevisionGame/src/main/resources/mock/mockXML/raceThreePlayers.xml
 2017-09-11 14:27:12 +12:00
David Wu c6594a0e20 Tutorial text now displays on screen when in tutorial. #story[1189] 2017-09-10 19:31:56 +12:00
David Wu 9a96131a33 Fixed issue where wind arrow, accordion, time, etc. were not being displayed. Fixed issue where zooming would crash when done outside of tutorial. #story[1189] 2017-09-10 18:11:52 +12:00
David Wu bad6422ca9 Implemented tutorial for zooming as it was left out from the last commit. Refactored updating tutorial state. #story[1189] 2017-09-10 17:38:48 +12:00
David Wu d2d5ae62eb Tutorial states implemented and working. Game currently prints to terminal the "tutorial text". Next step is to create display on application for these text. Game ends when tutorial ends. Fixed game not loading xml issue. #story[1189] 2017-09-10 17:11:20 +12:00
David Wu 28ec4b9246 Merge branch 'master' into story70 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/HostController.java
#	racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
#	racevisionGame/src/main/java/visualiser/app/App.java
 2017-09-10 15:19:03 +12:00
zwu18 64ed1f9aa6 Improved map layout image. #story[1193] 2017-09-08 02:58:57 +12:00
David Wu 55cfda33d0 Merge branch 'Story_76' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into Story_76 2017-09-07 21:15:50 +12:00
David Wu 002cccd5a0 Reworked iMapLayout as race would either take too long or too short. Added temporary image for iMapLayout. Will be reworked when I have time. #story[1193] 2017-09-07 21:15:41 +12:00
David Wu b22c5c5cd6 Created xml for new course layout. Marks and such are all added. Need to set up boundary when I have time. #story[1193] 2017-09-05 20:09:56 +12:00
David Wu 8b5a5506e7 Boat collisions now play a sound when user collides and a quieter sound when others collide. #story[1195] 2017-09-05 14:00:15 +12:00
David Wu 8c1eded926 Boat collision packets are now sent. Command class created for boat collision. Currently prints out message depending on if user crashed or someone else crashed. #story[1195] 2017-09-04 14:06:38 +12:00
zwu18 cd685ae467 Added sound effect files for button clicks and mark rounding and linked them up to application. Collision audio is added too but not linked up. #story[1195] 2017-09-03 21:22:26 +12:00
David Wu abf325e5ea Passing a mark will now play a sound. Currently using placeholder sound so will ned to change. #story[1195] 2017-09-01 19:30:27 +12:00
David Wu c3be9665ac Added button press sounds for hosting a game, entering lobby list and entering host menu. #story[1195] 2017-09-01 14:10:01 +12:00
David Wu 086206a623 Controls button in title screen now opens the key mapping menu. #story[1197] 2017-09-01 13:44:09 +12:00
David Wu 65b960f725 Background of title now changes colour depending on day mode and night mode. Sun image also changes. This is so that the tutorial label is more visible during night mode. #story[1189] 2017-09-01 13:28:05 +12:00
David Wu ea029baf22 Tutorial option in title screen will now created a game with tutorial xmls. Host game will now created a game with the race xml instead of tutorial xml as well. Made changes to tutorial label in title. #story[1189] 2017-09-01 12:28:09 +12:00
zwu18 c7af4f2eb7 Made changes to tutorial xmls. Linked button in title menu to start up a race on mouse click. Will need to make it so it starts the tutorial on click. #story[1189] 2017-08-31 19:54:22 +12:00
David Wu 86f1a608e4 Created xml for tutorial that contains start and finish line. TODO: Add gate/mark. #story[1189] 2017-08-30 14:51:56 +12:00
David Wu 23d58dc809 Created UI option in the start menu to play a practice game. #story[1189] 2017-08-30 13:26:18 +12:00
David Wu 028428da2c Fixed fxml issues due to merge. Added pane centering for panes. #story[1188] 2017-08-30 12:04:17 +12:00
David Wu d2f0c1105a Merged 3d branch. Added 3d item to one of the player pane. #story[1188] 2017-08-30 11:52:45 +12:00
David Wu b724a814b1 Merge branch 'story86-3D' into story77_lobby 
# Conflicts:
#	racevisionGame/src/main/resources/visualiser/scenes/hostlobby.fxml
 2017-08-30 11:46:00 +12:00
David Wu d65ce1a897 Merge branch 'story77' into story77_lobby 2017-08-30 11:40:19 +12:00
David Wu 88782182d7 Player panes and spectator list now call method on click. Will later be used for players to choose whether they want to play or spectate. #story[1188] 2017-08-30 11:39:41 +12:00
David Wu 7df181c759 Minor changes to new lobby fxml. #story[1188] 2017-08-29 19:08:22 +12:00
David Wu 892320db5f Added javadoc and extra files to push 2017-08-29 19:03:34 +12:00
David Wu 0621e1bdb1 Finished up lobby menu. Set split pane to not change size on resize. Disabled divider on split pane. Added quit button and start button (start only prints to terminal for now). Panes are now wrapped in an anchor pane to fix resizing issues. TODO: Will be working on making a nicer background animation. 2017-08-29 19:02:02 +12:00
David Wu c63403d1de Created new lobby menu. Working on animated background for menu. 2017-08-29 15:11:09 +12:00
David Wu 37095bfc6c Merged master into branch. 2017-08-17 17:02:24 +12:00
David Wu 5234cdea66 Merge branch 'master' into new_issue#19 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
 2017-08-17 17:00:39 +12:00
David Wu 598275591f Updated javadoc. 2017-08-17 16:50:51 +12:00
David Wu 79add59375 Unresizable control screen. 2017-08-17 16:37:31 +12:00
David Wu f1ef75fb81 Merge branch 'master' into new_issue#19 2017-08-17 16:34:19 +12:00
David Wu 03dd937713 Change fxml stuff. Added back to menu buttons. 2017-08-17 16:33:52 +12:00
David Wu 9f813ab7aa Merged in development. 2017-08-17 16:14:09 +12:00
David Wu 288979be3b Merge branch 'Development' into new_issue#19 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/RaceController.java
#	racevisionGame/src/main/java/visualiser/app/App.java
 2017-08-17 16:05:59 +12:00
David Wu 09eaf6d968 Merged master. 2017-08-17 13:55:49 +12:00
David Wu 5a188f0582 Merge branch 'master' into new_issue#19 2017-08-17 13:52:04 +12:00
David Wu c08bafa566 Fixed most of issue #19 with new master? 2017-08-17 13:49:43 +12:00
David Wu fa5992bfb2 added App app to app. 2017-08-17 12:58:05 +12:00
David Wu 6bc81f566e Issue 19 changes. 2017-08-17 12:50:41 +12:00
zwu18 109b291973 Merged issue #20 fix and splash screen into development. 2017-08-17 01:36:55 +12:00
zwu18 317582aae8 Merge branch 'issue#20fix' into Development 2017-08-17 01:35:33 +12:00
zwu18 4e8b7d3b5a Merge remote-tracking branch 'origin/master' into issue#20fix 2017-08-17 01:30:43 +12:00
zwu18 8759ac070e Merge remote-tracking branch 'origin/splashScreen' into issue#20fix 2017-08-17 01:30:38 +12:00
zwu18 5e0bcd2af5 Added control menu to title screen. Pressing control button will open a pop-up window showing game controls. 2017-08-15 21:26:23 +12:00
zwu18 a31eb078a6 Created a splash screen for application. 2017-08-12 16:27:12 +12:00
zwu18 848edfc6a4 Removed commented out code. Merged master in. 
#story[1097]
 2017-08-12 03:20:21 +12:00
zwu18 c3ea62dfee Merge branch 'master' into CommandFactory 
# Conflicts:
#	racevisionGame/src/main/java/mock/app/ConnectionAcceptor.java
#	racevisionGame/src/main/java/mock/app/Event.java
#	racevisionGame/src/main/java/mock/model/commandFactory/TackGybeCommand.java
#	racevisionGame/src/main/java/mock/model/commandFactory/VMGCommand.java
#	racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java
 2017-08-12 03:18:24 +12:00
zwu18 9c902dab46 Added javadoc to classes. 
#story[1097]
 2017-08-12 02:11:23 +12:00
zwu18 e4b72fdfeb Update appearance on client arrow. 
#story[1095]
 2017-08-11 20:38:54 +12:00
zwu18 03713d3699 Added checkPosition into MockRace which was removed. Boat now updates legs again. 
#Story[1097]
 2017-08-09 16:37:29 +12:00
David Wu 568458aca4 Merge branch 'story48' into 'master' 
Story48 & issue 26

This is the merge request for story 48 (http://agilefant.cosc.canterbury.ac.nz:8080/agilefant302/editProject.action?projectId=61#fi.hut.soberit.agilefant.model.Story_1093) ( #29 ) and issue #26.

A.C:
- Wind speed and direction must follow that provided by the Race Status message or messages.
- Arrow aligned with the current wind direction shown on the live race view.
- Arrow orientation adjusts within 1s when changes in the wind direction are received.
- Arrow length is proportional to wind speed.
- Wind speed in m/s (or as defined in story 17) should be easily estimated from the wind arrow.

The wind speed (TWS) should be shown as both a number and in the length of the wind arrow. The arrow length should be always long enough for TWA (wind direction) to be clear; the length should never drop below some minimum value.  

This includes issue #26 as story 48 was slightly dependent on that.

Both #29 and issue #26 should be closed once this has been merged.

See merge request !20
 2017-08-08 20:50:41 +12:00
zwu18 53c9192130 Merge branch 'CommandFactory' into Development 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java
 2017-08-08 02:52:29 +12:00
zwu18 ddaa2623ca Added tests for TackGybeCommand class. 
#Story[1097]
 2017-08-07 02:56:24 +12:00
zwu18 a388989827 Reworked TackGybeCommand. Current boat in race will now tack and gybe when control is pressed. 
#Story[1097]
 2017-08-06 16:38:44 +12:00
zwu18 18f14c7542 VMGCommand now toggles autoVMG on and off. Linked up observer and observable so the current boat can now be controlled. Fixed autoVMG not working. 
#Story[1097]
 2017-08-06 16:12:53 +12:00
zwu18 dab0f2b402 Merge branch 'story63' into CommandFactory 
# Conflicts:
#	racevisionGame/src/main/java/mock/model/commandFactory/TackGybeCommand.java
 2017-08-06 14:54:21 +12:00
zwu18 074e2e590b VMGCommand now toggles autoVMG on and off. Linked up observer and observable so the current boat can now be controlled. 
#Story[1097]
 2017-08-06 14:48:46 +12:00
zwu18 3d417c3a40 Merge branch 'story63' into CommandFactory 
# Conflicts:
#	racevisionGame/src/main/java/mock/model/MockRace.java
#	racevisionGame/src/main/java/mock/model/RaceLogic.java
#	racevisionGame/src/main/java/mock/model/RaceState.java
#	racevisionGame/src/main/java/mock/model/commandFactory/CommandFactory.java
#	racevisionGame/src/main/java/mock/model/commandFactory/VMGCommand.java
#	racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java
 2017-08-06 13:48:41 +12:00
zwu18 14ce5fcaff Made changes to TackGybeCommand and VMGCommand classes to fit pattern layout. 
#Story[1097]
 2017-08-04 03:56:55 +12:00
zwu18 6e699f7037 Merge branch 'RaceFactory' into CommandFactory 2017-08-04 03:00:31 +12:00
zwu18 d9679c1497 Build failing due to junit even though junit passes all tests. Commented out VMGCommand and TackGybeCommand content. 2017-08-03 01:31:05 +12:00
zwu18 b581b01a44 Merge branch 'RaceFactory' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into RaceFactory 
# Conflicts:
#	racevisionGame/src/main/java/mock/model/MockRace.java
 2017-08-03 00:28:44 +12:00
zwu18 ad61dc6bce Implemented runCommand method in VMGCommand and TackGybeCommand classes. Both classes currently rely on the MockRace class so changes will be required when MockRace is refactored. 
#story[1097]
 2017-08-03 00:22:46 +12:00