3131 Commits

Author SHA1 Message Date
Capucho
6625a356ef Rebased on master and moved logout message to events 2020-03-10 21:04:13 +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
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
Acrimon
db427a2c18 Server auth handling improvements. 2020-03-08 22:49:47 +01:00
Acrimon
f4689db333 Updated to latest and greatest auth version. 2020-03-08 22:46:40 +01:00
Songtronix
0997620381 :/ and reactivated the password field 2020-03-08 22:34:06 +01:00
Justin Shipsey
7c9f0a8416 Merge branch 'snowram/eagle' into 'master'
eagle npc

See merge request veloren/veloren!839
2020-03-08 15:46:13 +00:00
Justin Shipsey
1044819cd9 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
a3ceac99c3 more eagle adjustements 2020-03-08 15:07:47 +00:00
jshipsey
ec53045893 eagle adjustments 2020-03-07 13:26:46 -05:00
Songtronix
7b6670b212 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
05f3b7f253 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
4a916e41ae 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
06759a6ed7 Fix tests 2020-03-05 23:12:51 -05:00
Imbris
0feb44047a 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
3f3958543f 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
936f370960 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
5b8bc3bb22 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
ee6cc91479 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
3a5b2c81ce Removed logging, added the changes to the changelog and fixed the logout button 2020-03-05 18:55:14 +00:00
Capucho
1a504f5a67 Fixed the erroneous load on pause 2020-03-05 18:38:39 +00:00
Capucho
218b75616e 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
005bca6230 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
55fa458d12 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
f8d18e4913 weapon control bone 2020-03-05 14:02:11 +00:00
Imbris
074f69cc9d 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
5b370a4f86 Deselect the inventory slot after dropping an item. 2020-03-05 16:11:45 +09:00