Imbris
2248b5cc2d
Merge branch 'imbris/fix-test-server' into 'master'
...
Fix test server
See merge request veloren/veloren!1754
2021-02-04 06:23:09 +00:00
Imbris
b9f404c6f5
fix test server
2021-02-04 00:18:46 -05:00
Samuel Keiffer
c16cddb290
Merge branch 'azymohliad/update-uk' into 'master'
...
Update Ukrainian translation
See merge request veloren/veloren!1749
2021-02-03 16:18:50 +00:00
Andrii Zymohliad
7be836318b
Update Ukrainian translation
2021-02-03 16:18:49 +00:00
Samuel Keiffer
4cf2a60209
Merge branch 'sam/fix-double-health-fetch' into 'master'
...
Fixed bombs panicing the server.
See merge request veloren/veloren!1753
2021-02-03 05:42:02 +00:00
Sam
d13302f256
Fixed bombs panicing the server.
2021-02-03 00:41:19 -05:00
Samuel Keiffer
5bb1e4a808
Merge branch 'sam/attack-effects' into 'master'
...
Centralized attack handling
Closes #818
See merge request veloren/veloren!1746
2021-02-02 22:27:43 +00:00
Sam
be8df9aef6
Addressed comments.
2021-02-02 16:08:09 -05:00
Sam
80954f3ba4
Made attacker entity and uid optional to remove potential for attacks to not be applied and some unwraps.
2021-02-02 13:07:07 -05:00
Sam
af982ec0bb
Changed knockback to be an effect on the overall attack, rather than a damage.
2021-02-02 13:07:07 -05:00
Sam
17d1432be0
Outcomes now correctly read if an attack had any healing components.
2021-02-02 13:07:06 -05:00
Sam
5eec915c2e
Added support for damage falloff with explosions.
2021-02-02 13:07:06 -05:00
Sam
5c16b0b532
Explosions now use attacks.
2021-02-02 13:07:06 -05:00
Sam
7675e53740
Shockwaves now use attacks.
2021-02-02 13:07:05 -05:00
Sam
e5caef8a54
Effects on attacks can now require energy.
2021-02-02 13:07:05 -05:00
Sam
2b11ae6569
Attacks can now heal.
2021-02-02 13:07:04 -05:00
Sam
edcfcc31f6
Attacks can now deal poise damage.
2021-02-02 13:07:04 -05:00
Sam
fcd89a5d41
Lifesteal now functional on Attack.
2021-02-02 13:07:03 -05:00
Sam
fdef168e82
Beams now use Attack, with limited functionality in some cases.
2021-02-02 13:07:03 -05:00
Sam
59ce8c6843
Projectiles now use attacks.
2021-02-02 13:06:57 -05:00
Sam
46dbb8aef4
Attack effects can now have requirements.
2021-02-02 13:06:34 -05:00
Sam
c77f263cd1
Effects now work when not tied to a damage.
2021-02-02 13:06:34 -05:00
Sam
18aa315f0d
Rolling now dodges melee attacks again.
2021-02-02 13:06:34 -05:00
Sam
78879d5189
Attacks can now inflict de/buffs.
2021-02-02 13:06:33 -05:00
Sam
6d509932db
Attacks can now reward energy.
2021-02-02 13:06:33 -05:00
Sam
c3408c084c
Critical hits are now functional.
2021-02-02 13:06:32 -05:00
Sam
2690e9caa1
Applied basic functionality of attack-effects system to melee.
2021-02-02 13:06:32 -05:00
Sam
d3b75df76f
Changed name of Attacking comp to MeleeAttack
2021-02-02 13:06:31 -05:00
Sam
bb019309ea
Attack builder implemented.
2021-02-02 13:06:31 -05:00
Sam
78a2459e6d
Changed knockback from an enum to a struct.
2021-02-02 13:06:30 -05:00
Samuel Keiffer
3bfcf02e85
Merge branch 'Ambien/combat_issues' into 'master'
...
fixing #944 - LeapMelee fall damage fix & adjustments
Closes #944
See merge request veloren/veloren!1751
2021-02-02 16:51:04 +00:00
Pascal Fuhrmann
f4deb08a40
fixing #944 - LeapMelee fall damage fix & adjustments
2021-02-02 16:51:04 +00:00
Samuel Keiffer
83c3511e84
Merge branch 'fix_projectile_explosion' into 'master'
...
Fix projectile explosion being triggered twice.
Closes #943
See merge request veloren/veloren!1745
2021-02-01 15:41:34 +00:00
Blob
5c8fc4f378
Fix projectile explosion being triggered twice.
2021-02-01 15:41:34 +00:00
Joshua Barretto
bf07947a6d
Merge branch 'james/npc-interaction' into 'master'
...
Add basic NPC interaction and fix NPC chat spamming
See merge request veloren/veloren!1726
2021-01-31 20:29:50 +00:00
James Melkonian
23b1df3cdd
Add basic NPC interaction and fix NPC chat spamming
2021-01-31 20:29:50 +00:00
Joshua Barretto
7553983110
Merge branch 'zesterer/snow' into 'master'
...
Added snow particles
See merge request veloren/veloren!1748
2021-01-31 16:26:21 +00:00
Joshua Barretto
60c16e57b1
Added snow particles
2021-01-31 15:15:17 +00:00
Imbris
b93a2b02dd
Merge branch 'DaforLynx/cricket-fix' into 'master'
...
Lowered frequency of crickets by 5x
See merge request veloren/veloren!1747
2021-01-31 08:23:13 +00:00
DaforLynx
b906473f4e
Aughihopethisworks
2021-01-30 22:27:12 -08:00
Samuel Keiffer
a8e32b0fda
Merge branch 'james/poise-hotfix' into 'master'
...
Quick poise fix
See merge request veloren/veloren!1742
2021-01-30 01:37:31 +00:00
jiminycrick
ea13f75427
Quick poise fix
2021-01-29 15:52:40 -08:00
Samuel Keiffer
76a575da8d
Merge branch 'sam/readd-knockback' into 'master'
...
Restored knockback to hammer.
See merge request veloren/veloren!1741
2021-01-29 19:59:47 +00:00
Sam
e38ecafc17
Restored knockback to hammer.
2021-01-29 13:46:23 -05:00
Samuel Keiffer
a11786cbdd
Merge branch 'fix-backpack' into 'master'
...
Fix traveller backpack having all its slots removed
See merge request veloren/veloren!1740
2021-01-29 14:07:53 +00:00
Treeco
a1e56c69a4
Fix traveller backpack having all its slots removed
2021-01-29 12:47:30 +00:00
Marcel
b88f04215e
Merge branch 'DaforLynx/small-sound-fixes' into 'master'
...
Small audio fixes; addresses #939 and #940
Closes #940 and #939
See merge request veloren/veloren!1739
2021-01-29 11:37:10 +00:00
DaforLynx
c6e262c4ce
Small audio fixes; addresses #939 and #940
2021-01-29 11:37:10 +00:00
Samuel Keiffer
f1bf8b6ba0
Merge branch 'james/poise' into 'master'
...
Adding Poise to Combat
See merge request veloren/veloren!1646
2021-01-29 02:42:27 +00:00
jiminycrick
a02444825d
Address some comments
...
Eliminated extra stagger state
Responding to more comments
Move poise character state changes to character behavior system
Move poise out of JoinTuple/Data
Finish up comments (various fixes)
2021-01-28 17:31:05 -08:00
