1271 Commits (004aebceb5852d0eac1faf9e06dd22817307835a)

 

All Branches   

Search

Author	SHA1	Message	Date
hba56	004aebceb5	fix null pointer when playing tutorial	8 years ago
David Wu	4cb0948aaf	Merge branch 'wind_arrow_direction_5' into 'master' ... Wind arrow direction 5 This should fix the wind arrow direction. The polars were actually backwards so wind was being simulated with: into wind = faster, away from wind = slower. #### A.C: - Downwind means the boat's bearing is aligned with the wind arrow. - Upwind means the boat's bearing is facing directly into the wind arrow. - Pressing the upwind key should turn the boat in the upwind direction. - Pressing the downwind key should turn the boat in the downwind direction. - Facing upwind should result in a boat speed of roughly 0kn. - Facing downwind should result in non-zero boat speed (roughly 14kn with 12kn wind). Fixes #51 See merge request !45	8 years ago
David Wu	913452de43	Merge branch 'master' into wind_arrow_direction_5 ... # Conflicts: # racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java	8 years ago
David Wu	39cfed961c	Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7	8 years ago
David Wu	550180f286	Removed countdown pane.	8 years ago
fjc40	b59d36f4e5	Actually fixed the wind arrow direction.	8 years ago
fjc40	afd923c9fb	Revert "Appears to fix wind arrow direction." ... This reverts commit 8e6a720558.	8 years ago
fjc40	e0278fdb85	Merge remote-tracking branch 'origin/master' into wind_arrow_direction_5	8 years ago
fjc40	8e6a720558	Appears to fix wind arrow direction.	8 years ago
David Wu	e3266c3b47	Pane removed.	8 years ago
Joseph Gardner	a6eea88524	Fixed collisions #fix #story[1196]	8 years ago
hba56	81a04c987b	Changed the ip of the matchbrowser to that of the CI.	8 years ago
Fan-Wu Yang	e4a8bd08e7	Merge branch 'story77' into 'master' ... Story77 See merge request !44	8 years ago
Fan-Wu Yang	92500e13ee	Added in windangle for rotated map as it had been lost through merge. #story[1188]	8 years ago
Fan-Wu Yang	1b946b6807	Removed/commented out unecessary print messages #story[1188]	8 years ago
hba56	4c52673fc1	javadoc fixes ... #story[1188]	8 years ago
hba56	e4dbebfcac	Merge remote-tracking branch 'remotes/origin/master' into story77 ... # Conflicts: # racevisionGame/src/main/java/mock/app/Event.java # racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java # racevisionGame/src/main/java/visualiser/Controllers/HostGameController.java # racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java # racevisionGame/src/main/java/visualiser/Controllers/TitleController.java # racevisionGame/src/main/java/visualiser/app/App.java # settings/keyBindings.xml	8 years ago
hba56	fd120edaf9	Merge remote-tracking branch 'remotes/origin/master' into story77 ... # Conflicts: # racevisionGame/src/main/java/mock/app/Event.java # racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java # racevisionGame/src/main/java/visualiser/Controllers/HostGameController.java # racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java # racevisionGame/src/main/java/visualiser/Controllers/TitleController.java # racevisionGame/src/main/java/visualiser/app/App.java # settings/keyBindings.xml	8 years ago
Fan-Wu Yang	7b97e93d3a	Merge branch 'merge_fix_story51' ... # Conflicts: # racevisionGame/src/main/java/mock/app/Event.java	8 years ago
Fan-Wu Yang	54fe37fd3a	Merge branch 'story_51_rounding_fix' into 'master' ... Story 51 rounding fix Acceptance criteria: - The layout must be sent over the API in a race.xml message, plus boat location messages for the marks as required, before any other boat location messages are sent. - Each mark must be defined using boat "SourceID"s (see definition of race.xml) so their positions can be adjusted later. - The course must meet the requirements given in the AC35 Protocol. - The course limits should be set to clear all marks by at least several boat-lengths. - The entire race area within the limits must be on the water. (Work with rounding) Tested by playing the first map with a variety of rotation angles. See merge request !43	8 years ago
David Wu	22b4b66049	Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77 ... # Conflicts: # racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java # racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml	8 years ago
David Wu	cccce9002b	Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77 ... # Conflicts: # racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java # racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml	8 years ago
hba56	00780e17e9	Merge remote-tracking branch 'remotes/origin/temp77' into story77 ... # Conflicts: # racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java # racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml # racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml	8 years ago
David Wu	8cc4d7741c	Fixed issue where games can't be hosted if you quit as host in the lobby menu. Added more doc.#story[1188]	8 years ago
hba56	aafc0dc9db	Merge remote-tracking branch 'remotes/origin/temp77' into story77 ... # Conflicts: # racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java # racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml # racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml	8 years ago
Fan-Wu Yang	1cbb24e9fd	Merged in master #story[1185]	8 years ago
Fan-Wu Yang	3760a43cfc	Merge branch 'master' into HEAD ... # Conflicts: # racevisionGame/src/main/java/mock/app/Event.java	8 years ago
fjc40	b655b3e233	Fixed merge bug, and an unrelated null pointer exception.	8 years ago
fjc40	6761778dd4	Merge remote-tracking branch 'origin/master' into story_51_rounding_fix ... # Conflicts: # racevisionGame/src/main/java/mock/app/Event.java	8 years ago
David Wu	06bd637460	Added documentation. #story[1188]	8 years ago
David Wu	490aab3f8d	Changes made to pre-race countdown. #story[1188]	8 years ago
Fan-Wu Yang	e87173ee39	Fixed Tutorial not being able to run #story[1185]	8 years ago
hba56	079d93fc0f	Merge remote-tracking branch 'remotes/origin/master' into story77 ... # Conflicts: # racevisionGame/src/main/java/mock/app/Event.java # racevisionGame/src/main/java/visualiser/Controllers/HostController.java # racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java # racevisionGame/src/main/java/visualiser/Controllers/MainController.java # racevisionGame/src/main/resources/visualiser/scenes/main.fxml # settings/keyBindings.xml	8 years ago
hba56	70ccb4cf1c	Merge remote-tracking branch 'remotes/origin/master' into story77 ... # Conflicts: # racevisionGame/src/main/java/mock/app/Event.java # racevisionGame/src/main/java/visualiser/Controllers/HostController.java # racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java # racevisionGame/src/main/java/visualiser/Controllers/MainController.java # racevisionGame/src/main/resources/visualiser/scenes/main.fxml # settings/keyBindings.xml	8 years ago
David Wu	f926355d1c	Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77	8 years ago
David Wu	89ce8a7cc0	Pre-race countdown implementation.	8 years ago
hba56	731c0b0e61	send out to every client fix	8 years ago
fjc40	d29a47ec23	Merge remote-tracking branch 'origin/master' into story_51_rounding_fix ... # Conflicts: # racevisionGame/src/main/java/mock/app/Event.java # racevisionGame/src/main/java/mock/model/MockRace.java # racevisionGame/src/main/java/shared/model/Constants.java	8 years ago
Fraser Cope	d1f74dec3a	Merge branch 'storyB-)' into 'master' ... B) [V,M] As a player I would like to have the game run smoothly and have a unique game experience Acceptance criteria: * Boat moves smoothly when executing command * The appearance of the game is unique and consistent This merge request also closes issue #42. See merge request !42	8 years ago
fjc40	070654a95c	Javadoc fix.	8 years ago
David Wu	c750b806e0	Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77	8 years ago
fjc40	2ad947b57d	The start time of the race is no longer scaled by the race speed scalar. ... Changed the prestart time to 30 seconds (was 3 minutes). Changed the preparatory time to 10 seconds (was 1 minute). Phases: player list +prestart > warning > race view + preparatory + no more joining > started > finished.	8 years ago
hba56	2c06a46ad2	send out to every client fix	8 years ago
David Wu	202c8d80c8	Minor fxml adjustments.	8 years ago
David Wu	42a5d8ddc4	Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77	8 years ago
hba56	5fb24307ec	send out to every client fix	8 years ago
David Wu	bdb68a89c0	Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77	8 years ago
David Wu	7cea1fb11c	Reworking fxml for lobby.	8 years ago
hba56	bed9f8b07a	send out to every client fix	8 years ago
fjc40	ab96884dc6	Javadoc.	8 years ago