Jessica Syder
|
bd0c0ac5ef
|
Stylin'
#story[1301]
|
8 years ago |
|
Jessica Syder
|
1196e853bf
|
Stylin'
#story[1301]
|
8 years ago |
David Wu
|
bab7749138
|
Merged master into branch. #story[1301]
|
8 years ago |
|
David Wu
|
52da88b1a1
|
Merge branch 'master' into custom_buttons
# Conflicts:
# racevisionGame/src/main/java/shared/model/Constants.java
# racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
# racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml
# racevisionGame/src/main/resources/visualiser/scenes/hostGame.fxml
# racevisionGame/src/main/resources/visualiser/scenes/title.fxml
|
8 years ago |
|
David Wu
|
76db768b76
|
Fix join button disappearing. #story[1301]
|
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 |
|
Jessica Syder
|
7230cdf2a3
|
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into 1301_map_select
|
8 years ago |
|
Jessica Syder
|
edb0e1db2f
|
Transparent maps.
- new ac35 map image
- existing maps transparent backgrounds
#story[1301]
|
8 years ago |
hba56
|
05d9eeae01
|
Merge remote-tracking branch 'remotes/origin/master' into ac35_map_boundary
|
8 years ago |
|
hba56
|
9b30877b5a
|
Merge remote-tracking branch 'remotes/origin/master' into pretty_tomato
|
8 years ago |
|
Jessica Syder
|
31bb289723
|
Added button images in
- added button images
- cssd it a little
#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 |
|
Connor Taylor-Brown
|
88d5a60696
|
Merge branch 'master' into story1301-start
# Conflicts:
# racevisionGame/src/main/java/visualiser/layout/View3D.java
|
8 years ago |
|
zwu18
|
ca5b344181
|
Visual improvements made to tomato health bar. #story[1301]
|
8 years ago |
|
Connor Taylor-Brown
|
7e1f6284cc
|
Gave screen and minimap backgrounds uniform colours
#story[1301]
|
8 years ago |
|
Jessica Syder
|
9bb0fa6833
|
Arrows, Buttons and Title styling added to map selection.
- a title added
- some images made transparent
- basic css styling
- some colours added
#story[1301]
|
8 years ago |
|
Jessica Syder
|
0659bc64c8
|
Arrows, Buttons and Title styling added to map selection.
- a title added
- some images made transparent
- basic css styling
- some colours added
#story[1301]
|
8 years ago |
|
zwu18
|
95465285f4
|
Created custom buttons. #story[1301]
|
8 years ago |
fjc40
|
c7f59b73d5
|
Expanded the boundary for ac35MapLayout.xml slightly.
Fixes issue #63
|
8 years ago |
|
fjc40
|
3e04ed12ad
|
Removed raceSinglePlayer.xml and raceThreePlayers.xml as they are identical to raceSixPlayers.xml.
Renamed raceSixPlayers.xml to ac35MapLayout.xml to be more consistent with other map names.
Issue #63
|
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 |
|
hba56
|
4e8f1a2b19
|
Placed the waypoint arrow in the 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
|
13f3f595d2
|
Merge remote-tracking branch 'origin/master' into story1299_next_mark_direction
|
8 years ago |
|
Joseph Gardner
|
ea1170a48e
|
Merge remote-tracking branch 'origin/master' into raceLength
|
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 |
|
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 |
|
zwu18
|
416eb1e6bf
|
On death a menu will pop up telling the user he is dead. #story[1292]
|
8 years ago |
|
Joseph
|
569204b771
|
New skin for 2d next mark arrow. #story[1299]
|
8 years ago |
|
Joseph
|
699df2e775
|
Using new arrow / arrow textures. Made sails not clickable.
|
8 years ago |
|
Joseph
|
affbb69029
|
Merge remote-tracking branch 'origin/story1299_next_mark_direction' into story1299_next_mark_direction
|
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
|
f4001e0ae3
|
Added visual display when boat dies. Added sound when boat dies. #story[1311]
|
8 years ago |
Fan-Wu Yang
|
d599df3901
|
Merge branch 'master' into raceLength
# Conflicts:
# racevisionGame/src/main/java/mock/app/Event.java
|
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 |
|
Fan-Wu Yang
|
967bdb394f
|
Merged in master and realigned center of the boat #story[1306]
|
8 years ago |
|
Fan-Wu Yang
|
cd99492467
|
Merge branch 'master' into story1306_wind_arrow
# Conflicts:
# racevisionGame/src/main/java/visualiser/layout/Assets3D.java
|
8 years ago |
|
Fan-Wu Yang
|
a14307a6bf
|
Merge branch 'master' into story1297_sails
|
8 years ago |
|
fjc40
|
76dff8009c
|
Removed countdown timer from lobby screen.
|
8 years ago |
|
Joseph Gardner
|
f9f5cfef7d
|
Chanegd next mark arrow to fit with new UI. #story[1299]
|
8 years ago |
|
fjc40
|
20702f352b
|
Lobby start button is hidden/disabled by default, to avoid it being visible to non-host clients for a split seconds while loading screen.
|
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 |
|
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]
|
8 years ago |
