 zwu18
|
d75415a260
|
Merge branch 'new_finish_view' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into new_finish_view
|
2017-10-12 23:51:08 +13:00 |
|
|
zwu18
|
9b9c3dfdaa
|
Fixed problem where non-host cannot return to main menu after finish.
|
2017-10-12 23:50:56 +13:00 |
|
 Joseph Gardner
|
a4c0aeb4a5
|
Merge branch 'master' into new_finish_view
|
2017-10-12 11:56:30 +13:00 |
|
|
zwu18
|
0b718f4f57
|
Created new splash screen.
|
2017-10-12 02:22:04 +13:00 |
|
 hwball
|
8f12f42007
|
fix
|
2017-10-09 12:31:14 +13:00 |
|
 Fan-Wu Yang
|
79d90f6ad5
|
Fixed match client
|
2017-10-09 03:01:10 +13:00 |
|
|
Fan-Wu Yang
|
804d27e055
|
You can no longer zoom in on sharks
|
2017-10-09 02:51:41 +13:00 |
|
|
Fan-Wu Yang
|
58470ab1fe
|
Seagulls have their own voices when konami cheat code is done and fannypride replaces the tomato.
|
2017-10-09 02:04:05 +13:00 |
|
|
zwu18
|
5fd5a3bd54
|
Improved finish display.
|
2017-10-09 01:31:22 +13:00 |
|
|
Fan-Wu Yang
|
9c4a949166
|
Fixed merge issues
|
2017-09-28 16:47:13 +13:00 |
|
|
Fan-Wu Yang
|
d4c355fcb5
|
Merge branch 'master' into upgradeStartBoat
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
|
2017-09-28 16:41:17 +13:00 |
|
|
Fan-Wu Yang
|
3c58c3fc09
|
Assest are loaded in loading place
|
2017-09-28 16:38:12 +13:00 |
|
|
Fan-Wu Yang
|
08e6f726cc
|
Added 8 seagulls to the game
|
2017-09-28 16:36:06 +13:00 |
|
|
Joseph Gardner
|
ec4fc9da24
|
Skybox no longer preloaded
|
2017-09-28 16:34:47 +13:00 |
|
|
Fan-Wu Yang
|
767a65f649
|
Boat now used updated textures
|
2017-09-28 16:32:44 +13:00 |
|
|
Joseph Gardner
|
8ed0bf09ca
|
Merge branch 'master' into nightmode
|
2017-09-28 16:14:46 +13:00 |
|
|
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
|
2017-09-28 16:02:22 +13:00 |
|
|
Joseph Gardner
|
165c3e77ab
|
Can swap skyboxes in title screen.
|
2017-09-28 15:59:52 +13:00 |
|
|
Joseph Gardner
|
851b8aa7a8
|
Merge branch 'master' into nightmode
|
2017-09-28 15:43:49 +13:00 |
|
 Jessica Syder
