 William Muir
|
ffd94b34bc
|
Fixed error to do with icons/tokens
|
2017-10-11 15:11:21 +13:00 |
|
 Kusal Ekanayake
|
ba49660868
|
added runlater to snackback
|
2017-10-11 14:27:32 +13:00 |
|
 Calum
|
5dbc23866a
|
Fixed start line boat position algorithm. Fixed map limits and max players. Fixed concurrency bug on token creation and pickup. Fixed mini map arrows not rendering correctly for finish lines on maps other than the original. Removed System.gc() call after memory issues causing pauses could not be replicated.
|
2017-10-11 00:13:55 +13:00 |
|
|
William Muir
|
057af2799a
|
Added toggle button css settings
#story[1274]
sprint_8.0
|
2017-09-28 16:47:55 +13:00 |
|
 Zhi You Tan
|
45669c333a
|
Merge remote-tracking branch 'origin/develop' into wind_arrow
# Conflicts:
# src/main/resources/css/RaceView.css
# src/main/resources/views/RaceView.fxml
|
2017-09-28 16:43:38 +13:00 |
|
|
Zhi You Tan
|
f7fd5494ef
|
merged Dev in
Fixed concurrency exception
#story[1276] #pair[zyt10, ajm412]
|
2017-09-28 16:40:50 +13:00 |
|
|
William Muir
|
a1d468c689
|
Added toggle button for the chat history
#story[1274]
|
2017-09-28 16:39:59 +13:00 |
|
|
Zhi You Tan
|
6fafb02a8f
|
Merge branch 'develop' into wind_arrow
# Conflicts:
# src/main/java/seng302/visualiser/controllers/RaceViewController.java
# src/main/resources/views/RaceView.fxml
|
2017-09-28 16:36:34 +13:00 |
|
 Haoming Yin
|
4f80640718
|
Polished raceview UI elements
- changed javaFx css style into Css file
tags: #story[1273]
|
2017-09-28 16:33:16 +13:00 |
|
|
Zhi You Tan
|
d436d2a6e4
|
Wind arrow now follows on every camera
Follows correctly
#story[1276] #pair[zyt10, ajm412]
|
2017-09-28 16:31:10 +13:00 |
|
|
Kusal Ekanayake
|
27379ae96d
|
Fixed fatal bug to do with mark arrow on boat.
|
2017-09-28 16:27:57 +13:00 |
|
|
Kusal Ekanayake
|
ce3e08abfc
|
Changed minimise and maximise icons for minimap
|
2017-09-28 16:18:44 +13:00 |
|
|
Calum
|
923c381797
|
Merge remote-tracking branch 'origin/develop' into develop
|
2017-09-28 16:17:27 +13:00 |
|
|
Calum
|
ece45ff967
|
Fixed map, parrot and camera.
|
2017-09-28 16:17:19 +13:00 |
|
|
William Muir
|
02dc1dbd3d
|
Merge remote-tracking branch 'origin/develop' into develop
|
2017-09-28 16:04:29 +13:00 |
|
 Michael Rausch
