michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 14:28:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,148 Commits 17 Branches 21 Tags
8c7f9a878db16e5042ab4a8d234d8dbdbaf07956
Commit Graph

170 Commits

Author SHA1 Message Date
Calum 2c5fddb695 Implemented zooming and clipping of race border. Implementation is still hackish. 
#pair[ptg19, cir27] #story[1121]
 2017-08-09 16:56:46 +12:00
Zhi You Tan 8813d06010 Created a simple red blink on a top of a yacht given source id. 
Created and updated methods reading yacht event packet to translate to collision alert on visualiser.
WIP: sending yacht event packet to inform collision

#story[1117]
 2017-08-09 01:26:59 +12:00
Kusal Ekanayake 97696cc95b Started work on cucumber tests. Trying to sort through threads, getting inconsistent results. 
#story[1111] #pair[kre39,ptg19]
 2017-08-07 17:54:34 +12:00
William Muir 4375b73257 Implemented algorithm for checking if boat passes through a mark. 
Mark rounding works for whole course (WITH BUGS)
Still some gate logic to work out.
Moved gate function to GeoUtil class

tags: #story[1124] #pair[hyi25, wmu16]
 2017-08-07 17:28:12 +12:00
Calum a3ce5998ff Action packets now sent at regular 20ms intervals 
#issue[38] #implement
 2017-08-07 10:58:07 +12:00
Calum 8a40119a98 Action packets now sent at regular 20ms intervals 
#issue[38] #implement
 2017-08-06 22:17:08 +12:00
Kusal Ekanayake 99d5545ed3 Made the sails work properly by toggling. 
Need to remove the unneeded code I added.

#story[1111]
 2017-08-03 16:33:51 +12:00
Calum 87ef37a689 Fixed connecting to hosts. Fixed issue34 and 35 to the point where they can be developed off of. 
#refactor #bug #issue[34, 35]
 2017-08-02 00:26:57 +12:00
Calum 908c0749cf Boats now move on screen as intended. 
TODO - Make the client connect to the server.
 2017-08-01 02:37:55 +12:00
Calum b82d0d0137 Boats and map are now updated using the observer pattern. 
#implement
 2017-07-31 05:23:41 +12:00
Calum 6cae338c1e Began fixing bugs with caused by asynchronous listener calls. 
#bug
 2017-07-30 20:12:19 +12:00
Calum 7894e31926 Merge branch 'develop' into story61_player_perspective 
# Conflicts:
#	src/main/java/seng302/App.java
#	src/main/java/seng302/client/ClientPacketParser.java
#	src/main/java/seng302/client/ClientState.java
#	src/main/java/seng302/client/ClientStateQueryingRunnable.java
#	src/main/java/seng302/controllers/Controller.java
#	src/main/java/seng302/controllers/LobbyController.java
#	src/main/java/seng302/controllers/RaceViewController.java
#	src/main/java/seng302/controllers/StartScreenController.java
#	src/main/java/seng302/fxObjects/BoatAnnotations.java
#	src/main/java/seng302/gameServer/GameState.java
#	src/main/java/seng302/gameServer/MainServerThread.java
#	src/main/java/seng302/model/Yacht.java
#	src/main/java/seng302/model/stream/StreamReceiver.java
#	src/main/java/seng302/visualiser/ClientToServerThread.java
#	src/main/java/seng302/visualiser/GameView.java
#	src/main/java/seng302/visualiser/fxObjects/BoatObject.java
#	src/test/java/seng302/model/stream/StreamReceiverTest.java
 2017-07-30 18:07:28 +12:00
Calum 8ac44d13df Began fixing conflicts with LobbyController 
#bug
 2017-07-26 12:05:03 +12:00
Calum 9c9f6e4e80 Merge branch 'develop' into story61_player_perspective 
# Conflicts:
#	src/main/java/seng302/fxObjects/BoatAnnotations.java
#	src/main/java/seng302/gameServer/GameState.java
#	src/main/java/seng302/gameServer/ServerToClientThread.java
#	src/main/java/seng302/model/Yacht.java
#	src/main/java/seng302/visualiser/controllers/LobbyController.java
 2017-07-26 02:56:46 +12:00
Calum 08e369f1ae Merged with develop. Fixed many bugs in Visualiser. 
#bugs
 2017-07-26 02:49:31 +12:00
Calum acd54dec7a Merge branch 'develop' into story61_player_perspective 
# Conflicts:
#	src/main/java/seng302/App.java
#	src/main/java/seng302/client/ClientPacketParser.java
#	src/main/java/seng302/controllers/Controller.java
#	src/main/java/seng302/controllers/RaceViewController.java
#	src/main/java/seng302/fxObjects/BoatAnnotations.java
#	src/main/java/seng302/gameServer/GameState.java
#	src/main/java/seng302/gameServer/MainServerThread.java
#	src/main/java/seng302/gameServer/ServerToClientThread.java
#	src/main/java/seng302/model/Boat.java
#	src/main/java/seng302/models/stream/XMLParser.java
#	src/main/java/seng302/visualiser/ClientToServerThread.java
#	src/main/java/seng302/visualiser/GameView.java
#	src/main/java/seng302/visualiser/controllers/FinishScreenViewController.java
#	src/main/java/seng302/visualiser/controllers/StartScreenController.java
#	src/main/java/seng302/visualiser/fxObjects/BoatObject.java
#	src/main/resources/views/LobbyView.fxml
#	src/main/resources/views/MainView.fxml
 2017-07-25 21:05:15 +12:00
Calum 6242ab0b2e Implemented observer and strategy pattern in BoatAnnotations, now renamed AnnotationsBox. 
Also implemented various other small fixes and further refactored code.

#refactor
 2017-07-25 20:45:27 +12:00
Calum aad93d8913 Parsing classes now static utilities. Data now moved to model via controller class. Race logic shifted out of grpahics classes. Several improvements to code readability. 
#story[986] #refactor
 2017-07-24 12:14:08 +12:00
Calum 3ec1242a9a Merge branch 'Story62_Reading_Keystrokes' into story61_player_perspective 
# Conflicts:
#	src/main/java/seng302/gameServer/ServerToClientThread.java
#	src/main/java/seng302/visualiser/ClientToServerThread.java
#	src/main/java/seng302/visualiser/controllers/RaceViewController.java
 2017-07-21 11:13:04 +12:00
Calum 881f7f8e30 Changed package heirachy. Merged Controller and StartScreenController. 
#refactor
 2017-07-21 09:22:55 +12:00