Fan-Wu Yang
|
58470ab1fe
|
Seagulls have their own voices when konami cheat code is done and fannypride replaces the tomato.
|
8 years ago |
|
Fan-Wu Yang
|
d4c355fcb5
|
Merge branch 'master' into upgradeStartBoat
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
|
8 years ago |
|
Fan-Wu Yang
|
08e6f726cc
|
Added 8 seagulls to the game
|
8 years ago |
Joseph Gardner
|
ec4fc9da24
|
Skybox no longer preloaded
|
8 years ago |
|
Joseph Gardner
|
55de754164
|
Stuff
|
8 years ago |
|
Joseph Gardner
|
685b508f1e
|
Merge branch 'tom' into nightmode
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
|
8 years ago |
|
Joseph Gardner
|
c0e00899ef
|
Merge branch 'master' into tom
|
8 years ago |
|
Fan-Wu Yang
|
6003bdf771
|
Fixed issue where finishing boats order could be be changed
|
8 years ago |
|
Joseph Gardner
|
4f681ced4e
|
Sailer tom 8)
|
8 years ago |
|
Fan-Wu Yang
|
6ec75e6ed7
|
Merge branch 'master' into new_3d_assets
|
8 years ago |
Connor Taylor-Brown
|
0bfe93da06
|
Merge branch 'master' into story1301-start
|
8 years ago |
|
Connor Taylor-Brown
|
e90aeccdef
|
Merge branch 'master' into story1301-start
|
8 years ago |
hba56
|
05d9eeae01
|
Merge remote-tracking branch 'remotes/origin/master' into ac35_map_boundary
|
8 years ago |
|
Joseph Gardner
|
fa4a2b28d2
|
Merge remote-tracking branch 'origin/raceView_UI' into nightmode
|
8 years ago |
|
Joseph Gardner
|
a2d605fd5b
|
Added nightmode skybox. Changed how next mark arrow works.
|
8 years ago |
|
Fan-Wu Yang
|
c08cbb01d6
|
removed println messages
|
8 years ago |
|
Connor Taylor-Brown
|
0da840a37e
|
Fixed toggling and application of style
#story[1301]
|
8 years ago |
|
hba56
|
fb8f1640ac
|
Merge remote-tracking branch 'remotes/origin/master' into raceView_UI
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
# racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
|
8 years ago |
|
hba56
|
58cde8ce44
|
Merge remote-tracking branch 'remotes/origin/master' into raceView_UI
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
# racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
|
8 years ago |
|
Fan-Wu Yang
|
3c15cf9d02
|
Fixed up sharks size and spinning speed
|
8 years ago |
|
Fan-Wu Yang
|
3d605db924
|
Seagulls are spawnable and have semi-random motion, no sounds yets
|
8 years ago |
|
Fan-Wu Yang
|
98240532f0
|
Sharks are now seeable
|
8 years ago |
|
Fan-Wu Yang
|
c582a66f9a
|
Added new Highlight
|
8 years ago |
|
Fan-Wu Yang
|
63fbffdbc1
|
lots of trying seagull stuff but translate y doesn't want to work for some stupid reason.
|
8 years ago |
|
Fan-Wu Yang
|
b48b83ab8e
|
single mark rounding arrow now works
|
8 years ago |
|
Fan-Wu Yang
|
1b6197e0ac
|
removed some files for seng teams sanity sake and moved the seasurface down a bit.
|
8 years ago |
|
Fan-Wu Yang
|
8a6997f29b
|
Merge branch 'master' into new_3d_assets
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
|
8 years ago |
|
Fan-Wu Yang
|
c1422d9a98
|
Changed Sea Surface to new Sea Surface and optimised some assets to load at the beginning
|
8 years ago |
fjc40
|
5d9b574378
|
Zooming in while in birds eye no longer clips through sea surface.
Zooming with mouse wheel is the same speed as zooming with keyboard.
|
8 years ago |
|
hba56
|
7b5460abc5
|
info full screen map shows on top of hud
#story[1306]
|
8 years ago |
|
hba56
|
2ac3bad6e1
|
info table shows on top of hud
#story[1306]
|
8 years ago |
David Wu
|
1a672e8ac8
|
Merge branch 'master' into story1292_hp_punish
|
8 years ago |
|
hba56
|
2f6fa73349
|
Merge remote-tracking branch 'remotes/origin/master' into raceView_UI
|
8 years ago |
|
Joseph Gardner
|
6e913d6c45
|
Merge remote-tracking branch 'origin/third-person-default' into story1299_next_mark_direction
|
8 years ago |
|
Connor Taylor-Brown
|
73bffb35e3
|
Removed stutter
|
8 years ago |
|
hba56
|
173b4444da
|
Placed the wind arrow in the HUD
#story[1306]
|
8 years ago |
|
hba56
|
fc267a6a49
|
Merge remote-tracking branch 'remotes/origin/master' into raceView_UI
# Conflicts:
# racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
|
8 years ago |
|
Connor Taylor-Brown
|
d6b0fec6d3
|
Start race in third person by default
- Third person zoom limit has been lowered
- Next mark highlighting and arrow only follows player boat
|
8 years ago |
|
David Wu
|
48e7b6970c
|
Merged master in. Added documentation. #story[1292]
|
8 years ago |
|
David Wu
|
3adc5330b4
|
Merge branch 'master' into story1292_hp_punish
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
# racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
# racevisionGame/src/main/resources/visualiser/scenes/raceView.fxml
|
8 years ago |
|
Fan-Wu Yang
|
8120b1bbab
|
Upgraded marks and how to look rounded #story[1299]
|
8 years ago |
|
zwu18
|
416eb1e6bf
|
On death a menu will pop up telling the user he is dead. #story[1292]
|
8 years ago |
|
Joseph
|
699df2e775
|
Using new arrow / arrow textures. Made sails not clickable.
|
8 years ago |
|
zwu18
|
1b8fa59f0e
|
Having 0 hp now removes the boat from being an active boat. #story[1292]
|
8 years ago |
|
Joseph
|
d86d043992
|
Merge branch 'master' into story1299_next_mark_direction
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
# racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
|
8 years ago |
|
zwu18
|
ba82328c42
|
Removed souts for speedometer. #story[1311]
|
8 years ago |
|
zwu18
|
f4001e0ae3
|
Added visual display when boat dies. Added sound when boat dies. #story[1311]
|
8 years ago |
|
zwu18
|
11d6d3a880
|
Documentation added. Master merged. #story[1311]
|
8 years ago |
|
zwu18
|
1d95004811
|
Merge branch 'master' into story_speedometer
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
# racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
|
8 years ago |
|
zwu18
|
e53d7d894b
|
Warning sound added. Sound synced with visual display. #story[1292]
|
8 years ago |
