78557a4536
Key presses are transmitted to a host (but there is no host currently connected)
...
#pair[kre39,zyt10] #story[988]
2017-07-13 15:39:48 +12:00
8090cd7985
WIP: Adapted the old server thread class to the GameServerThread class to allow multiple clients to connect
...
tags: #story[1047] #pair[wmu16]
2017-07-13 14:40:11 +12:00
5ce34bed92
Key presses now assigned to enum and empty packet class is constructed.
...
#pair[kre39,zyt10] #story[988]
2017-07-13 14:35:41 +12:00
035841f221
WIP: Adapted the old server thread class to the GameServerThread class to allow multiple clients to connect
...
tags: #story[1047] #pair[wmu16, mra106]
2017-07-11 17:03:32 +12:00
ef61a687d6
Researched and implemented a way for the game to listen for key presses. When one of the valid key controls are pressed, feedback is given in the console. Has yet to be connected to a method which will create and send a message to the server.
...
#pair[kre39,zyt10] #story[988]
2017-07-11 16:32:15 +12:00
fcb1e5e593
Removed unnecessary Position and GeoPoint classes to clear the code base.
...
- put utility classes in a package
#story[1047]
2017-07-10 23:51:01 +12:00
752863a0d3
WIP: Created some basic controllers for the UI and started implementing backend for server stuff
...
Created GameState Class. Static, contains all info about current state of game: list of players and their respective details (coords etc) also Host info
Clients will observe this GameState class
Upon pressing host, new GameState is created and new GameConnectionListener created which listens for connections
Player class created which will be used to take each connection and store it as a player with other info about them regarding the game in the GameState class
tags: #story[1047] #pair[wmu16, zyt10]
2017-07-10 16:03:13 +12:00
1a3e330eb4
Created some basic UI for new start screen (host and connect) and a lobby
...
tags: #story[1047] #pair[wmu16, zyt10]
2017-07-10 13:43:25 +12:00
5f9da6b40a
Fixed the bug where the polar file could not be read after being packaged
...
tags: #story[955] #pair[wmu16, zyt10]
2017-07-10 12:36:32 +12:00
aee62c29fe
Merge remote-tracking branch 'origin/develop' into develop
2017-05-26 09:07:22 +12:00
fe76ef9cdc
Merge remote-tracking branch 'origin/develop'
2017-05-25 16:58:01 +12:00
acbaa838ec
Change default port to 4940
...
#story[956] #pair[wmu16, mra106]
2017-05-25 16:56:41 +12:00
f4134d83b5
Merge branch 'issue#8_create_finish_screen' into 'develop'
...
Issue#8 create finish screen
Created a finish screen which user can see position of the final result and able to go back to start screen to rewatch new race
See merge request !41
2017-05-25 16:52:59 +12:00
24cc10e1cd
Merge remote-tracking branch 'origin/develop' into issue#8_create_finish_screen
...
# Conflicts:
# src/main/java/seng302/controllers/CanvasController.java
2017-05-25 16:51:32 +12:00
20b79b40f2
Fix the button position #story[923]
2017-05-25 16:45:35 +12:00
72e2776b7e
Fix the finish screen size #story[923]
2017-05-25 16:41:59 +12:00
49e4c92da6
Merge branch 'develop'
2017-05-25 16:40:24 +12:00
ba761e4951
Merge branch 'remove_observers' into 'develop'
...
Remove observers
Refactor for annotations and a few improvements here and there. Fix for several tracked issues and numerous other bug fixes.
See merge request !40
2017-05-25 16:36:43 +12:00
c1aa1d8eae
merged with dev
2017-05-25 16:32:25 +12:00
4231c3ccd8
Merge remote-tracking branch 'origin/develop' into remove_observers
2017-05-25 16:30:15 +12:00
65223ceaaf
shifted annotation layers. Merged with dev.
2017-05-25 16:29:27 +12:00
ca22615c08
Add scroll bar to the side panel to cater for smaller screen.
2017-05-25 16:18:47 +12:00
559a9f38c0
Merge remote-tracking branch 'origin/develop' into issue#8_create_finish_screen
...
# Conflicts:
# src/main/java/seng302/controllers/CanvasController.java
# src/main/java/seng302/models/stream/StreamParser.java
2017-05-25 16:12:44 +12:00
762829e5ff
Merge branch 'develop'
2017-05-25 15:56:10 +12:00
835f79b113
Swapped to the local stream as default
2017-05-25 15:56:02 +12:00
3bd8added4
Merge remote-tracking branch 'origin/develop' into develop
2017-05-25 14:56:11 +12:00
e0854bc68c
Merge remote-tracking branch 'origin/master'
2017-05-25 14:55:35 +12:00
cec7014856
Set axis ons parkline style
2017-05-25 14:54:34 +12:00
ba527a1979
Merge remote-tracking branch 'origin/develop' into develop
2017-05-25 14:54:28 +12:00
b73e4c89db
Merge remote-tracking branch 'origin/develop' into remove_observers
...
# Conflicts:
# src/main/java/seng302/controllers/CanvasController.java
# src/main/java/seng302/controllers/RaceViewController.java
# src/main/java/seng302/fxObjects/BoatGroup.java
# src/main/java/seng302/fxObjects/MarkGroup.java
# src/main/java/seng302/models/Yacht.java
2017-05-25 14:52:54 +12:00
f1a9da83fc
Quick fixes before merge
2017-05-25 14:22:01 +12:00
6e903bfbed
Merge branch 'develop' into 38b_LayLines
...
# Conflicts:
# src/main/java/seng302/App.java
# src/main/java/seng302/models/Yacht.java
# src/main/java/seng302/models/stream/StreamParser.java
2017-05-25 14:16:55 +12:00
23d62f552e
Merged develop onto this branch
...
Tidied code, removed print statements
#story[956] #pair[wmu16, mra106]
2017-05-25 14:06:33 +12:00
53f6a6b8c5
Implimented a new way to determine positions
...
#story[952]
2017-05-25 14:06:33 +12:00
945acb6071
Merge remote-tracking branch 'origin/develop' into develop
2017-05-25 13:57:07 +12:00
af81bf5891
Merge remote-tracking branch 'origin/develop' into 38b_LayLines
...
# Conflicts:
# src/main/java/seng302/models/BoatGroup.java
# src/main/java/seng302/models/Event.java
# src/main/java/seng302/models/mark/Mark.java
# src/main/java/seng302/models/stream/StreamParser.java
2017-05-25 13:56:08 +12:00
e72ac1def8
Laylines are now togglable. Still not completely fool proof
...
Laylines appear only for the selected boat. The dissapear if the boat is not seleccted. Laylines are the colour of the boat
Laylines do not yet automatically update for a selected boat when it passes a mark
There is still a polling interval of a second in which if you select a boat after it has just passed a mark it still thinks the next mark is that mark and laylines are displayed incorrectly
#story[956] #pair[wmu16, mra106]
2017-05-25 13:48:48 +12:00
f163dfdd11
Removed a print statement
2017-05-25 13:14:36 +12:00
a1eda8d91d
Fix boatPos in StreamParser.java being empty and affecting all the assessors
2017-05-25 12:58:11 +12:00
5ed02a1fe1
Merge remote-tracking branch 'origin/develop' into issue#8_create_finish_screen
...
# Conflicts:
# src/main/java/seng302/controllers/CanvasController.java
2017-05-25 12:32:10 +12:00
66d4a4b958
Fix finish screen showing wrong ("-" as) position
2017-05-25 12:28:13 +12:00
adbb9ffe3b
Removed completed TODO request.
2017-05-25 10:31:37 +12:00
0cd2867ac0
Made annotations more readable when overlapping.
2017-05-25 10:30:01 +12:00
4d29354797
Merge branch 'develop' into remove_observers
...
# Conflicts:
# src/main/java/seng302/controllers/CanvasController.java
# src/main/java/seng302/fxObjects/BoatGroup.java
# src/main/java/seng302/models/stream/StreamParser.java
2017-05-25 10:25:54 +12:00
a6d9c66fc9
Removed unused import statements and class variables. Removed non error print statements.
2017-05-25 10:20:39 +12:00
99588c7ff8
Laylines now working upon selecting a boat. Still need to make their visibility togglable
...
Currently just paints upon clicking
tags: #story[956]
2017-05-25 09:54:00 +12:00
68c3e3e999
Merged develop onto this branchk
...
tags: #story[956]
2017-05-25 09:21:47 +12:00
67b5650288
Merge branch 'develop' into 38b_LayLines
...
# Conflicts:
# src/main/java/seng302/controllers/RaceViewController.java
# src/main/java/seng302/models/Yacht.java
2017-05-25 09:19:42 +12:00
3085125f3e
Merged with develop
2017-05-25 01:21:40 +12:00
5e26ad7c36
Merge remote-tracking branch 'origin/develop' into remove_observers
...
# Conflicts:
# src/main/java/seng302/App.java
# src/main/java/seng302/controllers/CanvasController.java
# src/main/java/seng302/controllers/RaceViewController.java
# src/main/java/seng302/models/Yacht.java
2017-05-25 01:12:10 +12:00
Kusal Ekanayake
William Muir
Haoming Yin
Michael Rausch
Zhi You Tan
Calum