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,293 Commits 151 Branches 18 Tags
Commit Graph

1422 Commits

Author SHA1 Message Date
Pfauenauge90
99f1699f15 UI visuals 2020-03-18 19:51:48 +01:00
Pfauenauge90
3ae1f8823b coin/currency visuals 2020-03-18 12:05:36 +01:00
Pfauenauge90
c4344f77c5 background images 2020-03-18 01:43:55 +01:00
Pfauenauge90
5be66413b6 armour slot bgs 2020-03-17 19:48:15 +01:00
Pfauenauge90
b39bba9b41 Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat 2020-03-17 19:04:11 +01:00
Pfauenauge90
3696647ba1 more slots 2020-03-17 19:04:06 +01:00
timokoesters
4b7eacfdc6 Add support for different models per weapon type 2020-03-17 18:28:07 +01:00
Pfauenauge90
92c20ea479 test armor slot 2020-03-17 17:02:50 +01:00
timokoesters
45f44a158f Select newly created character automatically 2020-03-17 16:22:34 +01:00
timokoesters
d13c218dca Stop first person bounce in air 2020-03-17 16:08:53 +01:00
Pfauenauge90
90ce59dabe fixes 2020-03-17 16:07:20 +01:00
Pfauenauge90
e0a4bcc2b2 unclothed parts 2020-03-17 15:39:29 +01:00
Pfauenauge90
53975b9152 more UI visuals 2020-03-16 22:58:19 +01:00
timokoesters
298c24918e Fix body parts not changing 2020-03-16 22:06:23 +01:00
Pfauenauge90
d5826984d3 small fixes 2020-03-16 20:50:01 +01:00
Pfauenauge90
fe2d6c09bf removed character window and questlog 2020-03-16 19:56:15 +01:00
Pfauenauge90
36180f780c UI colourable in the code, stats window 2020-03-16 18:55:43 +01:00
Pfauenauge90
d511f79e0f more bag parts 2020-03-16 18:55:31 +01:00
timokoesters
5d26545174 Add dash ability to sword M2 2020-03-16 16:34:53 +01:00
timokoesters
d9e980e04c Make npcs attack again 2020-03-16 14:27:52 +01:00
timokoesters
b5db94d5a1 Add shield item 2020-03-16 13:40:14 +01:00
timokoesters
eda349189d Adjust first person camera and underwater wield orientation 2020-03-16 13:19:51 +01:00
timokoesters
d48dc8fa19 Readd ranged and debug boost. Add bouncing while running in first person 2020-03-16 12:32:57 +01:00
Pfauenauge90
f167825709 reenabled inventory slots 2020-03-15 19:48:02 +01:00
timokoesters
b159a93664 Move equipment from loadout into body 2020-03-15 19:44:47 +01:00
Pfauenauge90
870333f04f minimap scale 2020-03-15 16:53:28 +01:00
Pfauenauge90
67aea90cea minimap position 2020-03-15 16:53:28 +01:00
Pfauenauge90
36f97183a2 mmap visuals 2020-03-15 16:52:38 +01:00
Pfauenauge90
056c6338b2 UI changes 2020-03-15 16:50:37 +01:00
Joshua Barretto
b087e1845a Added armour items and equipping of armour 2020-03-15 16:42:09 +01:00
Pfauenauge90
760880464f Even less blending. 2020-03-15 15:53:51 +01:00
Pfauenauge90
48674114ce Update vol.rs 2020-03-15 15:53:51 +01:00
timokoesters
583aa1e482 Merge remote-tracking branch 'origin/master' into clientstates 2020-03-15 15:27:06 +01:00
timokoesters
b5c6952fb8 Add loadout struct for info on weapon configurations 2020-03-14 22:33:20 +01:00
AdamWhitehurst
86c12f3961 Update timed combo, add CharacerBehavior trait 2020-03-14 12:50:07 -06:00
timokoesters
dac8eeb295 Make abilities depend on weapon 2020-03-14 16:40:29 +01: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
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
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
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
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
Acrimon
ea33a8e2b3 Rebased. 2020-03-08 23:02:15 +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
026a3647b2 Auth error help message. 
main menu message about auth
 2020-03-08 22:57:09 +01:00