425 Commits

Author SHA1 Message Date
Pfauenauge90
7f269fe62a healing sceptre 2020-03-24 01:11:14 +01:00
timokoesters
71a8671a4a Merge remote-tracking branch 'origin/master' into combat 2020-03-23 11:30:47 +01:00
Pfauenauge90
494e06532c small fixes, weapon models 2020-03-22 18:51:23 +01:00
Pfauenauge90
44379f9159 item images 2020-03-22 14:38:21 +01:00
Imbris
90b2a0fa1f Optimized uses of emitters, cleanup 2020-03-22 00:49:46 -04:00
Pfauenauge
2d369298aa cloth armor 2020-03-22 00:21:11 +01:00
Imbris
12af35a3b9 Flip models for hands, shoulders, and feet of humanoids 2020-03-21 18:48:21 -04:00
Pfauenauge90
8278fae7b3 27 new armor asset files 2020-03-21 20:23:22 +01:00
Pfauenauge90
e1dacf8b34 stat icons, frame colours 2020-03-20 20:52:32 +01:00
Pfauenauge90
0540469c02 placement fix 2020-03-20 14:55:31 +01:00
Pfauenauge90
3134d7a2c2 new loading screen bg 2020-03-20 13:01:31 +01:00
Pfauenauge90
9b5aaaf50e added chest drops 2020-03-20 01:11:02 +01:00
Pfauenauge90
d902212676 item images 2020-03-19 22:36:40 +01:00
timokoesters
f25c066795 Regular naming scheme for armor assets 2020-03-19 17:47:37 +01:00
Pfauenauge90
77e2524e83 swift leather armour parts 2020-03-19 14:17:53 +01:00
Pfauenauge90
7cf24fe8b6 npc armour 2020-03-18 23:09:58 +01:00
timokoesters
62148bcd92 fix pfau's broken commit 2020-03-18 21:12:55 +01:00
Pfauenauge90
f57497fda4 2 weapons 2020-03-18 21:05:20 +01:00
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
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
Pfauenauge90
90ce59dabe fixes 2020-03-17 16:07:20 +01:00
Pfauenauge90
e0a4bcc2b2 unclothed parts 2020-03-17 15:39:29 +01:00
Joshua Barretto
6b13f305eb Nicer point lights 2020-03-17 13:29:42 +00: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
b5db94d5a1 Add shield item 2020-03-16 13:40:14 +01:00
timokoesters
9b15027f60 include chest models 2020-03-15 19:53:58 +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
67aea90cea minimap position 2020-03-15 16:53:28 +01:00
Pfauenauge90
4a5db0297a minimap assets 2020-03-15 16:53:28 +01:00
Pfauenauge90
36f97183a2 mmap visuals 2020-03-15 16:52:38 +01:00
Pfauenauge90
8ee2a58bbb item images 2020-03-15 16:51:55 +01:00
Pfauenauge90
4ecb0c2c67 plate armour 2020-03-15 16:51:55 +01:00
Pfauenauge90
cc20cc47af more assa armour parts 2020-03-15 16:51:55 +01:00
Pfauenauge
e76fb108fb new assassin shoulder armor 2020-03-15 16:51:55 +01:00
Pfauenauge90
7e378464a6 more armour 2020-03-15 16:51:55 +01:00
Joshua Barretto
8fd42651fc Added armour items and equipping of armour 2020-03-15 16:51:54 +01:00
Pfauenauge90
d86e1181ed plate chest armour 2020-03-15 16:50:37 +01:00
Pfauenauge90
9e3a11ddc1 assassin armour 2020-03-15 16:50:37 +01:00
Imbris
2f3966942c maybe fix hotreload panic 2020-03-15 16:50:37 +01:00