Justin Shipsey
06c41f1c31
Merge branch 'shandley/disconnection-kick-warnings' into 'master'
...
Network timeout updates and singleplayer UI improvements
Closes #25
See merge request veloren/veloren!599
2019-11-07 02:06:05 +00:00
Joseph Gerardot
0a44e714b4
Cargo fmt
2019-11-06 20:57:05 -05:00
timokoesters
b6552556e7
fix: show error on client failure again
2019-11-07 09:42:03 +09:00
Joseph Gerardot
52020e4902
Don't use the actual multiline doc comment syntax.
2019-11-06 18:02:58 -05:00
Joseph Gerardot
e73884a1d4
Respond to MR feedback.
...
Mainly clean up code with better use of iterators, and rename the debug
command to be just `debug`.
2019-11-06 17:57:54 -05:00
Shane Handley
4df7e95331
Add a TODO regarding the future plan for the connection timeout setting.
2019-11-06 21:34:19 +01:00
Shane Handley
f7cfcc5394
Re-add the metrics port logging which was lost in the merge.
2019-11-06 21:34:19 +01:00
Shane Handley
0fabe70960
Ignore warning about variant never being constructed. It's being used
...
elsewhere. Not sure why that isn't being picked up.
2019-11-06 21:34:19 +01:00
Shane Handley
4330b33ce0
Hmm, alright have it your way rust. Not my change, so leaving it alone.
2019-11-06 21:34:18 +01:00
Shane Handley
fb3350c605
Removed error which is now handled by the ServerTimeout case
2019-11-06 21:34:18 +01:00
Shane Handley
15c725bfde
Address code review points:
...
- Clarify caffeine fueled comment
- Be better at comparing Instant's, and catch the 0 seconds case to say
Goodbye to the user
- Switch println for 'info!'
2019-11-06 21:34:18 +01:00
Shane Handley
b15c107f0b
Re-add the handling of error when the player loses connection on the character select screen.
2019-11-06 21:34:17 +01:00
Shane Handley
69b008e0e6
Fix issue with the timeout error showing when there is an intentional logout from the game.
2019-11-06 21:34:17 +01:00
Shane Handley
81f41e278e
Remove unused warn and fix dangling parameter.
2019-11-06 21:34:17 +01:00
timokoesters
4a65cddd15
improvement: remove wait because it now always retries
2019-11-06 21:34:16 +01:00
Shane Handley
26acd8b427
Bump up the timeout tie for booting the single player server
2019-11-06 21:34:16 +01:00
timokoesters
c733c95718
improvement: UI for connecting to singleplayer servers + threading fixes
2019-11-06 21:34:15 +01:00
timokoesters
21f126acd4
feat: show errors in main menu when client fails
...
Instead of `[ERROR] Failed to tick the scene: Network(Bincode(Io(Custom { kind: UnexpectedEof, error: "failed to fill whole buffer" })))`
2019-11-06 21:34:15 +01:00
Shane Handley
3b24af76ab
Formatting
2019-11-06 21:34:15 +01:00
Shane Handley
833c1d06b2
Fix chat-cli to account for new case.
2019-11-06 21:34:14 +01:00
Shane Handley
ef6f8b509a
Eeek, remove logging.
2019-11-06 21:34:14 +01:00
Shane Handley
fe9ad3fa19
Network timeout updates
...
- Bugfix: Check whether the server response (pong) is greater than the timeout period, rather than the ping (which will always fire regardless of connection status) This was causing the timeout error event to never fire.
- Feature: Send the player notifications to the chat window that they will be kicked due to disconnection for 6 seconds before kicking them back to the main menu.
2019-11-06 21:34:14 +01:00
Joseph Gerardot
7325757066
cargo fmt the previous changes.
2019-11-05 15:57:08 -05:00
Joseph Gerardot
eb1b42be0f
Add debug_items command
...
This command gives the player all debug items he does not currently
have.
2019-11-05 15:57:08 -05:00
Joseph Gerardot
fab5377eed
Add interface to add stuff in bulk to inventory
...
Also includes inventory tests.
inventory API.
2019-11-05 15:57:08 -05:00
Joshua Barretto
2134bf87a7
Smaller water details
2019-11-05 15:45:01 +00:00
Joshua Barretto
671313a523
Overhauled water shaders
2019-11-05 15:45:01 +00:00
Joshua Barretto
6d8d06ff7c
Smoother water
2019-11-05 15:45:01 +00:00
Joshua Barretto
7ecfde2925
Better water
2019-11-05 15:45:01 +00:00
Marcel
1e62e0077e
Merge branch 'soruh/audit-dependencies' into 'master'
...
Updated most dependencies. Removed potential vulnerability.
See merge request veloren/veloren!635
2019-11-05 11:14:39 +00:00
soruh
6dfa146484
Mitgated RUSTSEC-2019-0014 by updating noise and
...
disabling its default features, specifically `image`,
which had the vulnerability.
2019-11-05 11:14:39 +00:00
Marcel
776919bc6e
Merge branch 'soruh/update-toolchain' into 'master'
...
Update the toolchain to `nightly-2019-11-04`
See merge request veloren/veloren!645
2019-11-04 18:58:06 +00:00
soruh
e3bd152d24
update toolchain to nightly-2019-11-04
2019-11-04 18:26:32 +01:00
Marcel
41f46cb499
Merge branch 'angelonfira/add-lines-of-code-readme' into 'master'
...
Added lines of code badge into readme
See merge request veloren/veloren!622
2019-11-04 16:14:11 +00:00
Monty Marz
ceee89db63
Merge branch 'login_info' into 'master'
...
login info text
See merge request veloren/veloren!642
2019-11-01 20:53:52 +00:00
Monty Marz
240b620c13
login info text
2019-11-01 20:53:52 +00:00
Joshua Barretto
97eec62709
Merge branch 'soruh/calculate-spawn-point' into 'master'
...
dynamically calculate the spawn point's z coordinate
See merge request veloren/veloren!637
2019-11-01 00:24:18 +00:00
soruh
007920a238
iterate up to max_z + 1
...
(because max_z could still be a soild block)
2019-11-01 00:24:18 +00:00
Acrimon
b095a14c02
Merge branch 'xacrimon/update-lockfile' into 'master'
...
Updated lockfile.\
See merge request veloren/veloren!639
2019-10-30 23:34:33 +00:00
Acrimon
21ceb6994b
Updated lockfile.
2019-10-30 23:25:18 +01:00
Acrimon
167b88bac9
Merge branch 'xacrimon/artifacts-license' into 'master'
...
Add LICENSE to all builds.
Closes #364
See merge request veloren/veloren!638
2019-10-29 23:51:58 +00:00
Acrimon
1c9e311693
Fix #364 .
2019-10-29 23:48:15 +01:00
Acrimon
f724e80f2b
Merge branch 'xacrimon/remove-heaptrack' into 'master'
...
Remove heaptrack as it is now deprecated.
See merge request veloren/veloren!636
2019-10-29 06:55:45 +00:00
Acrimon
5beea76624
Remove heaptrack as it is now deprecated.
2019-10-29 06:55:45 +00:00
Acrimon
4a628125c4
Merge branch 'xacrimon/security-status' into 'master'
...
Add a security job which displays cargo-audit info
See merge request veloren/veloren!634
2019-10-28 19:28:11 +00:00
Acrimon
c4093956f7
Fix ci job.
2019-10-28 19:23:27 +01:00
Acrimon
64a9b0f1b1
Added basic security job that just runs audit.
2019-10-28 19:18:02 +01:00
Monty Marz
e4cf3405bc
Merge branch 'pfau/keybinds_item_desc' into 'master'
...
Updated: Help Window, Map, Item Descriptions
See merge request veloren/veloren!633
2019-10-27 22:22:40 +00:00
Monty Marz
a0a8011d7e
Updated: Help Window, Map, Item Descriptions
2019-10-27 22:22:40 +00:00
Justin Shipsey
a6d268e8ee
Merge branch 'slipped/skeletons' into 'master'
...
new skeletons
See merge request veloren/veloren!620
2019-10-27 14:06:54 +00:00
