db078538ff
Minor cleaning in yacht class
...
tags: #story[1124]
2017-08-03 13:53:30 +12:00
f9e6df46c1
Fixed issues caused by merge.
...
#bug
2017-08-03 13:23:43 +12:00
5228c078bc
Merge branch 'develop' into 1124_Mark_Sequence_From_RaceXML
...
# Conflicts:
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/gameServer/server/simulator/Simulator.java
# src/main/java/seng302/models/mark/Mark.java
# src/main/java/seng302/visualiser/map/CanvasMap.java
2017-08-03 12:27:11 +12:00
1160f274ee
Reformatted code in appropriate style
...
Build fails server side only due to some dependency issue. Internet problem server side?? (M I C H A E L?)
tags: #issue[34]
2017-08-03 12:06:07 +12:00
53f5d63f15
Fixed build. (Actually this time) ((NOW WERE READY TO MERGE)))
...
All doc string annotations were required to be fixed for all methods
tags: #issue[34]
2017-08-03 11:50:07 +12:00
1150ec3e43
Merge branch 'develop' into story61_player_perspective
...
# Conflicts:
# src/main/java/seng302/App.java
2017-08-03 11:48:54 +12:00
c655cb3fab
Fixed build. (Actually this time)
...
All doc string annotations were required to be fixed for all methods
tags: #issue[34]
2017-08-03 11:45:14 +12:00
8e24c204fd
Fixed build.
...
Google map does not work
tags: #issue[34]
2017-08-03 11:26:44 +12:00
7885b3fae2
Loading course mark order from RaceXML
...
- Mark order is read from the generated RaceXML and stored
- Added .getNextMark() to get the next mark in the race
- Added .equals() and .hashCode() for Marks
Tags: #story[1124] (Task 1)
2017-08-02 22:03:10 +12:00
b01d39f19f
Merge remote-tracking branch 'origin/develop' into develop
2017-08-02 20:42:22 +12:00
eae201cb4b
Merge remote-tracking branch 'origin/develop' into develop
2017-08-02 20:32:43 +12:00
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
908c0749cf
Boats now move on screen as intended.
...
TODO - Make the client connect to the server.
2017-08-01 02:37:55 +12:00
47c5e6f155
Reverting some new graphics classes back to how they were on master.
2017-07-31 23:35:28 +12:00
9deba732b0
Added dependencies for slf4j
2017-07-31 18:34:55 +12:00
b82d0d0137
Boats and map are now updated using the observer pattern.
...
#implement
2017-07-31 05:23:41 +12:00
f1ad03e913
Refactored the setup for MarkObjects (now renamed Markers) and made the CompoundMark + Mark + GeoPoint classes the standard across all classes instead of GateMark + SingleMark + Mark.
...
#refactor
2017-07-31 02:19:19 +12:00
6cae338c1e
Began fixing bugs with caused by asynchronous listener calls.
...
#bug
2017-07-30 20:12:19 +12:00
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
25d8c8f9c4
Minor bug fixes.
...
Server will now only save incoming connections if in lobbying mode as it should
Commented out boat status printing
tags: #story[1047]
2017-07-27 14:15:55 +12:00
1d9dd76356
For client's lobby view, it now can shows the connected host IP
...
#story[1055]
2017-07-27 13:12:53 +12:00
c2c34705d5
removed an unnecessary print statement and caught an exception
2017-07-27 13:01:04 +12:00
96ed5e445e
Replaced print stack trace with print statements
2017-07-27 12:47:18 +12:00
870dc07fd2
Slight improvements to hosting.
...
Allow a host/client to disconnect and reconnect/make lobby, leave lobby and play the game.
#pair[kre39,hyi25] #story[1047]
2017-07-27 12:45:22 +12:00
ecbb3f6658
Merge remote-tracking branch 'origin/develop' into develop
2017-07-27 11:06:00 +12:00
34704bd93d
Merge remote-tracking branch 'origin/develop' into develop
2017-07-26 23:32:32 +12:00
201c88a253
Fixed a bug that program crashes when it receive regatta xml during the race, as it doesn't know how to handle the xml.
...
#story[984]
2017-07-26 23:32:16 +12:00
6c4da58d9d
Merge remote-tracking branch 'origin/develop' into develop
2017-07-26 22:42:48 +12:00
b56fa5cba3
refactored to make boat trails work again #fix #refactor
2017-07-26 22:42:37 +12:00
9cedbeb6f6
Fixed latency issues caused by clientside movement packets queueing up but currently the trails aren't working anymore #fix #refactor
2017-07-26 22:02:46 +12:00
f99f8a0d7c
Merge remote-tracking branch 'origin/develop' into develop
2017-07-26 20:13:09 +12:00
7db716f51c
Boat should move towards optimal angle upwind and downwind when pressing spacebar (VMG)
...
#story[988]
2017-07-26 20:12:57 +12:00
592e5a088f
Merge remote-tracking branch 'origin/develop' into develop
2017-07-26 19:58:45 +12:00
2d6850950c
Merge branch 'develop' into Documenting_client_and_server
...
# Conflicts:
# src/main/java/seng302/client/ClientToServerThread.java
2017-07-26 19:57:43 +12:00
ef6821a0cd
Updated and added more documentations
...
#story[1047]
2017-07-26 19:55:35 +12:00
6e9535d78f
Fixed race timer & Added boats to team position list
...
- Race status messages are sent at regular intervals instead of once at race start
- Boat positions are initialised on the Team Position list
- Timer counts up from when host clicks ready
Tags: #story[377]
2017-07-26 19:35:59 +12:00
72a45f5984
Fixed a bug where if boatMaxSpeed was 0 and sails were up, boat would not decelerate.
...
#story[986]
2017-07-26 17:11:34 +12:00
7392bdb80d
Added documentation
...
#document
2017-07-26 16:03:11 +12:00
af9f1417f1
Documented client packet parser, client state, client state querying runnable, client to server thread and replaced e.printStackTrace() with client log messages.
2017-07-26 16:01:41 +12:00
8fc00fd750
Enabled boat path for only the player.
...
#story[987]
2017-07-26 16:01:01 +12:00
4e5b67abfa
Merge branch 'develop' into story61_player_highlighting
2017-07-26 15:52:29 +12:00
84e8ac89fc
Added random name generator until players can chose how to identify themselves.
2017-07-26 15:52:02 +12:00
12d081a1af
Added highlighting for the player and moved all their assets to the foreground
...
#story[987]
2017-07-26 15:49:00 +12:00
5e6b402bf5
Minor structural changes. GameState now has a thread which updates itself so its update
...
rate can be independent of sending packets to the client in the MainServerThread
#story[986] #pair[wmu16, ptg19]
2017-07-26 14:48:32 +12:00
2bfa6cb038
Adjusted the velocity calculations to allow for Acceleration/Deceleration of the boats, rather than just coming to a complete halt when the sails are pulled in.
...
#story[986]
2017-07-26 14:01:51 +12:00
8ac44d13df
Began fixing conflicts with LobbyController
...
#bug
2017-07-26 12:05:03 +12:00
d99055901f
Removed Music
2017-07-26 11:38:29 +12:00
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
08e369f1ae
Merged with develop. Fixed many bugs in Visualiser.
...
#bugs
2017-07-26 02:49:31 +12:00
b0e99ab444
Merge remote-tracking branch 'origin/develop' into develop
...
# Conflicts:
# src/main/java/seng302/server/ServerThread.java
2017-07-25 23:10:41 +12:00
William Muir
Calum
Michael Rausch
Zhi You Tan
Kusal Ekanayake
Haoming Yin
Peter Galloway
Alistair McIntyre