Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,563 Commits 151 Branches 18 Tags 2.1 GiB
c7ea687ebb
Commit Graph

3563 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Adam Whitehurst
344bb955a2 rename get_tool_data to unwrap_tool_data 2020-03-08 21:28:45 -07: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
jshipsey
bce9d4c24f animation corrections 2020-03-08 17:02:25 -04:00
Capucho
a391f2e0f2 Switch states instead of popping 2020-03-08 20:31:27 +00:00
Adam Whitehurst
5f8751e2d3 Begin implementing triple attack 2020-03-08 12:37:17 -07:00
Adam Whitehurst
fe1feebeb2 Renaming fn's 2020-03-08 10:38:40 -07:00
Adam Whitehurst
698fe9f451 More util fn's, add comments 2020-03-08 10:38:18 -07:00
Adam Whitehurst
f769c74bf4 Add charging back 2020-03-08 10:04:26 -07: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
Adam Whitehurst
adf34d4f0f User constants, faster characters 2020-03-08 08:38:53 -07: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
Marcel Märtens
1b9d1dc333 update toolchain to nightly-2020-03-05 2020-03-08 13:05:38 +01:00
Capucho
fb4aba9bb7 Fix the spam on disconnect 2020-03-08 08:54:29 +00:00
Capucho
ca6d5ab506 Proper fix to the logout timeout problem using Disconnect ACK 2020-03-08 08:13:19 +00:00
Adam Whitehurst
5a9a8323f2 Update utils/handle_move fn's 2020-03-07 15:45:10 -08:00
Capucho
99e64d06b9 Janky fix of the logout timeout problem 2020-03-07 22:14:21 +00:00
Adam Whitehurst
49c7143144 Clean up warnings 2020-03-07 13:03:10 -08:00
Adam Whitehurst
54a7112ad9 resolve conflicts merging master -> clientstates 2020-03-07 12:49:48 -08:00
Adam Whitehurst
096d3b691e Merge master 2020-03-07 12:49:15 -08:00
Adam Whitehurst
c678ca9540 Re-add blocking 2020-03-07 11:55:15 -08:00
Adam Whitehurst
cb9e3859da Rename character behavior sys 2020-03-07 11:02:54 -08:00
jshipsey
d4332c3138 eagle adjustments 2020-03-07 13:26:46 -05:00
Adam Whitehurst
b1d1299fe6 Clean up character states 2020-03-07 10:15:02 -08: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