3159 Commits

Author SHA1 Message Date
Acrimon
884d644448 Merge branch 'shandley/fix-dropped-pickup-range' into 'master'
Fix: Make the dropped item collection range match the world item range limit.

See merge request veloren/veloren!848
2020-03-19 20:30:09 +00:00
Joshua Barretto
72e483df00 Merge branch 'zesterer/small-fixes' into 'master'
Small Fixes

See merge request veloren/veloren!851
2020-03-17 17:48:43 +00:00
Joshua Barretto
99bc1825d3 Omitted unnecessary test 2020-03-17 16:37:39 +00:00
Joshua Barretto
5c58fd318d Fixed remaining pathfinding issues 2020-03-17 14:14:20 +00:00
Joshua Barretto
6b13f305eb Nicer point lights 2020-03-17 13:29:42 +00:00
Songtronix
5f7a49d2d4 Merge branch 'songtronix/remove-runtime-dep' into 'master'
fix: do not depend on hash file during runtime

See merge request veloren/veloren!849
2020-03-15 08:34:15 +00:00
Songtronix
5cbd629118 fix: do not depend on hash file during runtime 2020-03-15 09:02:56 +01:00
Shane Handley
7ad3cfa4d1 Fix: Make the dropped item collection range match the world item range limit. 2020-03-12 11:54:23 +09:00
Marcel
425c7052f9 Merge branch 'shandley/inventory-full-handling' into 'master'
Feedback when collecting an item while inventory is full

Closes #459

See merge request veloren/veloren!847
2020-03-11 10:31:00 +00:00
S Handley
2864e7603a Add audio and chat message feedback when the player attempts to collect something while thier inventory is full. 2020-03-11 10:30:59 +00:00
Acrimon
4eed065bd9 Merge branch 'shandley/collect-block-mousedown-only' into 'master'
Check for the mousedown state before trying to collect an item via secondary mouse click.

See merge request veloren/veloren!846
2020-03-11 08:07:34 +00:00
Shane Handley
f595dad1f8 Check for the mousedown state before trying to collect an item via secondary mouse click. 2020-03-11 15:39:46 +09:00
Marcel
a4bf2f9ca8 Merge branch 'mckol/update-ci' into 'master'
Made the CI fail if Cargo.lock would be changed by cargo build

Closes #110

See merge request veloren/veloren!845
2020-03-11 00:05:34 +00:00
Imbris
fa1f24ec2e Merge branch 'imbris/se-latency' into 'master'
Rearrange some operations in the server tick to reduce clientside latency of ServerEvent mediated effects

See merge request veloren/veloren!840
2020-03-10 23:21:57 +00:00
Mckol
665795d1c9 Made the CI fail if Cargo.lock isn't up-to-date 2020-03-10 23:32:33 +01:00
Acrimon
2dddc2e692 Merge branch 'capucho/voxygen-logout-timeout' into 'master'
FIX #513 logout timeout

See merge request veloren/veloren!837
2020-03-10 22:12:29 +00:00
Capucho
1437d51c67 removed merge artifact 2020-03-10 21:09:38 +00:00
Capucho
b4969e0233 Merge branch 'capucho/voxygen-logout-timeout' of gitlab.com:veloren/veloren into capucho/voxygen-logout-timeout
Fixed conflicts
2020-03-10 21:06:08 +00:00
Capucho
6625a356ef Rebased on master and moved logout message to events 2020-03-10 21:04:13 +00:00
Mckol
de48300c78 Merge branch 'controller' into 'master'
Controller support

Closes #20

See merge request veloren/veloren!750
2020-03-10 21:00:13 +00:00
Mckol
aec086a10d Added Controller support 2020-03-10 21:00:13 +00:00
Acrimon
7aa102415e Merge branch 'shandley/pickup-player-relative' into 'master'
Constrain item pickup range

See merge request veloren/veloren!843
2020-03-10 20:50:04 +00:00
S Handley
fdefcf3926 Check that a targeted collectible is within a certain pickup range of the character before highlighting it 2020-03-10 20:50:04 +00:00
Capucho
62a5a0ae2c Switch states instead of popping 2020-03-10 20:34:50 +00:00
Capucho
d8e65318cb Fix the spam on disconnect 2020-03-10 20:34:50 +00:00
Capucho
cc5845d756 Proper fix to the logout timeout problem using Disconnect ACK 2020-03-10 20:34:50 +00:00
Capucho
d131a5ce8f Janky fix of the logout timeout problem 2020-03-10 20:34:50 +00:00
Imbris
0049ee4bac Add metric for new connection handling time, move StateExt to its own module 2020-03-09 22:39:12 -04:00
Imbris
c72148a587 Rearrange some operations in the server tick to reduce clientside latency of ServerEvent mediated effects 2020-03-09 22:31:24 -04:00
Imbris
29a95bc1c8 Merge branch 'songtronix/fix-517' into 'master'
fix #517

Closes #517

See merge request veloren/veloren!842
2020-03-09 23:25:04 +00:00
Songtronix
29c27e1151 fix: #517 2020-03-09 20:52:04 +01:00
Marcel
5f448867c1 Merge branch 'xMAC94x/cargolock' into 'master'
regenerated Cargo.lock, requiering 7 less dependent crates and greatly...

See merge request veloren/veloren!841
2020-03-09 12:35:43 +00:00
Marcel Märtens
accfd5b9f8 regenerated Cargo.lock, requiering 7 less dependent crates and greatly reducing size of cargo.lock file 2020-03-09 11:49:57 +01:00
Acrimon
a593f97425 Merge branch 'songtronix/integrate-auth' into 'master'
Implement authentication

See merge request veloren/veloren!690
2020-03-08 23:36:25 +00:00
Acrimon
ea33a8e2b3 Rebased. 2020-03-08 23:02:15 +01:00
Imbris
69f1a1597c Move changelog entry back up to the unreleased section 2020-03-08 23:00:39 +01:00
Imbris
b451baa1fc Hide password text 2020-03-08 23:00:34 +01:00
Imbris
88fdff77c4 Update auth 2020-03-08 22:59:22 +01:00
Songtronix
7b218b9054 feat(auth): localisation of authentication errors 2020-03-08 22:58:43 +01:00
Imbris
1ccff31be5 Add uid to Player component
fix: world examples
2020-03-08 22:58:38 +01:00
Acrimon
19b56afc3d Remove account on logout. 2020-03-08 22:57:19 +01:00
Acrimon
0024fe2d0b Fix singleplayer crash. 2020-03-08 22:57:13 +01:00
Acrimon
026a3647b2 Auth error help message.
main menu message about auth
2020-03-08 22:57:09 +01:00
Acrimon
504f225acb Update readme with signup link.
add changes to changelog
2020-03-08 22:57:02 +01:00
Imbris
59011de228 improve(login): more precise error handling during login 2020-03-08 22:56:59 +01:00
Acrimon
0716b9b8e9 Fixed gameserver crash on authprovider error. 2020-03-08 22:56:44 +01:00
Acrimon
20ac07374f Update auth to use new hashing scheme. 2020-03-08 22:56:34 +01:00
Songtronix
0b78b31666 improve(voxygen): error handling while connecting 2020-03-08 22:54:49 +01:00
Acrimon
c6a159ff14 Update chat-cli to work properly.
Update reqwest to 0.10.0
2020-03-08 22:54:15 +01:00
Imbris
d066505bd3 Add warning prompt for untrusted auth servers, move some auth code into 2020-03-08 22:51:37 +01:00