Commit Graph

3129 Commits

Author SHA1 Message Date
Capucho
5fe9521233 Fix the spam on disconnect 2020-03-10 20:34:50 +00:00
Capucho
9d805a745e Proper fix to the logout timeout problem using Disconnect ACK 2020-03-10 20:34:50 +00:00
Capucho
d8ba63ffdc Janky fix of the logout timeout problem 2020-03-10 20:34:50 +00:00
Imbris
5598fe7166 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
80dafebac5 fix: #517 2020-03-09 20:52:04 +01:00
Marcel
ee0b214a33 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
1cbd07d5e5 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
c5ea78371c Merge branch 'songtronix/integrate-auth' into 'master'
Implement authentication

See merge request veloren/veloren!690
2020-03-08 23:36:25 +00:00
Acrimon
bc39b78173 Rebased. 2020-03-08 23:02:15 +01:00
Imbris
0e86197ebe Move changelog entry back up to the unreleased section 2020-03-08 23:00:39 +01:00
Imbris
8d7c454029 Hide password text 2020-03-08 23:00:34 +01:00
Imbris
0022f8464d Update auth 2020-03-08 22:59:22 +01:00
Songtronix
d2e12fd166 feat(auth): localisation of authentication errors 2020-03-08 22:58:43 +01:00
Imbris
a04c1b1d1d Add uid to Player component
fix: world examples
2020-03-08 22:58:38 +01:00
Acrimon
b29e543089 Remove account on logout. 2020-03-08 22:57:19 +01:00
Acrimon
3995f099b0 Fix singleplayer crash. 2020-03-08 22:57:13 +01:00
Acrimon
d4225cfb45 Auth error help message.
main menu message about auth
2020-03-08 22:57:09 +01:00
Acrimon
e18e2e1901 Update readme with signup link.
add changes to changelog
2020-03-08 22:57:02 +01:00
Imbris
6cc07270ac improve(login): more precise error handling during login 2020-03-08 22:56:59 +01:00
Acrimon
d3412d5493 Fixed gameserver crash on authprovider error. 2020-03-08 22:56:44 +01:00
Acrimon
08b4cc5fc3 Update auth to use new hashing scheme. 2020-03-08 22:56:34 +01:00
Songtronix
ac5ff453cc improve(voxygen): error handling while connecting 2020-03-08 22:54:49 +01:00
Acrimon
7db0ff0b8c Update chat-cli to work properly.
Update reqwest to 0.10.0
2020-03-08 22:54:15 +01:00
Imbris
8ef1251dc2 Add warning prompt for untrusted auth servers, move some auth code into 2020-03-08 22:51:37 +01:00
Acrimon
403deecc6d Server auth handling improvements. 2020-03-08 22:49:47 +01:00
Acrimon
584dcddba9 Updated to latest and greatest auth version. 2020-03-08 22:46:40 +01:00
Songtronix
50b845d1c3 :/ and reactivated the password field 2020-03-08 22:34:06 +01:00
Justin Shipsey
3672f4916e Merge branch 'snowram/eagle' into 'master'
eagle npc

See merge request veloren/veloren!839
2020-03-08 15:46:13 +00:00
Justin Shipsey
68df685238 Merge branch 'snowram/eagle' into 'snowram/eagle'
more eagle adjustements

See merge request veloren/veloren!838
2020-03-08 15:07:47 +00:00
Snow
72b2334434 more eagle adjustements 2020-03-08 15:07:47 +00:00
jshipsey
d4332c3138 eagle adjustments 2020-03-07 13:26:46 -05:00
Songtronix
d5c3034b8f Merge branch 'songtronix/introduce-codeowners' into 'master'
add CODEOWNERS file

See merge request veloren/veloren!698
2020-03-07 02:39:20 +00:00
Songtronix
c433e5e64d add: CODEOWNERS file
introduces the need of approval by a specific group/person for the MR to be merged based on which part of the codebase is being touched
2020-03-06 19:10:27 +01:00
Imbris
bf2844c71f Merge branch 'imbris/character-rendering' into 'master'
Remove `Client` dependency from Scene and implements #506

Closes #506

See merge request veloren/veloren!831
2020-03-06 18:09:30 +00:00
Imbris
ed5afaec8a Fix tests 2020-03-05 23:12:51 -05:00
Imbris
4a0c474be1 Remove Client dependency from Scene types and audio managers, add an
example for using voxygen as a library to renderer images of characters
2020-03-05 23:12:51 -05:00
Acrimon
511bbd3899 Merge branch 'capucho/screenshots-logs-directory' into 'master'
Save screenshots and logs in a fixed directory

Closes #484

See merge request veloren/veloren!835
2020-03-05 19:26:07 +00:00
S Handley
ea53dea8a7 Fixes https://gitlab.com/veloren/veloren/issues/484 partially by saving logs to a fixed place (defined in the settings file) 2020-03-05 19:26:07 +00:00
Acrimon
30f84c0115 Merge branch 'capucho/add-pause-single-player-when-in-pause-menu' into 'master'
Pause when in singleplayer and pause menu

Closes #36

See merge request veloren/veloren!833
2020-03-05 19:18:20 +00:00
Capucho
a3479f6a49 Fixed the bugs in the settings tab and the character button in the escape menu and unpause when there is more than 1 player 2020-03-05 18:55:14 +00:00
Capucho
6f6b8986b6 Removed logging, added the changes to the changelog and fixed the logout button 2020-03-05 18:55:14 +00:00
Capucho
f13314e3da Fixed the erroneous load on pause 2020-03-05 18:38:39 +00:00
Capucho
af21d19ff3 Moved paused from GlobalState to SinglePlayer to prevent errors and unpauses now works using the resume button 2020-03-05 18:38:39 +00:00
Capucho
a97b694dfe Groundwork for fixing #36 and rewrite of client timeouts so that they don't use Instant and Duration 2020-03-05 18:38:39 +00:00
Justin Shipsey
68fbc2d1b6 Merge branch 'slipped/attack-anim-experiment' into 'master'
weapon control bone

See merge request veloren/veloren!828
2020-03-05 14:02:11 +00:00
Justin Shipsey
86e15695fc weapon control bone 2020-03-05 14:02:11 +00:00
Imbris
3c7a8a7ce7 Merge branch 'shandley/deselect-after-drop' into 'master'
Deselect the inventory slot after dropping an item.

Closes #510

See merge request veloren/veloren!836
2020-03-05 07:43:54 +00:00
Shane Handley
9d8d61736b Deselect the inventory slot after dropping an item. 2020-03-05 16:11:45 +09:00
Acrimon
7478d1a063 Merge branch 'shandley/inventory-sfx' into 'master'
Add inventory SFX

Closes #485

See merge request veloren/veloren!810
2020-03-04 10:09:48 +00:00
S Handley
b0ca85069b Piggyback on the InventoryUpdate events and attach some additional event info so that we can detect why the inventory update was triggered, and emit an associated sfx event that matches it. 2020-03-04 10:09:48 +00:00