fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,557 Commits 1 Branch 0 Tags
bd0c0ac5ef02caa3df7874d5952d7e7eec19e8f6
Commit Graph
243 Commits
Author SHA1 Message Date
Jessica Syder bd0c0ac5ef Stylin' 
#story[1301]
 2017-09-28 14:43:14 +13:00
Jessica Syder 1196e853bf Stylin' 
#story[1301]
 2017-09-28 13:49:42 +13:00
David Wu bab7749138 Merged master into branch. #story[1301] 2017-09-28 13:48:25 +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
hba56 05d9eeae01 Merge remote-tracking branch 'remotes/origin/master' into ac35_map_boundary 2017-09-28 12:42:26 +13:00
hba56 9b30877b5a Merge remote-tracking branch 'remotes/origin/master' into pretty_tomato 2017-09-28 12:32:11 +13:00
Jessica Syder 31bb289723 Added button images in 
- added button images
- cssd it a little

#story[1301]
 2017-09-28 11:38:10 +13:00
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
 2017-09-28 11:32:39 +13:00
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
 2017-09-28 11:32:25 +13:00
Connor Taylor-Brown 88d5a60696 Merge branch 'master' into story1301-start 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/layout/View3D.java
 2017-09-28 11:30:47 +13:00
zwu18 ca5b344181 Visual improvements made to tomato health bar. #story[1301] 2017-09-28 03:54:07 +13:00
Connor Taylor-Brown 7e1f6284cc Gave screen and minimap backgrounds uniform colours 
#story[1301]
 2017-09-27 23:50:49 +13:00
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]
 2017-09-27 22:42:01 +13:00
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]
 2017-09-27 22:38:24 +13:00
zwu18 95465285f4 Created custom buttons. #story[1301] 2017-09-27 22:01:37 +13:00
fjc40 c7f59b73d5 Expanded the boundary for ac35MapLayout.xml slightly. 
Fixes issue #63
 2017-09-27 16:56:20 +13:00
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
 2017-09-27 15:41:24 +13:00
hba56 7b5460abc5 info full screen map shows on top of hud 
#story[1306]
 2017-09-27 14:17:22 +13:00
hba56 2ac3bad6e1 info table shows on top of hud 
#story[1306]
 2017-09-27 13:54:02 +13:00
hba56 4e8f1a2b19 Placed the waypoint arrow in the HUD 
#story[1306]
 2017-09-27 13:39:27 +13:00
David Wu 1a672e8ac8 Merge branch 'master' into story1292_hp_punish 2017-09-27 13:36:24 +13:00
hba56 2f6fa73349 Merge remote-tracking branch 'remotes/origin/master' into raceView_UI 2017-09-27 13:21:41 +13:00
Joseph Gardner 13f3f595d2 Merge remote-tracking branch 'origin/master' into story1299_next_mark_direction 2017-09-27 12:52:50 +13:00
Joseph Gardner ea1170a48e Merge remote-tracking branch 'origin/master' into raceLength 2017-09-27 12:05:09 +13:00
hba56 173b4444da Placed the wind arrow in the HUD 
#story[1306]
 2017-09-27 12:04:56 +13:00
hba56 fc267a6a49 Merge remote-tracking branch 'remotes/origin/master' into raceView_UI 
# Conflicts:
#	racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
 2017-09-27 12:04:03 +13:00
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
 2017-09-27 11:48:06 +13:00
zwu18 416eb1e6bf On death a menu will pop up telling the user he is dead. #story[1292] 2017-09-27 01:09:03 +13:00
Joseph 569204b771 New skin for 2d next mark arrow. #story[1299] 2017-09-27 00:36:05 +13:00
Joseph 699df2e775 Using new arrow / arrow textures. Made sails not clickable. 2017-09-26 18:30:29 +13:00
Joseph affbb69029 Merge remote-tracking branch 'origin/story1299_next_mark_direction' into story1299_next_mark_direction 2017-09-26 17:54:49 +13:00
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
 2017-09-26 17:53:46 +13:00
zwu18 f4001e0ae3 Added visual display when boat dies. Added sound when boat dies. #story[1311] 2017-09-26 17:05:22 +13:00
Fan-Wu Yang d599df3901 Merge branch 'master' into raceLength 
# Conflicts:
#	racevisionGame/src/main/java/mock/app/Event.java
 2017-09-26 16:40:03 +13:00
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
 2017-09-26 16:11:14 +13:00
zwu18 e53d7d894b Warning sound added. Sound synced with visual display. #story[1292] 2017-09-26 16:03:35 +13:00
Fan-Wu Yang 967bdb394f Merged in master and realigned center of the boat #story[1306] 2017-09-26 15:21:30 +13:00
Fan-Wu Yang cd99492467 Merge branch 'master' into story1306_wind_arrow 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/layout/Assets3D.java
 2017-09-26 15:04:02 +13:00
Fan-Wu Yang a14307a6bf Merge branch 'master' into story1297_sails 2017-09-26 00:23:38 +13:00
fjc40 76dff8009c Removed countdown timer from lobby screen. 2017-09-25 23:48:00 +13:00
Joseph Gardner f9f5cfef7d Chanegd next mark arrow to fit with new UI. #story[1299] 2017-09-25 13:11:09 +13:00
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. 2017-09-25 11:56:55 +13:00
Fan-Wu Yang 6d55168c61 Added Textures to boats as well as added texture to arrow #story[1306] 2017-09-25 03:31:38 +13:00
Fan-Wu Yang 45ba3ae6ac Added 3D wind arrow and it also rotates #story[1306] 2017-09-25 02:35:52 +13:00
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] 2017-09-25 02:15:09 +13:00