|
d9b9c2f808
|
Merge remote-tracking branch 'origin/develop' into develop
|
2017-09-28 16:04:07 +13:00 |
|
|
William Muir
|
4e3de02a93
|
Merge remote-tracking branch 'origin/develop' into develop
|
2017-09-28 16:04:04 +13:00 |
|
|
Michael Rausch
|
261f68f143
|
Added port number randomization
- Servers all run on different ports, so multiple servers can run on one host
- Port is displayed in lobby
Tags: #story[1281]
|
2017-09-28 16:03:59 +13:00 |
|
|
William Muir
|
ed9b7acc62
|
New Map! Waiheke
#story[1274]
|
2017-09-28 16:03:56 +13:00 |
|
|
Michael Rausch
|
74c1219e0d
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# src/main/java/seng302/gameServer/MainServerThread.java
# src/main/java/seng302/visualiser/GameClient.java
# src/main/java/seng302/visualiser/controllers/dialogs/ServerCreationController.java
|
2017-09-28 16:02:04 +13:00 |
|
|
Calum
|
83218ae0a0
|
Merge remote-tracking branch 'origin/develop' into develop
|
2017-09-28 16:01:32 +13:00 |
|
|
Calum
|
0231c43a2c
|
Arrows work. mark arrow thinner. refactored marker class.
#fix
|
2017-09-28 16:01:24 +13:00 |
|
|
Michael Rausch
|
a05a41d5ec
|
Added port number randomization
- Servers all run on different ports, so multiple servers can run on one host
- Port is displayed in lobby
Tags: #story[1281]
|
2017-09-28 15:57:59 +13:00 |
|
|
Haoming Yin
|
06bc3644bc
|
Removed dead code in MeesageFactory and redundant classes
tags: #story[1273]
|
2017-09-28 15:54:09 +13:00 |
|
|
Haoming Yin
|
7620f0023e
|
Removed dead code in MainServerThread
tags: #story[1273]
|
2017-09-28 15:43:35 +13:00 |
|
|
Kusal Ekanayake
|
77ee1ebbc0
|
Fixed faulty tests.
|
2017-09-28 15:35:58 +13:00 |
|
|
William Muir
|
6d0835b0cf
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# src/main/java/seng302/visualiser/controllers/RaceViewController.java
|
2017-09-28 15:29:00 +13:00 |
|
|
William Muir
|
54410efa12
|
Changed garbage collection to once every second, Changed wind walker icon to white
#story[1273]
|
2017-09-28 15:24:45 +13:00 |
|
|
William Muir
|
74241ee819
|
Merge remote-tracking branch 'origin/develop' into develop
|
2017-09-28 15:23:50 +13:00 |
|
|
Kusal Ekanayake
|
a9ce8901f5
|
Merge remote-tracking branch 'origin/develop' into develop
|
2017-09-28 15:17:06 +13:00 |
|
|
Michael Rausch
|
8810554ce9
|
Fixed bug where server wasn't being unregistered from discovery server
- Added missing unregister() method call
Tags: #story[1281]
|
2017-09-28 15:16:37 +13:00 |
|
|
Kusal Ekanayake
|
7e3ed872ed
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# src/main/java/seng302/visualiser/ClientToServerThread.java
|
2017-09-28 15:08:53 +13:00 |
|
|
Kusal Ekanayake
|
21ce34dda2
|
Fixed finish screen and cleaned up dead code
|
2017-09-28 15:08:34 +13:00 |
|
|
William Muir
|
2bf318a122
|
Merge branch 'story1273_minimap' into develop
|
2017-09-28 15:08:32 +13:00 |
|
|
Michael Rausch
|
e56d284792
|
Merge remote-tracking branch 'origin/develop' into develop
|
2017-09-28 15:00:24 +13:00 |
|
|
Michael Rausch
|
80c26a9e4a
|
Fixed bug where server could connect to an expired server
- Increased update interval
Tags: #story[1281]
|
2017-09-28 15:00:00 +13:00 |
|
|
Calum
|
e1ebbc71c1
|
Added drawing to fx thread
#fix
|
2017-09-28 14:57:52 +13:00 |
|
|
Calum
|
c4a3df32c8
|
Merge remote-tracking branch 'origin/develop' into develop
|
2017-09-28 14:47:00 +13:00 |
|
|
Calum
|
1e19dd5ab6
|
Fixed parrot again.
|
2017-09-28 14:46:55 +13:00 |
|
|
William Muir
|
c98297ea79
|
Merged dev changes back on to mini map
#story[1273]
|
2017-09-28 14:44:16 +13:00 |
|
 Alistair McIntyre
|
1aedcaddf5
|
removed an added print statement
tags : #story[1275]
|
2017-09-28 14:42:34 +13:00 |
|
|
Alistair McIntyre
|
d7fc339ad5
|
- Added Madagascar Map
tags : #story[1275]
|
2017-09-28 14:41:35 +13:00 |
|
|
William Muir
|
a5eea10c87
|
Merge branch 'develop' into story1273_minimap
# Conflicts:
# src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelFactory.java
# src/main/resources/meshes/boatSTLs/parrot_features.stl
|
2017-09-28 14:41:08 +13:00 |
|
|
Zhi You Tan
|
51078c82a0
|
Merge remote-tracking branch 'origin/develop' into wind_arrow
# Conflicts:
# src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelType.java
|
2017-09-28 14:38:31 +13:00 |
|
|
Zhi You Tan
|
22fbb529ef
|
Wind arrow follows wind data
#story[1276]
|
2017-09-28 14:37:46 +13:00 |
|
|
Kusal Ekanayake
|
02aabc3162
|
Removing dead code in race view controller and fixed mark rounding bug
|
2017-09-28 14:35:40 +13:00 |
|
|
Alistair McIntyre
|
d2a05de25a
|
Merge remote-tracking branch 'origin/develop' into develop
|
2017-09-28 14:34:39 +13:00 |
|
|
Calum
|
597fbe935f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2017-09-28 14:28:16 +13:00 |
|
|
Calum
|
7cfad28d6b
|
Fixed parrot
|
2017-09-28 14:28:07 +13:00 |
|
|
Michael Rausch
|
3345734efd
|
Fixed memory leak by forcing garbage collection
|
2017-09-28 14:22:33 +13:00 |
|