658a342118
Added the bad random to git sorree forgot to git add
...
#story[1293]
2017-09-27 03:01:23 +13:00
10fa51a105
Added some testing for the Random spawner
...
#story[1293]
2017-09-27 02:27:30 +13:00
c54a1e141d
Merge remote-tracking branch 'origin/develop' into 1293_PowerUps
...
# Conflicts:
# src/main/resources/views/RaceView.fxml
2017-09-27 01:49:18 +13:00
6d51ea3574
Created a random place token generator.
...
Generates a location between any leg of the race in a random angle / distance of the radius of the centre point of the two gates to one of the gates
#story[1293]
2017-09-27 01:44:01 +13:00
d56468e4aa
- Fixed snackbar not showing on race view
...
- Added close label on server creation dialog
#story[1273]
2017-09-27 00:38:42 +13:00
5248921576
Multiple fixes:
...
- fix last button no longer default focused when loading keybinding dialog
- fix click and mouse exit still focused on button
- closing keybinding does not focus on chat anymore
#story[1273]
2017-09-26 22:52:58 +13:00
330ccd272d
The random token now has a 50% chance of causing your boat to have a speed penalty
...
#story[1293]
2017-09-26 21:13:35 +13:00
4b7dfe38c4
Fixed Boats powering up and down correctly. Icons respond correctly
...
#story[1293]
2017-09-26 19:43:32 +13:00
ab07c7f298
Merge remote-tracking branch 'origin/develop' into 1293_PowerUps
...
# Conflicts:
# src/main/java/seng302/visualiser/GameView3D.java
2017-09-26 19:01:53 +13:00
b5076bc976
Fixed wind walker and bumper
...
Added a hack to bumper so that the collision distance is larger than the regular collision distance
Wind walker now makes you go at you max speed rather than VMG speed
#story[1293]
2017-09-26 18:57:15 +13:00
2dcdd1c248
Merge branch '1273_Changing_Cameras' into 'develop'
...
1273 changing cameras
# Multiple Camera Views
## 3 Camera Views Implemented
1. Normal 3D (Isometric)
2. Top Down Perspective
3. Chase Cam (Over the Shoulder)
- Isometric and Top Down Perspectives can Pan within limits.
- Chase Cam rotates the camera around the boat. (While still following it)
- All camera views can Zoom.
# Testing
No testing completed other than manually testing myself. A proper manual test should be completed by the merger.
See merge request !76
2017-09-26 18:36:59 +13:00
9b00f76907
removed print statements and added documentation.
...
tags : #story[1273]
2017-09-26 18:36:13 +13:00
f11c457d28
removed print statements
...
tags : #story[1273]
2017-09-26 18:31:47 +13:00
9e4fa30787
Merge branch 'issue68_boat_not_turning_on_starbord_vmg' into 'develop'
...
the boat can now turn after snapping to starboard vmg #story[1273]
See merge request !75
2017-09-26 18:11:24 +13:00
99ce4fa11d
Merged develop in and reimplemented keybindings for moving the camera.
...
tags : #story[1273]
2017-09-26 18:01:39 +13:00
69d1fa9488
Merge branch 'develop' into 1273_Changing_Cameras
2017-09-26 17:36:40 +13:00
66e6a8a2a4
- Small Changes
...
tags : #story[1273]
2017-09-26 17:35:36 +13:00
8ba44d7476
Minor commit for testing
...
#story[1293]
2017-09-26 17:19:45 +13:00
dd43097677
the boat can now turn after snapping to starboard vmg #story[1273]
2017-09-26 17:07:55 +13:00
1a53579317
- Isometric Camera
...
- Zoom Bounds added.
- Camera Panning Bounds added. Need to be tested with extra maps.
tags : #story[1273]
2017-09-26 16:57:07 +13:00
132a729758
Temporarily added more options in key binding dialog. But still need to implement binding after camera story has been merged into develop
...
tags: #story[1273]
2017-09-26 15:49:16 +13:00
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
1bd4db73cd
Issue 66: client side error pop ups use default javaFx style
...
- created JFeonix style pop up to replace the default one
tags: #story[1273]
2017-09-26 14:44:37 +13:00
7a4cdbe0c9
Fixed WindWalker
...
#story[1293]
2017-09-26 11:12:29 +13:00
7027de80c4
Fixed issues with correct protocol implementation.
...
#issue[64] #fix #testmanual
2017-09-25 22:09:26 +13:00
0211f2df38
Merged dev back on
...
#story[1293]
2017-09-25 17:38:09 +13:00
dba5a5680f
Merge remote-tracking branch 'origin/develop' into 1293_PowerUps
...
# Conflicts:
# src/main/java/seng302/model/ServerYacht.java
# src/main/resources/views/RaceView.fxml
2017-09-25 17:20:25 +13:00
0e93be7b36
Fixed send button traversable issue.
...
- removed sensitive characters.
#story[1278] #pair[hyi25, zyt10]
2017-09-25 17:06:36 +13:00
191b818e38
Added close button for keyBindingDialog.
...
- fixed that you cannot bind the key you are using.
#story[1278] #pair[hyi25, zyt10]
2017-09-25 16:31:28 +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
29b97a194d
Merged dev back on
...
#story[1293]
2017-09-25 11:26:44 +13:00
8a0ad8d6a9
Merge remote-tracking branch 'origin/develop' into 1293_PowerUps
...
# Conflicts:
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/model/ServerYacht.java
2017-09-25 11:19:10 +13:00
19db6668da
Fixed merge conflicts in server yacht
...
tags #story[1278]
2017-09-25 11:09:14 +13:00
44275aec04
Merge branch 'develop' into Story1278_keybindings
...
# Conflicts:
# src/main/java/seng302/model/ServerYacht.java
2017-09-25 11:06:28 +13:00
aa0149b9a7
Merge branch 'develop' into Story1274_custom_boat_stats
2017-09-24 18:08:54 +13:00
f6b41f0513
Fixes Issue #59
2017-09-24 18:06:26 +13:00
8dfdb228e9
Fixed a bug that game client tries to send turning mode packet when there is no socketThread
...
- add a if statement to check if socketThread is initialized before sending packet.
#story[1278]
2017-09-23 21:04:57 +12:00
1042817e4e
Snackbar's color can be changed according to the message type
...
- load a separate css file to change the color
- if the assignment failed, the snackbar prompt will be red, otherwise theme color
#story[1278]
2017-09-23 20:59:29 +12:00
066557584f
Implemented turning mode toggle
...
- when the mode is toggled, a boat action package will be sent to notify server
to change the boat's turning mode
- turning mode toggle is now fully functional
#story[1245]
2017-09-23 19:37:13 +12:00
4011295b8b
Slightly optimised code style and add more functionality
...
- optimised UI
- check conflicts when change key bind if the key has already been in use
- abstract keybind as a separate singleton class so all class can access it
- [WIP] turning mode is need to be finished
#story[1245]
2017-09-23 17:52:48 +12:00
78259f8e33
Boat now changes color when it is bumped for a time
...
ClientYacht: Added ColorChangeListener from GameView3D to re paint the boat when the color attribute is changed
#story[1293]
2017-09-23 16:54:03 +12:00
c47e5b1450
Boat now changes color when it is bumped for a time
...
ClientYacht: Added ColorChangeListener from GameView3D to re paint the boat when the color attribute is changed
#story[1293]
2017-09-23 16:31:18 +12: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
William Muir
Zhi You Tan
Michael Rausch
Alistair McIntyre
Peter Galloway
Haoming Yin
alistairjmcintyre
Calum
Zhi You Tan
Kusal Ekanayake