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,281 Commits 151 Branches 18 Tags 2.1 GiB
19a09782a0
Commit Graph

1410 Commits

Author SHA1 Message Date
Pfauenauge90
7ded921ecc more UI visuals 2020-03-16 22:58:19 +01:00
timokoesters
b040e18246 Fix body parts not changing 2020-03-16 22:06:23 +01:00
Pfauenauge90
11e4289f28 small fixes 2020-03-16 20:50:01 +01:00
Pfauenauge90
2e41b59282 removed character window and questlog 2020-03-16 19:56:15 +01:00
Pfauenauge90
b9f61d4e7a UI colourable in the code, stats window 2020-03-16 18:55:43 +01:00
Pfauenauge90
ab8b83f8d6 more bag parts 2020-03-16 18:55:31 +01:00
timokoesters
d5db1f6ca0 Add dash ability to sword M2 2020-03-16 16:34:53 +01:00
timokoesters
81591fcaf7 Make npcs attack again 2020-03-16 14:27:52 +01:00
timokoesters
1279f70184 Add shield item 2020-03-16 13:40:14 +01:00
timokoesters
4195273cf9 Adjust first person camera and underwater wield orientation 2020-03-16 13:19:51 +01:00
timokoesters
87acc01d48 Readd ranged and debug boost. Add bouncing while running in first person 2020-03-16 12:32:57 +01:00
Pfauenauge90
db6099a62f reenabled inventory slots 2020-03-15 19:48:02 +01:00
timokoesters
1f78344d6f Move equipment from loadout into body 2020-03-15 19:44:47 +01:00
Pfauenauge90
817cd24d54 minimap scale 2020-03-15 16:53:28 +01:00
Pfauenauge90
492db3ac5f minimap position 2020-03-15 16:53:28 +01:00
Pfauenauge90
7b77064539 mmap visuals 2020-03-15 16:52:38 +01:00
Pfauenauge90
caf4159463 UI changes 2020-03-15 16:50:37 +01:00
Joshua Barretto
e20feeeb0c Added armour items and equipping of armour 2020-03-15 16:42:09 +01:00
Pfauenauge90
1b170f70c3 Even less blending. 2020-03-15 15:53:51 +01:00
Pfauenauge90
0e7f3a6b00 Update vol.rs 2020-03-15 15:53:51 +01:00
timokoesters
aa963b7686 Merge remote-tracking branch 'origin/master' into clientstates 2020-03-15 15:27:06 +01:00
timokoesters
598a4c6cbb Add loadout struct for info on weapon configurations 2020-03-14 22:33:20 +01:00
AdamWhitehurst
6fc94c22ba Update timed combo, add CharacerBehavior trait 2020-03-14 12:50:07 -06:00
timokoesters
fe19698d52 Make abilities depend on weapon 2020-03-14 16:40:29 +01:00
Shane Handley
434dd96cd6 Check for the mousedown state before trying to collect an item via secondary mouse click. 2020-03-11 15:39:46 +09:00
Acrimon
406767ae31 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
Mckol
c3f1afdf2b Merge branch 'controller' into 'master' 
Controller support

Closes #20

See merge request veloren/veloren!750
 2020-03-10 21:00:13 +00:00
Mckol
8838682f0b Added Controller support 2020-03-10 21:00:13 +00:00
S Handley
b2312a0487 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
16e4214a52 Switch states instead of popping 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
Acrimon
bc39b78173 Rebased. 2020-03-08 23:02:15 +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
d4225cfb45 Auth error help message. 
main menu message about auth
 2020-03-08 22:57:09 +01:00
Imbris
6cc07270ac improve(login): more precise error handling during login 2020-03-08 22:56:59 +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
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
Snow
72b2334434 more eagle adjustements 2020-03-08 15:07:47 +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
jshipsey
d4332c3138 eagle adjustments 2020-03-07 13:26:46 -05:00