c43633f197
Merge branch 'master' into raceView_UI
8 years ago
67779eb9ad
Same changes to dev. #story[1311]
8 years ago
64ae01113a
Added delay for position update. This fixes fps issue. #story[1311]
8 years ago
0b02727bf1
Set limits and more appearance changes for speedometer. #story[1311]
8 years ago
e2ea6a5f03
Fixed issue with speedometer and sails interaction. #story[1311]
8 years ago
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
8 years ago
1ffef51d7c
Changed local ip detection to use regex
8 years ago
ffa1d8b0c4
Deleted Print Statement
8 years ago
52271d580f
CHanged ip to local ip because port forwarding may be subjective to change.
8 years ago
3d292f784b
Users can now resee the lobby after exit and reentering, and fixed concurrent alteration issue which was stopping players from exiting the lobby.
8 years ago
fec421da00
Removed println messages
8 years ago
30087ed9bd
Merge branch 'master' into newHostServer
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
8 years ago
3c9e520d9f
Merged in null pointer issue.
8 years ago
bb0c1d1780
Merge branch 'nullptr_finish_race_arrow' into newHostServer
8 years ago
b0857debeb
Merge remote-tracking branch 'origin/nullptr_finish_race_arrow' into newHostServer
8 years ago
b550afcca7
Merged race scaling with Http Match Discovery.
8 years ago
ac5423263c
Merge remote-tracking branch 'origin/scale_maps_spike' into newHostServer
8 years ago
4132b6733b
Fixed small display error with current position. #story[1311]
8 years ago
051811b97d
Merge branch 'master' into story_speedometer
8 years ago
be9feff6fd
Layout changes to speedometer UI. #story[1311]
8 years ago
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
8 years ago
201b9f0051
Linked users boat speed up with speedometer UI. #story[1311]
8 years ago
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]
8 years ago
db27d673de
Another fix for race xml stuff - the xml was fine, but the data sources would sometimes be overridden by empty ones, due to threading stuff.
8 years ago
d3f1e3baa4
Merge remote-tracking branch 'remotes/origin/master' into spectate_mode_basic
8 years ago
928f5e31f0
Hopefully final version of Hosting #story[1188]
8 years ago
f7da497743
Resizing maps to time taking now works #story[1323]
8 years ago
424cd63c59
Should fix the race xml issues where boats get unassigned sometimes.
...
This removes the static raceServer stuff.
The Race/Boat/Regatta XML commands only execute if they contain newer data (it checks the sequence number).
8 years ago
acd99f58cd
Merge remote-tracking branch 'origin/master' into nullptr_finish_race_arrow
8 years ago
9d1145b298
Changed back to CI IP to test on CI
8 years ago
75c15d492e
There was a null pointer exception when finishing the race, as the finish leg doesn't have compound marks.
8 years ago
11a50b6f09
Merge branch 'boat_movement_smooth' into 'master'
...
Boats move about smoothly instead of jumping about
See merge request !51
8 years ago
eacbe8d8ea
Merge remote-tracking branch 'origin/master' into boat_movement_smooth
8 years ago
d660cd9e78
Merge branch 'network_on_VPS' into 'master'
...
Network on vps
Can connect to host network
See merge request !52
8 years ago
0348b0c642
Merged in master
8 years ago
c91c4e5d7c
Merge branch 'master' into network_on_VPS
8 years ago
4970f52c3a
Merge remote-tracking branch 'origin/master' into network_on_VPS
8 years ago
34a803f92e
More changes
8 years ago
22e9db473e
Removed test that took a manditory socket
8 years ago
2c92102b2a
Changed GraphCoordinate to use double instead of int.
...
This results in waaaaay smoother movement. Boats no longer jump around.
8 years ago
97aa917403
Merge branch 'boat_color_and_speed' into 'master'
...
Boat color and speed
- Boats are colored by their assigned color.
- Boat name is displayed in lobby.
- Boats don't move quite so fast.
See merge request !50
8 years ago
191f249bfb
Speed scale is 2, rather than 10.
...
Server simulates frames every 16ms rather than 50ms.
8 years ago
5c58ca11ff
Boats use their assigned color.
...
Boat name is displayed in lobby instead of source ID.
8 years ago
eb2ed45ed2
Merge branch 'master' into spectate_mode_basic
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
8 years ago
a6aeab5ee3
Merge branch 'scoreTable' into 'master'
...
Score table
See merge request !48
8 years ago
e0d886ffb2
overlay off by default
...
#story[1195]
8 years ago
3131d67cf2
Merge remote-tracking branch 'remotes/origin/master' into scoreTable
8 years ago
94b5f06ede
Merge branch 'issue55-collision' into 'master'
...
Resolve issue #55 - only one collision displayed per boat
Resolves issues #55 and #57 .
See merge request !47
8 years ago
ae9594f8c3
Removed a println and fixed some javadoc warnings.
8 years ago
47d013612a
Fix for null pointer exception when finishing race.
8 years ago
hba56
zwu18
Fan-Wu Yang
fjc40