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
|
6187b83524
|
Merge remote-tracking branch 'origin/ac35_map_boundary' into ac35_map_boundary
|
8 years ago |
|
hba56
|
c2de45ce01
|
Merge remote-tracking branch 'remotes/origin/boat_collision_fix' into ac35_map_boundary
|
8 years ago |
|
hba56
|
9b30877b5a
|
Merge remote-tracking branch 'remotes/origin/master' into pretty_tomato
|
8 years ago |
|
Connor Taylor-Brown
|
0da840a37e
|
Fixed toggling and application of style
#story[1301]
|
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 |
Joseph
|
e434af0728
|
fixed boat collisions. Increased boat collision radius 15 -> 50
|
8 years ago |
fjc40
|
e8886d70de
|
Merge branch 'zoom_in_clipping_fix' into ac35_map_boundary
|
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 |
|
Connor Taylor-Brown
|
7e1f6284cc
|
Gave screen and minimap backgrounds uniform colours
#story[1301]
|
8 years ago |
|
Connor Taylor-Brown
|
246d6bcc71
|
CSS now works on startup
#story[1301]
|
8 years ago |
|
zwu18
|
20ae978664
|
Merge branch 'story1301-start' into custom_buttons
|
8 years ago |
|
hba56
|
a8cd7755b8
|
color fix for multiple boats
#story[1306]
|
8 years ago |
|
Connor Taylor-Brown
|
f2a0f56cf0
|
Merge remote-tracking branch 'remotes/origin/boat_speed_issue_54' into ac35_map_boundary
|
8 years ago |
|
Connor Taylor-Brown
|
4415a501be
|
Merge remote-tracking branch 'remotes/origin/minimap_crash_first_leg' into ac35_map_boundary
|
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 |
|
hba56
|
1783e73caf
|
color fix for first leg
#story[1306]
|
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 |
|
Connor Taylor-Brown
|
315bb64bb3
|
Boat on start screen now follows infinite loop
- Removed non-resizable property on TitleController
#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
|
e77208aea1
|
MarkRoundingSequence now stores data using the leg number, rather than the leg object itself. This was an issue as leg objects would be recreated when race xml files are received.
Fixes issue #64
|
8 years ago |
|
fjc40
|
abfa3ea863
|
Race now uses a 1 for timescale, which effectively disables time/speed scaling.
|
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 |
|
fjc40
|
5ea4200e67
|
Some javadoc warning fixes.
|
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
|
7ac181f33d
|
Fixed null pointer when race finishes #story[1299]
|
8 years ago |
|
Joseph Gardner
|
13f3f595d2
|
Merge remote-tracking branch 'origin/master' into story1299_next_mark_direction
|
8 years ago |
|
Joseph Gardner
|
08c097f153
|
Merge remote-tracking branch 'origin/issue61_manual_connection_fix' into story1299_next_mark_direction
|
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 |
|
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 |
