5d7f307260
Changed arrow colour.
...
#fix
2017-09-28 12:02:09 +13:00
00e2af9c14
- Fixed Merge Errors and some broken lighting AGAIN
...
#tags [1276]
2017-09-28 02:20:34 +13:00
73861b2ef3
Merge branch 'develop' into 1276_Next_Mark_Indicator
2017-09-28 02:06:18 +13:00
4018dd783e
- Fixed Merge Errors and some broken lighting
...
#tags [1276]
2017-09-28 02:05:47 +13:00
8b7407bf89
Various bug fixes
...
- Closed socket when discovery server crashes, so it can be restarted
- Flattened water on terrain mesh
- Added checks to ensure server is started before connecting
- Added a check to ensure client has started before connecting to the server
- Fixed concurrency issue in server-> client thread list
Tags: #story[1281]
2017-09-28 01:58:49 +13:00
00ddf117b2
Merge remote-tracking branch 'origin/develop' into develop
...
# Conflicts:
# src/main/java/seng302/visualiser/controllers/RaceViewController.java
# src/main/resources/images/wind-180.png
2017-09-28 00:26:09 +13:00
a266779709
Added new Wind Waker mesh
...
#implement #story[1293]
2017-09-28 00:24:34 +13:00
df24fe072a
Added animation for wind turning.
...
- enlarged the wind image size to centre the compass
- added animation to smooth the turning
2017-09-28 00:13:45 +13:00
a1a34b9bd7
Merge branch 'develop' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 into develop
2017-09-27 23:36:14 +13:00
42d490d6fd
Added new Wind Waker mesh
...
#implement #story[1293]
2017-09-27 23:35:51 +13:00
cd4a2f8da3
Merge remote-tracking branch 'origin/develop' into develop
2017-09-27 22:47:08 +13:00
287cfd77d0
Fix: smoothing wind rotation
...
- added animation for wind rotation
- enlarged wind image's background to centre the compass
#story[1273]
2017-09-27 22:45:56 +13:00
a08a38c985
- Fixed Merge Errors
...
#tags [1276]
2017-09-27 22:25:32 +13:00
810dde6a21
Merge branch 'develop' into 1276_Next_Mark_Indicator
...
# Conflicts:
# src/main/java/seng302/visualiser/GameView3D.java
# src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelType.java
2017-09-27 22:15:02 +13:00
7a76efa2ce
- Added ability to color the indicators.
...
#tags [1276]
2017-09-27 22:07:24 +13:00
ff4c2cd5b6
Merge branch '1273_Skybox' into 'develop'
...
1273 skybox
Server Discovery:
- Created server discovery server.
- Implemented protocols to support matchmaking & room code connection
- Improved error handling for server disconnections
Skybox:
- Added a skybox
- Added a terrain mesh
See merge request !79
2017-09-27 21:52:34 +13:00
c5e6302f86
- Added circle to boat to indicate which boat is the players and to show where the arrow is pointing.
...
#tags [1276]
2017-09-27 21:31:02 +13:00
cd199767ae
created new models for all pickups #story[1293]
2017-09-27 20:40:40 +13:00
5cc4898ab5
Fixed failing tests & other bug fixes
...
- Fixed server capacity in server list
- Fixed failing unit tests for chat
Tags: #story[1281] #pair[mra106, cir27]
2017-09-27 20:37:29 +13:00
22e1e57c24
Issue #73 : If you change controls to 'Continuously turning' before moving into game, it is not applied
...
- always send turning mode packet when race starts to sync the steering mode
#story[1278]
2017-09-27 20:18:06 +13:00
c5d2016733
Merge branch 'issue_#67_early_start' into 'develop'
...
added a check in the start logic to make sure a boat can't cross the start line early
See merge request !74
2017-09-27 19:42:05 +13:00
efc71f2003
Resolved issue #69 and added dock icon for splash screen.
2017-09-27 19:27:13 +13:00
be72062c8e
Merge branch 'develop' into 1276_Next_Mark_Indicator
...
# Conflicts:
# src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelFactory.java
2017-09-27 19:25:08 +13:00
0d212a4a1d
- Indicator works correctly, sits in the right place, rotates around the boat correctly and sits on top of the water now.
...
tags : #story[1276]
2017-09-27 19:20:33 +13:00
0e9b818071
- Indicator points towards the next mark. Seems to do some funny stuff when entering a compound mark(gate).
...
tags : #story[1276]
2017-09-27 18:50:38 +13:00
452e83c1c3
- Marker seems to be detecting the correct mark but somethings wrong with the maths.
...
tags : #story[1276]
2017-09-27 17:52:54 +13:00
aded794a67
- Added new indicator for direction to next mark.
...
- Marker rotates towards a given heading.
tags : #story[1276]
2017-09-27 17:17:50 +13:00
2b3a972ed5
Various bug fixes
...
- Fixed bug where an invalid port number would crash the program
- Closed the stage before cleaning up resources. This speeds up closing the app.
- Added error handling for when the client looses connection to the server.
Tags: #story[1281]
2017-09-27 17:14:55 +13:00
2a523a5664
Added a duck boat mesh.
...
#implement #story[1274]
2017-09-27 17:03:02 +13:00
67f3124cfb
Merge branch 'develop' into 1273_Skybox
2017-09-27 15:32:54 +13:00
7db387bdec
Merged Host Customisation onto 1273_Skybox
2017-09-27 15:31:54 +13:00
2ceca2fd42
Merge branch 'loading_screens' into 'develop'
...
Loading screens
# Changes
- Fixed a bug with sound not being muted consistently (the music would play when you press play again even if the music was muted)
- Added a splash screen to show for ~2 seconds on launch, doesn't repeat again while playing the same instance
- Added a loading screen which disappears when the race view has finished being set up (boats in place etc)
# Testing
- Manual testing done, few irrelevant bugs have been found, will log in issue tracker
See merge request !78
2017-09-27 15:05:36 +13:00
00ff771fc3
Merge remote-tracking branch 'origin/story1275_host_customization' into 1273_Skybox
...
# Conflicts:
# 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/visualiser/ClientToServerThread.java
# src/main/java/seng302/visualiser/GameView.java
# src/main/java/seng302/visualiser/GameView3D.java
# src/main/java/seng302/visualiser/controllers/dialogs/ServerCreationController.java
2017-09-27 14:56:09 +13:00
d963785679
Added files from merge
2017-09-27 14:47:32 +13:00
78f64557c3
Merged dev onto 1273_Skybox
2017-09-27 14:46:12 +13:00
982fac38a0
Merge remote-tracking branch 'origin/develop' into 1273_Skybox
...
# Conflicts:
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/gameServer/MainServerThread.java
# src/main/java/seng302/gameServer/MessageFactory.java
# src/main/java/seng302/gameServer/ServerToClientThread.java
# src/main/java/seng302/model/ClientYacht.java
# src/main/java/seng302/model/mark/MarkOrder.java
# src/main/java/seng302/visualiser/GameClient.java
# src/main/java/seng302/visualiser/GameView3D.java
# src/main/java/seng302/visualiser/controllers/ServerListController.java
# src/main/java/seng302/visualiser/controllers/dialogs/ServerCreationController.java
# src/main/resources/icons/bumperIcon.png
# src/main/resources/icons/handlingIcon.png
# src/main/resources/icons/velocity.png
# src/main/resources/icons/windWalkerIcon.png
# src/main/resources/views/RaceView.fxml
# src/main/resources/views/dialogs/ServerCreationDialog.fxml
2017-09-27 14:23:38 +13:00
edbfb2f84f
Modified timings for load screen.
2017-09-27 14:16:27 +13:00
c01111038f
Merge branch 'develop' into loading_screens
...
# Conflicts:
# src/main/resources/views/RaceView.fxml
2017-09-27 14:05:46 +13:00
fd53fd52a4
Forgot to git add the new icon.. again.. sorree
...
#story[1293]
2017-09-27 12:44:50 +13:00
6f62efcc93
Updated the icons to be more uniform and transparent
...
#story[1293]
2017-09-27 12:44:22 +13:00
daf3867433
Server discovery bug fixes & error handling improvements
...
- Fixed concurrency bug that prevented players from connecting to servers
- Discovery server can restart itself if it crashes
- Added nicer error handling for server discovery.
- Using AWS to get servers external IP address.
Tags: #story[1281]
2017-09-27 12:32:17 +13:00
e5af7bf666
Minor fixes. Only one person can have wind walker now. Tokens spawn at 30s rather than 15
...
#story[1293]
2017-09-27 12:06:16 +13:00
85ca91db96
Minor fixes. Only one person can have wind walker now. Tokens spawn at 30s rather than 15
...
#story[1293]
2017-09-27 11:55:40 +13:00
2eb7e603f1
Merge remote-tracking branch 'origin/develop' into 1293_PowerUps
2017-09-27 03:01:41 +13:00
658a342118
Added the bad random to git sorree forgot to git add
...
#story[1293]
2017-09-27 03:01:23 +13:00
c0bd498f1b
Added debugs for missing xml
2017-09-27 02:50:36 +13:00
ea52977aeb
Merge branch '1293_PowerUps' into 'develop'
...
1293 power ups
# Changes
* Token Objects added to represent pickups along with their corresponding mesh objects
* Yachts now have a powerup attribute
* Power up attribute is checked in Game State updates and updates are now done appropriately, dependant on this power up
* RaceViewController now has a grid pane to show the different power up icons. These will display when a token is picked up and blink when they are about to dissapear
* Token generator created. This generates token locations randomly in the map in circles centred between the legs of the race
* Added Yacht EventCodes for the different type of power / up / down status effect actions
# Refactor
* Moved Timer tasks such as spawn tokens and update wind into the GameState where they belong
* Moved the creation of some messages in odd places, server side, into the MessageFactory class
# Testing
* Manual test done
* Junits created for the random token generator
See merge request !77
2017-09-27 02:47:57 +13:00
10fa51a105
Added some testing for the Random spawner
...
#story[1293]
2017-09-27 02:27:30 +13:00
b18d9e8573
Added empty cucumber
...
#test
2017-09-27 02:04:58 +13:00
e9881bb24a
Added per map max player count. Handles case when map cannot fit players behind start mark. Added initial implementation for spacing out yachts.
...
#implement #story[1275]
2017-09-27 02:04:24 +13:00
Calum
alistairjmcintyre
Michael Rausch
Haoming Yin
William Muir
Peter Galloway
Kusal Ekanayake
Alistair McIntyre