Commit Graph

2339 Commits

Author SHA1 Message Date
AlKabir
77f3c7e3c5 Minor combat fixes (see issue 785) 2020-11-07 18:00:07 +00:00
TheBoredProgrammer64
b2ec207979 Revert "Removed toolCategory"
This reverts commit 5b0ff408176ff00408cc90f2516a90d5cd303e56.
2020-11-06 15:33:20 +00:00
Marcel Märtens
40f5afc2b0 ci cleanup, dependency update 2020-11-06 14:34:42 +01:00
Samuel Keiffer
44f676d90c Merge branch 'sam/make-roll-great-again' into 'master'
Roll overhaul

See merge request veloren/veloren!1484
2020-11-06 03:25:18 +00:00
Sam
37ecb165ef Addressed comments. Roll now only provides i-frames to melee attacks. It also reduces height of hitbox. 2020-11-05 20:40:20 -06:00
Snowram
262ceac060 fmt 2020-11-06 01:08:35 +01:00
Monty Marz
642ad805a1 potion buff 2020-11-06 01:08:34 +01:00
Snowram
a52f83e92c Addresses some comments 2020-11-06 01:08:31 +01:00
Snowram
ce96af4363 Allow for an arbitrary array of effects and buffs for consumables 2020-11-06 01:08:30 +01:00
Sam
66850a5878 Fixed audio tests. Added changelog line. 2020-11-05 18:01:46 -06:00
jshipsey
fae3ef6e59 roll anim speedup 2020-11-05 16:40:30 -05:00
Sam
a0af315930 Addressed comments. 2020-11-04 19:22:08 -06:00
Sam
87bff41a66 Addressed comments. 2020-11-04 19:22:05 -06:00
Sam
c48c022f7e Separated out health from stats component. 2020-11-04 19:22:04 -06:00
Snowram
a6d5d87bbc Fix animations regressions for biped_large 2020-11-04 02:12:43 +01:00
jshipsey
3bb839da85 convert humanoid anims, warnings 2020-11-04 01:48:06 +01:00
Snowram
b47f42bad5 More biped_large work 2020-11-04 01:48:05 +01:00
jshipsey
f009492319 cleanup 4 2020-11-04 01:48:05 +01:00
unknown
14ec1b9f5f starting to wire in new wield setup for bipedlarge 2020-11-04 01:48:05 +01:00
jshipsey
e6eeef4524 setup for axe/bow wield 2020-11-04 01:48:05 +01:00
jshipsey
28cde31bbb setup for staff, more anim conversions 2020-11-04 01:48:05 +01:00
Snowram
ef1428f9fe Bones scaling cleanup 2020-11-04 01:48:05 +01:00
jshipsey
3d23475abd starting to wire in new wield setup 2020-11-04 01:48:05 +01:00
Snowram
72b15a1e24 More new style keyframe translation 2020-11-04 01:48:05 +01:00
jshipsey
c878673a84 cleanup 3 2020-11-04 01:48:05 +01:00
jshipsey
f79181c01f cleanup 2 2020-11-04 01:48:05 +01:00
jshipsey
e5734c1829 adjust skeleton_attr to s_a 2020-11-04 01:48:05 +01:00
Snowram
f9f3d33189 More new style keyframe translation 2020-11-04 01:48:04 +01:00
jshipsey
e928dbe4db start cleanup 2020-11-04 01:48:04 +01:00
Snowram
a8dd44325f Convert some animations to new style keyframes 2020-11-04 01:48:04 +01:00
Joshua Barretto
6331ad9455 Implemented Flight 2020-11-03 22:46:07 +00:00
Marcel Märtens
00456c8373 extract a Presence Component, which is server only and has state of Player and Client. Presence is only valid for Clients that are in game 2020-11-03 08:56:02 +01:00
Marcel Märtens
6bb74c9c6f Fix clients are disconnecting GRACEFULLY by removing the Disconnect Request from a client, a client now sends a TERMINATE message directly 2020-11-03 08:55:54 +01:00
ubruntu
8c1e1fdc5c Fixed sneak toggle, sneaking no longer has sound, rolling can return to sneaking state, sneaking reduces aggro distance 2020-11-03 04:09:38 +00:00
Imbris
a556d2b5e7 Merge branch 'bbenton91/fix-password-length' into 'master'
Changed password scale to allow 34 characters. Fixes issue #743

Closes #743

See merge request veloren/veloren!1464
2020-10-30 02:37:54 +00:00
Brad
8b39dafe2e Changed password scale to allow 34 characters 2020-10-29 21:17:31 -04:00
Imbris
cb68aec291 Update changelog, address comments, fmt 2020-10-29 19:12:54 -04:00
Imbris
64def3cde4 Allow interacting with nearby blocks without pointing at them, unify selection of block/entity interactors so that only one is select at once, rearrange pickup and mount range consts 2020-10-29 18:40:11 -04:00
Imbris
325695e937 Only try to connect to the singleplayer server after it has been initialized 2020-10-29 18:30:49 -04:00
Imbris
47b06658b0 Log where the userdata folder is in binary crates, fix bug where the old
path was logged instead of the new path when renaming invalid settings
2020-10-29 18:30:49 -04:00
Imbris
0ca3d51f29 Only allow hotbar keys instead of all UI related keys when the UI is hidden 2020-10-29 18:30:48 -04:00
Sam
7971034fde Fixed audio tests. 2020-10-28 18:15:28 -05:00
Sam
844e6f2b60 Slightly nerfed sword dash. Reduced particle count on fire aoe by factor of 3. 2020-10-28 18:15:25 -05:00
Sam
63011241ea Added keyframes to all states that were lacking them. 2020-10-28 18:15:23 -05:00
Sam
f60985d733 Transitioned buff storage from a vec to a hashmap. Addressed other comments. Only continuous buff effects are handled right now. 2020-10-26 19:30:17 -05:00
Sam
337cf6e137 Cleaned up UI code. Removed stuff added for testing. Added 10% for melee attacks to inflict a bleeding debuff. Renamed BuffId to BuffKind. Fixed memory leak. Set event emission to false when timer is decremented. 2020-10-26 19:30:10 -05:00
Sam
fdf8decb18 Handled health change over time buff effect better. 2020-10-26 19:28:27 -05:00
Sam
5a5d35fade Cleaned up logic used to handle buff addition. Old active buffs now get deleted if they had a smaller duration and weaker strength. 2020-10-26 19:28:26 -05:00
Monty Marz
3f7b5a095b player buffs at minimap visuals
Update settings.rs
buff timers
2020-10-26 19:28:25 -05:00
Imbris
be1767a5af Fix group tooltips, make ui buff code more efficient, avoid crashing on characters button press 2020-10-26 19:28:25 -05:00