David Wu
|
4e352a7d49
|
Merge branch 'master' into story1301-ingamelobby
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java
# racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml
|
8 years ago |
Jessica Syder
|
1645933a94
|
Start in a nicer zoom.
#story[1301]
|
8 years ago |
Fan-Wu Yang
|
68dfa2d27a
|
Fixed case sensitivity problems #story[1301]
|
8 years ago |
|
Jessica Syder
|
0aad5a1bd6
|
Missing button image and zoom limit changed.
#story[1301]
|
8 years ago |
|
Jessica Syder
|
f46f9b9bf5
|
Merge master in
#story[1301]
|
8 years ago |
|
Jessica Syder
|
35b5228cc6
|
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into 1301_map_select
|
8 years ago |
|
Jessica Syder
|
bd0c0ac5ef
|
Stylin'
#story[1301]
|
8 years ago |
|
Fan-Wu Yang
|
3956affa01
|
removed timescale, and merged master
|
8 years ago |
|
Fan-Wu Yang
|
fbb9d0910b
|
Merge branch 'master' into new_3d_assets
|
8 years ago |
|
Fan-Wu Yang
|
6003bdf771
|
Fixed issue where finishing boats order could be be changed
|
8 years ago |
|
Jessica Syder
|
1196e853bf
|
Stylin'
#story[1301]
|
8 years ago |
|
Fan-Wu Yang
|
4ddc369dbc
|
Changed Collisions, and merged master
|
8 years ago |
|
David Wu
|
bab7749138
|
Merged master into branch. #story[1301]
|
8 years ago |
hba56
|
817b71339d
|
updated images to show the arrows better aganst the wood
|
8 years ago |
|
Fan-Wu Yang
|
6ec75e6ed7
|
Merge branch 'master' into new_3d_assets
|
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 |
|
Fan-Wu Yang
|
3b4ff51bff
|
Created race background for ingame lobby. #user[zwu18] #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 |
|
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 |
|
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 |
|
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 |
|
zwu18
|
ca5b344181
|
Visual improvements made to tomato health bar. #story[1301]
|
8 years ago |
|
Fan-Wu Yang
|
b48b83ab8e
|
single mark rounding arrow now works
|
8 years ago |
Joseph
|
e434af0728
|
fixed boat collisions. Increased boat collision radius 15 -> 50
|
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
|
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 |
