2e7487fdfc
- Chase Camera:
...
- Has panning bounds, zoom bounds, and general tidy up.
- Now correctly observes the boat object rather than getting information from both the boat object AND the client yacht model.
Top Down Camera:
- Can only pan within certain bounds now, and will continue to follow the boat regardless.
- Can only zoom within certain bounds now.
Isometric Camera:
- Nothing changed.
#tags [1273]
2017-09-26 15:06:21 +13:00
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
a19e191684
- Chase cam kind of working, need to find a fix for the abrupt direction change.
...
tags : #story[1273]
2017-09-25 14:03:47 +13:00
0a885dd8fd
Clean up changes
...
#story[1274]
2017-09-23 15:37:16 +12:00
e9b50038a9
Balance changes. Always wanted to use that as a commit message.
...
#story[1274]
2017-09-23 15:09:22 +12:00
364264377a
Fixed merge errors and reimplemented handling multiplier
...
#story[1274]
2017-09-23 15:04:11 +12:00
9112183ac3
Merge branch 'develop' into Story1274_custom_boat_stats
...
# Conflicts:
# src/main/java/seng302/model/ServerYacht.java
# src/main/java/seng302/visualiser/controllers/dialogs/BoatCustomizeController.java
2017-09-23 14:48:50 +12: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
da8c91f5c1
Review fixes for merge request.
...
PlayerCell now takes in the yacht for construction rather than taking in a whole lot of values extracted from the yacht
Reduced boiler plate in BoatCustomizeController
#story[1274]
2017-09-22 20:44:06 +12:00
52dc7a956d
Turned handling into a multiplier.
...
#story[1274]
2017-09-22 17:42:32 +12:00
9f64b2380d
Implemented acceleration and full loading bars.
...
#story[1274]
2017-09-22 17:28:42 +12:00
b05580f018
Worked on making a visual component to the stats. Need to implement acceleration.
...
#story[1274]
2017-09-22 16:45:10 +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
307e79ecfc
Completed working boat selection screen.
...
When a user selects a different boat, it is sent to all other clients and updates accordingly. Boats are all shown with their correct models in game.
#story[1274]
2017-09-20 20:46:23 +12:00
7d8a6afa5f
Merge branch 'new_meshes' into Custom_boat_selection
2017-09-20 19:40:43 +12:00
ea0be5e952
Added pirate ship meshes to application. Updated boat model to allow for jib sails and a fixed sail. #story[1274]
2017-09-20 17:56:07 +12:00
fba522d0c3
Fixed BoatMeshType enum names.
...
#fix
2017-09-20 16:44:38 +12:00
0e829874c2
Fixed BoatMeshType enum names.
...
#fix
2017-09-20 16:43:04 +12:00
c5d56065b6
Fixed cat ate a meringue sail rotation.
...
#fix #story[1274]
2017-09-20 16:42:26 +12:00
410d765745
Started working on the boat selection screen.
...
Customised the boat customisation UI to contain it. Need to have another boat to test whether we can switch boats and also if the messages get sent correctly.
#story[1274]
2017-09-20 16:36:27 +12:00
fe76e85c71
Merge branch 'develop' into new_meshes
2017-09-20 15:59:01 +12:00
9d61a43bd7
Added catamaran mesh to possible boat meshes. Made catamaran the default boat.
...
#implement #story[1274]
2017-09-20 15:58:22 +12:00
0f5137c2b6
Fixed the orientation of .stl files.
...
#fix
2017-09-19 14:52:02 +12:00
02df69b7b4
- Merged Dev into branch
...
Tags: #story[1245]
2017-09-14 15:27:10 +12:00
242132b800
Merge remote-tracking branch 'origin/develop' into NewUI_merge
...
# Conflicts:
# src/main/resources/views/RaceView.fxml
2017-09-14 15:26:57 +12:00
3a671d4ed0
- Added Values to Finish Dialog.
...
Tags: #story[1245]
2017-09-14 15:24:58 +12:00
482d987839
- Fixed Null Pointer
...
- Build Should pass
Tags: #story[1245]
2017-09-14 15:10:48 +12:00
33779ad5c1
Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge
...
# Conflicts:
# src/main/resources/views/RaceView.fxml
2017-09-14 14:42:57 +12:00
3a41c27d8d
- Race Finish Dialog showing up, unsure if its actually showing the correct ordering or not.
...
tags : #story[1245]
2017-09-14 14:42:25 +12:00
e24203904b
Removed print statements.
...
#chore
2017-09-14 14:37:22 +12:00
eb188495ce
Fixed position issues on exit arrows.
...
#implement #story[1266] #fix
2017-09-14 14:32:45 +12:00
62a7e2b8fa
Fixed position issues on entry arrows.
...
#implement #story[1266] #fix
2017-09-14 14:21:04 +12:00
acd0e790fe
Added method to send server debug messages to players
...
Tags: #story[1246]
2017-09-14 14:14:21 +12:00
bf427f24d3
- Created a Race Finish Dialog.
...
tags : #story[1245]
2017-09-14 13:34:48 +12:00
7d0a47446d
- Fixed bug in customize dialog.
...
tags : #story[1245]
2017-09-14 13:02:31 +12:00
889098bb50
- Commented out broken test (non-deterministic thing)
...
- Merged 3d factory branch in
tags : #story[1245]
2017-09-14 12:46:17 +12:00
6223a8fc0b
Merge remote-tracking branch 'origin/story1266_3d_model_factory' into NewUI_merge
...
# Conflicts:
# src/main/java/seng302/visualiser/GameView3D.java
2017-09-14 12:40:20 +12:00
391bd33548
Fixed position issues on first 2 mark arrows.
...
#implement #story[1266]
2017-09-14 12:38:36 +12:00
7e0c2abbfd
- Fixed a shutdown bug that left the game process running long after the window shut
...
- Changed SVG Icon for volume toggle to something a bit nicer
tags : #story[1245]
2017-09-14 12:31:49 +12:00
42a5e86bf8
Merge remote-tracking branch 'origin/NewUI_merge' into story1266_3d_model_factory
...
# Conflicts:
# src/main/java/seng302/visualiser/GameView3D.java
2017-09-14 12:06:19 +12:00
20d73d8f2f
Removed dead code from fxObjects and GameView 3D
...
#chore
2017-09-14 12:05:20 +12:00
0a62c538ca
Added 3D mark arrows and cleaned up other classes.
2017-09-14 11:28:50 +12:00
d9247eb031
Added player position, boat speed, boat heading to race view.
...
#story[1245]
2017-09-13 11:21:33 +12:00
7b0d31438e
Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge_ryan
2017-09-13 09:44:17 +12:00
f0fc75feec
[WIP] Adding player position, boat speed, boat heading
...
#story[1245]
2017-09-12 18:25:46 +12:00
c8dc448a52
Added tests for sounds and modified the transparency for the chat history window.
...
#story[1245]
2017-09-12 18:11:32 +12:00
alistairjmcintyre
Alistair McIntyre
Kusal Ekanayake
William Muir
Peter Galloway
Calum
Michael Rausch
Zhi You Tan
Zhi You Tan