00b09997b0
- Added Camera panning to chase camera mode.
...
tags : #story[1273]
2017-09-25 16:28:37 +13:00
d250c635d8
- Adjusted server tick rate to test smoothing
...
tags : #story[1273]
2017-09-25 15:32:13 +13:00
376c4d25a8
Merge branch 'develop' into 1273_Changing_Cameras
...
# Conflicts:
# src/main/java/seng302/model/ClientYacht.java
2017-09-25 14:40:19 +13:00
e66abb4340
- An attempt at chase cam smoothing. needs work.
...
tags : #story[1273]
2017-09-25 14:39:09 +13:00
22fdf1e4ac
Changed the boatType attribute from all around the place from String lit to enum
...
#story[1274]
2017-09-22 21:00:28 +12:00
6ff309a40c
- Perspective Camera Works
...
- Top Down Camera Works
- Started on chase cam but the math is a bit tricky.
tags : #story[1273]
2017-09-21 14:40:35 +12:00
c4a6113f6c
Minor bug fixes (like all enemy sails being toggled in when they should be out)
...
#story[1274]
2017-09-20 21:07:49 +12:00
47798b19fe
Added player position, boat speed, boat heading to race view.
...
#story[1245]
2017-09-13 11:22:05 +12:00
f0fc75feec
[WIP] Adding player position, boat speed, boat heading
...
#story[1245]
2017-09-12 18:25:46 +12:00
d223d393fa
Merge branch 'story1266_3d_model_factory' into NewUI_merge
2017-09-11 23:45:31 +12:00
878c0e0f43
Added ocean asset. Moved camera to center of race.
...
#story[1266]
2017-09-11 16:24:21 +12:00
1a755cec33
Fixed bug that caused mark arrows to be rendered on Marker id not LegNumber
...
#bugs
2017-09-07 16:25:55 +12:00
2331942bf9
Merge branch 'Story1124_Sparkline' into 'develop'
...
Fixing Ordering
# Changes
* Fixed ordering which was broken from a previous commit
* Removed Sparkline as we could not get it working in time
# Testing
* Manual testlog only
See merge request !65
2017-08-17 14:25:32 +12:00
39cfaf6780
Merge remote-tracking branch 'origin/develop' into Story80_BoatCustomization
...
# Conflicts:
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/gameServer/ServerPacketParser.java
# src/main/java/seng302/gameServer/ServerToClientThread.java
# src/main/java/seng302/gameServer/messages/ChatterMessage.java
# src/main/java/seng302/gameServer/messages/MarkRoundingMessage.java
# src/main/java/seng302/model/ServerYacht.java
# src/main/java/seng302/visualiser/ClientToServerThread.java
# src/main/java/seng302/visualiser/GameClient.java
# src/main/java/seng302/visualiser/GameView.java
2017-08-17 13:31:27 +12:00
3e383465a9
Attempted to fix sparklines, temporarily disabled them for end of sprint.
2017-08-17 13:12:09 +12:00
6e02d3e533
Added some general UI improvements such as autofilling the color field of the form, and looked at how best to deal with response packets, as it should be part of the spec.
...
tags: #story[1142]
2017-08-17 01:20:16 +12:00
87acce71ea
Merge branch 'develop' into story1118_map_arrows
...
# Conflicts:
# src/main/java/seng302/gameServer/MainServerThread.java
# src/main/java/seng302/model/RaceState.java
# src/main/java/seng302/visualiser/GameClient.java
# src/main/java/seng302/visualiser/controllers/RaceViewController.java
2017-08-17 00:52:41 +12:00
a59d06fbbf
Finish screen
2017-08-16 23:36:45 +12:00
c103595bba
Merge branch 'develop' into story1118_map_arrows
...
# Conflicts:
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/gameServer/MainServerThread.java
# src/main/java/seng302/model/RaceState.java
# src/main/java/seng302/visualiser/GameClient.java
2017-08-16 20:34:27 +12:00
958c1e216f
Fixed sail toggling issues and test.
2017-08-16 14:30:37 +12:00
ac47e9d88a
Game state now updates based on boat position. Arrows drawn as boat travels course. Currently do not point in correct direction, also the sparkline does not work.
...
#bug #refactor #implement #story[1118]
2017-08-16 03:51:48 +12:00
720ce0ae5b
Merged with develop. Moved all collision logic into game state.
...
#refactor
2017-08-16 01:04:16 +12:00
50baf6f85b
implemented race finish functionality, finish screen not loading properly yet #story[1124]
2017-08-15 20:48:51 +12:00
c125708a4a
Final commit for yacht refactor
...
tags: #story[1124] #pair[hyi25, wmu16]
2017-08-15 14:49:16 +12:00
Alistair McIntyre
William Muir
Kusal Ekanayake
Zhi You Tan
Zhi You Tan
Michael Rausch
Calum
alistairjmcintyre
Peter Galloway
Haoming Yin