1484 Commits

Author SHA1 Message Date
Imbris
e1b0206740 climbing tweaks, fix triple strike overflow, fix Last<CharacterState>
not registered
2020-03-25 02:05:28 -04:00
Imbris
a1cf04fb22 Input handling changes 2020-03-25 01:38:37 -04:00
Adam Whitehurst
4bfbdf7c84 update controller tick fn 2020-03-25 01:38:25 -04:00
jshipsey
9588c6a213 fixed critter animation 2020-03-25 01:29:55 -04:00
jshipsey
e657dfe745 fixed swimming, better charge 2020-03-25 01:22:07 -04:00
jshipsey
41bd0f1a56 starting foot movement with attacks, clearing some dead code 2020-03-25 00:15:06 -04:00
Pfauenauge90
b7feca6973 new icon art 2020-03-25 01:41:43 +01:00
timokoesters
2b65e631f6 Better climbing, fireball impl 2020-03-24 20:09:23 +01:00
timokoesters
2e33254db7 Split staff into 3 abilities 2020-03-24 14:00:22 +01:00
jshipsey
ee05d13328 climb fix, const tweak update, trying equip anims 2020-03-24 00:24:31 -04:00
Pfauenauge90
8c5c8fabdd colors for inventory space counter 2020-03-24 01:31:14 +01:00
timokoesters
559d0e3b28 Better inventory counter 2020-03-24 00:38:00 +01:00
timokoesters
608cd345fc Add inventory counter 2020-03-24 00:23:21 +01:00
timokoesters
3aad4e16a6 Move meta.dat to ron, so we don't create memory allocation errors 2020-03-23 14:18:05 +01:00
timokoesters
71a8671a4a Merge remote-tracking branch 'origin/master' into combat 2020-03-23 11:30:47 +01:00
jshipsey
995b36b204 raised run anim speed 20% 2020-03-22 21:32:34 -04:00
Capucho
7bd4492233 Fix the wrong logs directory being displayed on panic 2020-03-22 22:06:05 +00:00
jshipsey
5b76f3f90d rewrote the whole stupid skeleton to work much smarter 2020-03-22 16:06:53 -04:00
jshipsey
5a04e37f67 Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat 2020-03-22 11:55:35 -04:00
jshipsey
f488c28a12 wield idle, wield run 2020-03-22 11:55:28 -04:00
Pfauenauge90
e1222fdf02 removed warnings and item test values 2020-03-22 14:55:08 +01:00
Adam Whitehurst
b110efef34 * rename CharacterState equals() -> same_variant() 2020-03-22 05:46:09 -07:00
Imbris
90b2a0fa1f Optimized uses of emitters, cleanup 2020-03-22 00:49:46 -04:00
jshipsey
7e0b320299 Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat 2020-03-22 00:14:11 -04:00
jshipsey
83fc551c52 axe attack 2020-03-22 00:11:24 -04:00
Imbris
12af35a3b9 Flip models for hands, shoulders, and feet of humanoids 2020-03-21 18:48:21 -04:00
Adam Whitehurst
9f84d8ea92 Better triple_strike handling 2020-03-21 14:55:04 -07:00
Adam Whitehurst
f93d1add44 * move swap loadout to handle_swap_loadout util fn
* impl From<JoinData> for StateUpdate
2020-03-21 14:16:26 -07:00
jshipsey
434a3f9036 Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat 2020-03-21 15:47:28 -04:00
jshipsey
768b2914e5 proper hammer smash, small tweaks 2020-03-21 15:47:16 -04:00
jshipsey
da19e3b4b3 spin attack 2020-03-21 14:54:29 -04:00
Adam Whitehurst
3cf281e504 Remove excess code 2020-03-21 10:32:32 -07:00
Adam Whitehurst
e967c44e6c add SwapLoadout 2020-03-21 10:26:38 -07:00
jshipsey
ea8c4f40ed bow work 2020-03-21 03:40:14 -04:00
Imbris
a6a1a08ec9 Add safe_slerp function that ensures that slerping returns non-NaN normalized values 2020-03-21 00:53:41 -04:00
jshipsey
9d691aa344 Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat 2020-03-20 18:54:54 -04:00
jshipsey
753c20a956 shooting anim state, cast anim, small tweaks 2020-03-20 18:54:27 -04:00
Adam Whitehurst
0276e38aa3 better triple_strike 2020-03-20 15:03:29 -07:00
Pfauenauge90
e1dacf8b34 stat icons, frame colours 2020-03-20 20:52:32 +01:00
timokoesters
897f925c18 Go to idle state when picking items up 2020-03-20 20:23:04 +01:00
timokoesters
d28b5669aa Remove all warnings 2020-03-20 15:45:36 +01:00
timokoesters
e6c6749fb0 Ranged weapons now give xp on kill and also make enemies angry 2020-03-20 14:26:18 +01:00
Pfauenauge90
dd55829262 Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat 2020-03-20 13:02:35 +01:00
Pfauenauge90
3134d7a2c2 new loading screen bg 2020-03-20 13:01:31 +01:00
Songtronix
9738e3b54c change(panic): mention the game version in panic 2020-03-20 09:47:00 +01:00
jshipsey
6b341f7951 hammer go smash 2020-03-20 02:38:53 -04:00
jshipsey
b41e91cbb4 axe, hammer proper wields 2020-03-20 01:27:54 -04:00
Pfauenauge90
9b5aaaf50e added chest drops 2020-03-20 01:11:02 +01:00
Adam Whitehurst
4d6f955bf2 update triple_strike 2020-03-19 15:40:03 -07:00
Pfauenauge90
d902212676 item images 2020-03-19 22:36:40 +01:00