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
1557 Commits
This Branch
This Branch
All Branches
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 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
Connor Taylor-Brown 0da840a37e Fixed toggling and application of style 
#story[1301]
 2017-09-28 11:38:19 +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
Joseph e434af0728 fixed boat collisions. Increased boat collision radius 15 -> 50 2017-09-28 01:29:58 +13:00
fjc40 e8886d70de Merge branch 'zoom_in_clipping_fix' into ac35_map_boundary 2017-09-28 00:50:43 +13:00
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.
 2017-09-28 00:00:02 +13:00
Connor Taylor-Brown 7e1f6284cc Gave screen and minimap backgrounds uniform colours 
#story[1301]
 2017-09-27 23:50:49 +13:00
Connor Taylor-Brown 246d6bcc71 CSS now works on startup 
#story[1301]
 2017-09-27 23:39:17 +13:00
zwu18 20ae978664 Merge branch 'story1301-start' into custom_buttons 2017-09-27 22:57:10 +13:00
hba56 a8cd7755b8 color fix for multiple boats 
#story[1306]
 2017-09-27 22:47:33 +13:00
Connor Taylor-Brown f2a0f56cf0 Merge remote-tracking branch 'remotes/origin/boat_speed_issue_54' into ac35_map_boundary 2017-09-27 22:46:53 +13:00
Connor Taylor-Brown 4415a501be Merge remote-tracking branch 'remotes/origin/minimap_crash_first_leg' into ac35_map_boundary 2017-09-27 22:46:31 +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
hba56 1783e73caf color fix for first leg 
#story[1306]
 2017-09-27 22:39:47 +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
Connor Taylor-Brown 315bb64bb3 Boat on start screen now follows infinite loop 
- Removed non-resizable property on TitleController

#story[1301]
 2017-09-27 22:37:15 +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 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
 2017-09-27 16:08:02 +13:00
fjc40 abfa3ea863 Race now uses a 1 for timescale, which effectively disables time/speed scaling. 2017-09-27 15:51:00 +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
Fraser Cope 75f8231bc5 Merge branch 'story1292_hp_punish' into 'master' 
Story1292 and Story1291 hp

Story 1291:

AC's:
-Mock sends out HP packets
-Visualiser displays each boat's HP in tab view
-User boat HP is displayed on main UI beside boat

Story 1292:

AC's:
-Boats lose HP when they collide
-Boats lose HP when they are out of bounds
-Indication when HP drops below thresholds (20hp, 10hp, 0hp)

See merge request !65
 2017-09-27 15:24:38 +13:00
fjc40 5ea4200e67 Some javadoc warning fixes. 2017-09-27 14:47:51 +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
Hamish Ball f9f3213397 Merge branch 'story1299_next_mark_direction' into 'master' 
Story1299 next mark direction

- Shows a 2d arrow to next mark when zoomed out
- Shows a 3d arrow to next mark when zoomed in

See merge request !63
 2017-09-27 13:19:53 +13:00
Joseph Gardner 7ac181f33d Fixed null pointer when race finishes #story[1299] 2017-09-27 13:08:29 +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 5eeb65ad41 Merge branch 'raceLength' into 'master' 
Race length

AC's:
- Scale map to selected duration of user

See merge request !64
 2017-09-27 12:47:32 +13:00
Joseph Gardner 08c097f153 Merge remote-tracking branch 'origin/issue61_manual_connection_fix' into story1299_next_mark_direction 2017-09-27 12:38:40 +13:00
Joseph Gardner 6e913d6c45 Merge remote-tracking branch 'origin/third-person-default' into story1299_next_mark_direction 2017-09-27 12:38:29 +13:00