Sam
95a6a637f1
Changed name of Attacking comp to MeleeAttack
2021-02-02 13:06:31 -05:00
Sam
7050398af0
Attack builder implemented.
2021-02-02 13:06:31 -05:00
Sam
5794faa761
Changed knockback from an enum to a struct.
2021-02-02 13:06:30 -05:00
Samuel Keiffer
e4cc613b3d
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
77e1b5bf17
fixing #944 - LeapMelee fall damage fix & adjustments
2021-02-02 16:51:04 +00:00
Samuel Keiffer
22ee548dfd
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
3a71303aaf
Fix projectile explosion being triggered twice.
2021-02-01 15:41:34 +00:00
Joshua Barretto
9d1bbdb142
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
8951e427e4
Add basic NPC interaction and fix NPC chat spamming
2021-01-31 20:29:50 +00:00
Joshua Barretto
ebcf647105
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
60276ddcb5
Added snow particles
2021-01-31 15:15:17 +00:00
Imbris
04d75d6c15
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
e01288b787
Aughihopethisworks
2021-01-30 22:27:12 -08:00
Samuel Keiffer
63e796496a
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
76fd36130d
Quick poise fix
2021-01-29 15:52:40 -08:00
Samuel Keiffer
fcdc321f2e
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
59a25b0097
Restored knockback to hammer.
2021-01-29 13:46:23 -05:00
Samuel Keiffer
eb2c5e7c34
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
dbf3c91c8b
Fix traveller backpack having all its slots removed
2021-01-29 12:47:30 +00:00
Marcel
afeb1621be
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
1d6676fb98
Small audio fixes; addresses #939 and #940
2021-01-29 11:37:10 +00:00
Samuel Keiffer
ecf9d2ba14
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
ae8722794b
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
jiminycrick
b689226173
Add migration for starter gear
2021-01-28 17:22:39 -08:00
jiminycrick
53b43e9812
Fix rebase and scrub poise from UI
2021-01-28 17:22:39 -08:00
jshipsey
1b0bf21775
animal stuns
...
Fix rebase
2021-01-28 17:22:39 -08:00
jiminycrick
1fadcf51ba
Some preliminary balancing
...
Fix rebase
2021-01-28 17:22:39 -08:00
jshipsey
95c3af1123
starting stun anim
...
stagger anim, mirroring, bettern walk anim
wielding with stuns/stagger
Knockback fix
Added Poise documentation/comments
2021-01-28 17:22:37 -08:00
jiminycrick
27ad277051
Made stunned state invulnerable to poise damage
...
Fixing silly error for comp creation
2021-01-28 17:22:35 -08:00
jiminycrick
a2262c5c6b
Poise stats
2021-01-28 17:22:35 -08:00
jiminycrick
221d4c8cdc
Add knockback to poise
2021-01-28 17:22:35 -08:00
jiminycrick
df124a1eef
Very basic functioning stun
2021-01-28 17:22:35 -08:00
jiminycrick
df4c9eff49
Initial broken implementation of poise
...
Character movement no longer broken.
2021-01-28 17:22:33 -08:00
Imbris
01251893e0
Merge branch 'james/update-rand' into 'master'
...
Update rand dependency
See merge request veloren/veloren!1737
2021-01-27 23:25:36 +00:00
jiminycrick
64a3c16999
Update rand dependency
2021-01-26 20:35:08 -08:00
Samuel Keiffer
c7cb1e61da
Merge branch 'sam/energy-fix' into 'master'
...
Fixed base energy being 0.
See merge request veloren/veloren!1738
2021-01-27 02:25:22 +00:00
Sam
25632a733f
Fixed base energy being 0.
2021-01-26 21:25:00 -05:00
Samuel Keiffer
d8ac726d92
Merge branch 'entropy9s/StaminaPlus' into 'master'
...
Health + Stamina modifiers via buffs
See merge request veloren/veloren!1636
2021-01-26 22:47:55 +00:00
Entropy9s
1c6851c5d1
StaminaPlus buff, modifying stamina via buffs
...
trying to fix this, coming back to this later
please remember to change potion back future self!
this ALMOST works. maybe MR ready, kinda jank tho
so close, and yet so far...
IT WORKS IT WORKS IT WORKS IT WORKS IT WORKS IT WO
did the same with health, ill fix this garbage l8r
think we're basically done here
whoops forgot to change the food back
fixing and cleaning up part 1
fixed everything part 2 now with buff images
ran clippy + fmt, fixed items that i modified
bracket bulldozing, boldly
hopefully this should be good?
need to rebase real quick
please let me be done
StaminaPlus buff, modifying stamina via buffs
trying to fix this, coming back to this later
please remember to change potion back future self!
this ALMOST works. maybe MR ready, kinda jank tho
so close, and yet so far...
IT WORKS IT WORKS IT WORKS IT WORKS IT WORKS IT WO
did the same with health, ill fix this garbage l8r
think we're basically done here
whoops forgot to change the food back
fixing and cleaning up part 1
fixed everything part 2 now with buff images
ran clippy + fmt, fixed items that i modified
hopefully this should be good?
cargo clippy fmt stuff
deleted an extraneous file?? how did that even...?
2021-01-26 22:47:55 +00:00
Joshua Barretto
ad00a20898
Merge branch 'swilliams/gem-sounds' into 'master'
...
All gems make a sound.
See merge request veloren/veloren!1734
2021-01-25 22:53:24 +00:00
Scott Williams
3adb9f9f03
All gems make a sound.
2021-01-25 22:53:23 +00:00
Samuel Keiffer
51af422c16
Merge branch 'sam/beam-energy' into 'master'
...
Changed how beams determined the energy regen and energy cost.
See merge request veloren/veloren!1733
2021-01-25 05:50:07 +00:00
Sam
b00f6ba8a1
Changed how beams determined the energy regen and energy cost.
2021-01-24 23:47:10 -05:00
Snowram
fd17d10f06
Merge branch 'swilliams/gems' into 'master'
...
Adds 6 different gems and removes shiny gem.
See merge request veloren/veloren!1729
2021-01-25 01:25:40 +00:00
Samuel Keiffer
f183f52b91
Merge branch 'lboklin/glider-stamina' into 'master'
...
Glider stamina cost now only when first starting to glide based on fall speed
See merge request veloren/veloren!1727
2021-01-25 00:17:32 +00:00
Samuel Keiffer
a6271e94f7
Merge branch 'sam/speed-beam' into 'master'
...
Fixed how the speed stat was applied to beams.
See merge request veloren/veloren!1732
2021-01-24 23:23:53 +00:00
Samuel Keiffer
7b49d3f5fa
Merge branch 'sam/skill-balancing-2' into 'master'
...
Bow nerf with skills
See merge request veloren/veloren!1731
2021-01-24 21:17:45 +00:00
Sam
46d00e3d5e
Fixed how the speed stat was applied to beams.
2021-01-24 16:01:38 -05:00
Scott Williams
5e9b63e308
Added other gems to crafting loot table.
2021-01-24 19:49:42 +00:00
Scott Williams
9d3982940b
Changed some recipes to use other gems. Removed DELETE statements from migration.
2021-01-24 19:45:44 +00:00
