32 Commits (12b7d10f2479ec8c0c3315807a949632b92997e7)

Author	SHA1	Message	Date
Fan-Wu Yang	12b7d10f24	Merge branch 'master' into story1297_sails ... # Conflicts: # racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java # racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java	8 years ago
Fan-Wu Yang	088e73414b	Fixed small bug where the sail never stopps jittering after moving #story[1297]	8 years ago
Fan-Wu Yang	2b8ca9265f	Sails now slowly spin to the correct position #story[1297]	8 years ago
Fan-Wu Yang	d3a6b82031	Commit before checking out developement	8 years ago
Connor Taylor Brown	49c08f5687	Merge branch 'story1298_boat_highlight' into 'master' ... Story1298 - Boat highlighting ACs: - Current players boat is highlighted See merge request !56	8 years ago
Joseph	322d7b38b6	Merge remote-tracking branch 'origin/master' into story1298_boat_highlight ... # Conflicts: # racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java	8 years ago
Fan-Wu Yang	cf9acabd97	Boat sails now luff and stay when in the direction of the wind #story[1297]	8 years ago
hba56	dacaf58271	Merge remote-tracking branch 'remotes/origin/master' into minimap_test	8 years ago
hba56	afc42cf2ab	lowered opacity	8 years ago
hba56	f7d866144a	Map now only shows annotations when in full screen ... #story[1295]	8 years ago
Joseph Gardner	a82d3081fc	Replace the class use of highlight with shockwave. #story[1298]	8 years ago
Joseph Gardner	9fbd5df626	Highlighting no longer goes over other boats. Player boat is highlighted in lobby. #story[1298]	8 years ago
Joseph Gardner	3ca62e6c2b	Added basic highlighting to player boat. #story[1298]	8 years ago
hba56	f3f60acac6	resize map	8 years ago
hba56	731be68831	test for a minimap	8 years ago
fjc40	75c15d492e	There was a null pointer exception when finishing the race, as the finish leg doesn't have compound marks.	8 years ago
fjc40	5c58ca11ff	Boats use their assigned color. ... Boat name is displayed in lobby instead of source ID.	8 years ago
hba56	3131d67cf2	Merge remote-tracking branch 'remotes/origin/master' into scoreTable	8 years ago
fjc40	ae9594f8c3	Removed a println and fixed some javadoc warnings.	8 years ago
fjc40	47d013612a	Fix for null pointer exception when finishing race.	8 years ago
hba56	88f1a393f2	Made the info tab into an overlay ... #story[1195]	8 years ago
fjc40	24b068f249	Collision effect uses color.transparent instead of a custom transparent color.	8 years ago
fjc40	536428ce16	There was a null pointer exception related to going into/leaving third person camera and the arrow annotation.	8 years ago
fjc40	f308f5b8f3	Visualiser model thread was updating GUI instead of fx thread.	8 years ago
Connor Taylor-Brown	90c258e9e9	Reset collision tag on visualiser boat after displaying collision ... - Modified View3D to index subjects rather than shapes by source ID - Enforced one collision per boat on server to reduce rendering load - Changed collision radius to less than bounce radius - Fixed game-breaking null command bug #story[1195]	8 years ago
hba56	c17900a461	Merge remote-tracking branch 'remotes/origin/master' into scoreTable	8 years ago
Fan-Wu Yang	2383915c78	Merged #story[1195]	8 years ago
Joseph Gardner	7bea2fee73	Merge branch 'storyA_sounds' into storyD-3D	8 years ago
Joseph Gardner	14b5f4bdf1	Merge branch 'master' into storyD-3D ... # Conflicts: # .gitignore # racevisionGame/src/main/java/mock/model/RaceServer.java # racevisionGame/src/main/java/mock/model/collider/Collider.java # racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java # racevisionGame/src/main/java/shared/model/Boat.java # racevisionGame/src/main/java/shared/model/Mark.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/java/visualiser/Controllers/RaceViewController.java # racevisionGame/src/main/java/visualiser/Controllers/TitleController.java # racevisionGame/src/main/java/visualiser/layout/Plane3D.java # racevisionGame/src/main/java/visualiser/layout/SeaSurface.java # racevisionGame/src/main/java/visualiser/layout/View3D.java # racevisionGame/src/main/java/visualiser/utils/PerlinNoiseGenerator.java # racevisionGame/src/main/resources/visualiser/scenes/title.fxml	8 years ago
hba56	083eb5a4bc	updated race view that does not use a split pane	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
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