Fan-Wu Yang
|
eca921cb11
|
Removed println's ready for DoD
|
8 years ago |
|
Fan-Wu Yang
|
6d55168c61
|
Added Textures to boats as well as added texture to arrow #story[1306]
|
8 years ago |
|
Fan-Wu Yang
|
45ba3ae6ac
|
Added 3D wind arrow and it also rotates #story[1306]
|
8 years ago |
|
Fan-Wu Yang
|
d280c0bdae
|
Merged master and added a few comments
|
8 years ago |
|
Fan-Wu Yang
|
12b7d10f24
|
Merge branch 'master' into story1297_sails
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java
# racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
|
8 years ago |
|
Fan-Wu Yang
|
088e73414b
|
Fixed small bug where the sail never stopps jittering after moving #story[1297]
|
8 years ago |
|
Fan-Wu Yang
|
2b8ca9265f
|
Sails now slowly spin to the correct position #story[1297]
|
8 years ago |
|
Fan-Wu Yang
|
d3a6b82031
|
Commit before checking out developement
|
8 years ago |
Connor Taylor Brown
|
49c08f5687
|
Merge branch 'story1298_boat_highlight' into 'master'
Story1298 - Boat highlighting
ACs:
- Current players boat is highlighted
See merge request !56
|
8 years ago |
Joseph
|
322d7b38b6
|
Merge remote-tracking branch 'origin/master' into story1298_boat_highlight
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java
|
8 years ago |
hba56
|
4242d05279
|
fixed issue with being unable to click through minimap
#story[1295]
|
8 years ago |
|
Joseph
|
2cf0cca157
|
Can no longer click around the boat highlighting. #fix #story[1298]
|
8 years ago |
David Wu
|
eee0b414f8
|
made trackpoints cap at 50. This fixes fps issues with the minimap. #fix #story[1295]
|
8 years ago |
|
Fan-Wu Yang
|
cf9acabd97
|
Boat sails now luff and stay when in the direction of the wind #story[1297]
|
8 years ago |
|
Fan-Wu Yang
|
c9177da85c
|
Deleted another dead line #story[1297]
|
8 years ago |
|
Fan-Wu Yang
|
ed11f7d56c
|
forgot to removed a dead line #story[1297]
|
8 years ago |
|
Fan-Wu Yang
|
2389aa361c
|
Boats sails can luff and are now two piece. #story[1297]
|
8 years ago |
|
hba56
|
add1d3996d
|
Set map colour back to a lighter colour as it didnt work as well on lower grade monitors
#story[1195]
|
8 years ago |
|
hba56
|
dacaf58271
|
Merge remote-tracking branch 'remotes/origin/master' into minimap_test
|
8 years ago |
|
hba56
|
b787b5a71b
|
changed map to dodgerblue
|
8 years ago |
|
hba56
|
afc42cf2ab
|
lowered opacity
|
8 years ago |
|
Fan-Wu Yang
|
1ffef51d7c
|
Changed local ip detection to use regex
|
8 years ago |
|
hba56
|
50125e0151
|
moved minimap to left so does not overlap with speedo
|
8 years ago |
|
Fan-Wu Yang
|
ffa1d8b0c4
|
Deleted Print Statement
|
8 years ago |
|
Fan-Wu Yang
|
52271d580f
|
CHanged ip to local ip because port forwarding may be subjective to change.
|
8 years ago |
|
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.
|
8 years ago |
|
Fan-Wu Yang
|
fec421da00
|
Removed println messages
|
8 years ago |
|
Fan-Wu Yang
|
30087ed9bd
|
Merge branch 'master' into newHostServer
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
|
8 years ago |
|
Fan-Wu Yang
|
3c9e520d9f
|
Merged in null pointer issue.
|
8 years ago |
|
Fan-Wu Yang
|
bb0c1d1780
|
Merge branch 'nullptr_finish_race_arrow' into newHostServer
|
8 years ago |
|
Fan-Wu Yang
|
b0857debeb
|
Merge remote-tracking branch 'origin/nullptr_finish_race_arrow' into newHostServer
|
8 years ago |
|
Fan-Wu Yang
|
b550afcca7
|
Merged race scaling with Http Match Discovery.
|
8 years ago |
|
Fan-Wu Yang
|
ac5423263c
|
Merge remote-tracking branch 'origin/scale_maps_spike' into newHostServer
|
8 years ago |
|
hba56
|
f7d866144a
|
Map now only shows annotations when in full screen
#story[1295]
|
8 years ago |
|
Joseph Gardner
|
a82d3081fc
|
Replace the class use of highlight with shockwave. #story[1298]
|
8 years ago |
|
Joseph Gardner
|
9fbd5df626
|
Highlighting no longer goes over other boats. Player boat is highlighted in lobby. #story[1298]
|
8 years ago |
|
Joseph Gardner
|
cfdbf5896f
|
Added basic highlighting to player boat. #story[1298]
|
8 years ago |
|
Joseph Gardner
|
3ca62e6c2b
|
Added basic highlighting to player boat. #story[1298]
|
8 years ago |
fjc40
|
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 |
|
hba56
|
d3f1e3baa4
|
Merge remote-tracking branch 'remotes/origin/master' into spectate_mode_basic
|
8 years ago |
|
Fan-Wu Yang
|
928f5e31f0
|
Hopefully final version of Hosting #story[1188]
|
8 years ago |
|
Fan-Wu Yang
|
f7da497743
|
Resizing maps to time taking now works #story[1323]
|
8 years ago |
|
fjc40
|
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 |
|
fjc40
|
acd99f58cd
|
Merge remote-tracking branch 'origin/master' into nullptr_finish_race_arrow
|
8 years ago |
|
hba56
|
f3f60acac6
|
resize map
|
8 years ago |
|
hba56
|
731be68831
|
test for a minimap
|
8 years ago |
|
Fan-Wu Yang
|
9d1145b298
|
Changed back to CI IP to test on CI
|
8 years ago |
|
fjc40
|
75c15d492e
|
There was a null pointer exception when finishing the race, as the finish leg doesn't have compound marks.
|
8 years ago |
|
fjc40
|
eacbe8d8ea
|
Merge remote-tracking branch 'origin/master' into boat_movement_smooth
|
8 years ago |
|
Fan-Wu Yang
|
0348b0c642
|
Merged in master
|
8 years ago |