|
1645933a94
|
Start in a nicer zoom.
#story[1301]
|
2017-09-28 15:31:59 +13:00 |
|
|
Fan-Wu Yang
|
68dfa2d27a
|
Fixed case sensitivity problems #story[1301]
|
2017-09-28 15:30:32 +13:00 |
|
|
Joseph Gardner
|
55de754164
|
Stuff
|
2017-09-28 15:05:35 +13:00 |
|
|
Jessica Syder
|
0aad5a1bd6
|
Missing button image and zoom limit changed.
#story[1301]
|
2017-09-28 15:00:05 +13:00 |
|
|
Joseph Gardner
|
685b508f1e
|
Merge branch 'tom' into nightmode
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
|
2017-09-28 14:58:53 +13:00 |
|
|
Joseph Gardner
|
38bcc9fa66
|
Sailer tom 8)
|
2017-09-28 14:53:21 +13:00 |
|
|
Jessica Syder
|
f46f9b9bf5
|
Merge master in
#story[1301]
|
2017-09-28 14:52:30 +13:00 |
|
|
Joseph Gardner
|
c0e00899ef
|
Merge branch 'master' into tom
|
2017-09-28 14:51:54 +13:00 |
|
|
Jessica Syder
|
35b5228cc6
|
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into 1301_map_select
|
2017-09-28 14:43:35 +13:00 |
|
|
Jessica Syder
|
bd0c0ac5ef
|
Stylin'
#story[1301]
|
2017-09-28 14:43:14 +13:00 |
|
|
Fan-Wu Yang
|
3956affa01
|
removed timescale, and merged master
|
2017-09-28 14:26:33 +13:00 |
|
|
Fan-Wu Yang
|
fbb9d0910b
|
Merge branch 'master' into new_3d_assets
|
2017-09-28 14:26:08 +13:00 |
|
|
Fan-Wu Yang
|
6003bdf771
|
Fixed issue where finishing boats order could be be changed
|
2017-09-28 14:23:09 +13:00 |
|
|
Joseph Gardner
|
4f681ced4e
|
Sailer tom 8)
|
2017-09-28 14:18:13 +13:00 |
|
|
Jessica Syder
|
1196e853bf
|
Stylin'
#story[1301]
|
2017-09-28 13:49:42 +13:00 |
|
|
Fan-Wu Yang
|
4ddc369dbc
|
Changed Collisions, and merged master
|
2017-09-28 13:49:27 +13:00 |
|
|
David Wu
|
bab7749138
|
Merged master into branch. #story[1301]
|
2017-09-28 13:48:25 +13:00 |
|
|
hba56
|
817b71339d
|
updated images to show the arrows better aganst the wood
|
2017-09-28 13:43:06 +13:00 |
|
|
Fan-Wu Yang
|
6ec75e6ed7
|
Merge branch 'master' into new_3d_assets
|
2017-09-28 13:42:58 +13:00 |
|
|
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
|
2017-09-28 13:39:26 +13:00 |
|
|
David Wu
|
76db768b76
|
Fix join button disappearing. #story[1301]
|
2017-09-28 13:20:25 +13:00 |
|
 Connor Taylor-Brown
|
0bfe93da06
|
Merge branch 'master' into story1301-start
|
2017-09-28 13:20:20 +13:00 |
|
|
Connor Taylor-Brown
|
e90aeccdef
|
Merge branch 'master' into story1301-start
|
2017-09-28 13:08:25 +13:00 |
|
|
Jessica Syder
|
7230cdf2a3
|
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into 1301_map_select
|
2017-09-28 13:06:12 +13:00 |
|
|
Jessica Syder
|
edb0e1db2f
|
Transparent maps.
- new ac35 map image
- existing maps transparent backgrounds
#story[1301]
|
2017-09-28 13:05:52 +13:00 |
|
|
Fan-Wu Yang
|
3b4ff51bff
|
Created race background for ingame lobby. #user[zwu18] #story[1301]
|
2017-09-28 12:51:08 +13:00 |
|
|
hba56
|
05d9eeae01
|
Merge remote-tracking branch 'remotes/origin/master' into ac35_map_boundary
|
2017-09-28 12:42:26 +13:00 |
|
|
hba56
|
6187b83524
|
Merge remote-tracking branch 'origin/ac35_map_boundary' into ac35_map_boundary
|
2017-09-28 12:42:09 +13:00 |
|
|
hba56
|
c2de45ce01
|
Merge remote-tracking branch 'remotes/origin/boat_collision_fix' into ac35_map_boundary
|
2017-09-28 12:42:03 +13:00 |
|
|
hba56
|
9b30877b5a
|
Merge remote-tracking branch 'remotes/origin/master' into pretty_tomato
|
2017-09-28 12:32:11 +13:00 |
|
|
Joseph Gardner
|
fa4a2b28d2
|
Merge remote-tracking branch 'origin/raceView_UI' into nightmode
|
2017-09-28 12:01:08 +13:00 |
|