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
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
46c8c744fa
Add migration for starter gear
2021-01-28 17:22:39 -08:00
152156d065
Fix rebase and scrub poise from UI
2021-01-28 17:22:39 -08:00
d456271921
animal stuns
...
Fix rebase
2021-01-28 17:22:39 -08:00
661764f4aa
Some preliminary balancing
...
Fix rebase
2021-01-28 17:22:39 -08:00
29732bb763
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
0f244bf84b
Made stunned state invulnerable to poise damage
...
Fixing silly error for comp creation
2021-01-28 17:22:35 -08:00
dd69b5f2bc
Poise stats
2021-01-28 17:22:35 -08:00
af076aa87f
Add knockback to poise
2021-01-28 17:22:35 -08:00
e3965ae0ab
Very basic functioning stun
2021-01-28 17:22:35 -08:00
c83296a4ec
Initial broken implementation of poise
...
Character movement no longer broken.
2021-01-28 17:22:33 -08:00
4c7da15d85
Merge branch 'james/update-rand' into 'master'
...
Update rand dependency
See merge request veloren/veloren!1737
2021-01-27 23:25:36 +00:00
8b97199245
Update rand dependency
2021-01-26 20:35:08 -08:00
e6620c21db
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
680a4e4dde
Fixed base energy being 0.
2021-01-26 21:25:00 -05:00
c4d7fa7fc1
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
1f6cf7e155
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
d893136e24
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
0cde434e3b
All gems make a sound.
2021-01-25 22:53:23 +00:00
eb4b2760eb
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
9b7edcf32f
Changed how beams determined the energy regen and energy cost.
2021-01-24 23:47:10 -05:00
ad6cdcab71
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
0343b57b2b
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
c349afc9e9
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
a05402c09b
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
a83baa8243
Fixed how the speed stat was applied to beams.
2021-01-24 16:01:38 -05:00
efd953b4f4
Added other gems to crafting loot table.
2021-01-24 19:49:42 +00:00
e50bd4dc6f
Changed some recipes to use other gems. Removed DELETE statements from migration.
2021-01-24 19:45:44 +00:00
6dd740feaa
Nerfed bow M1 and M2, slightly buffed bow skillbar ability.
2021-01-24 14:24:59 -05:00
be311f8ff2
Added gem models for item_manifest
2021-01-24 18:20:10 +00:00
60ed87d70d
Merge branch 'sam/mindflayer-rebalance' into 'master'
...
Rebalanced mindflayer.
See merge request veloren/veloren!1728
2021-01-24 18:03:02 +00:00
58c69980b1
Merge branch 'synis/fix-cave-rng' into 'master'
...
Fixes #935 - deterministic sprite placement in caves
Closes #935
See merge request veloren/veloren!1721
2021-01-24 17:17:02 +00:00
fda6c9ffd1
Added to changelog.
2021-01-24 16:52:56 +00:00
157e56d8ca
Removed Shiny Gem, Added migration to change shiny gems to diamonds. Changed shiny gem recipes to diamonds
2021-01-24 16:40:22 +00:00
314f0428fc
Rebalanced mindflayer.
2021-01-24 10:56:12 -05:00
32bbdffc38
Added 6 gems, removed shiny gem from cave, replaced with diamond.
2021-01-24 14:00:49 +00:00
f42869f6ec
Glider deploy stamina cost value tweak
2021-01-24 12:06:23 +01:00
30168e375f
Glider stamina only costs on deploy
2021-01-24 10:56:35 +01:00
bdbed58b09
Merge branch 'swilliams/hitbox-adjustments' into 'master'
...
General NPC Hitbox Adjustments
See merge request veloren/veloren!1723
2021-01-24 04:00:57 +00:00
c7baf1fd86
General NPC Hitbox Adjustments
2021-01-24 04:00:57 +00:00
5117edcff9
Merge branch 'pfau/sceptres' into 'master'
...
6 new sceptres, add DPS display to tooltips
See merge request veloren/veloren!1724
2021-01-24 03:14:32 +00:00
fba5c65b9e
Merge branch 'xMAC94x/fix_ci' into 'master'
...
fix ci, which was broken by merging unittests and check
See merge request veloren/veloren!1722
2021-01-24 02:29:28 +00:00
7c7f5517b4
Merge branch 'xMAC94x/3rd_party_consistenvy_unittests' into 'master'
...
add unittests for api compatibility for client::Client and common::Clock
See merge request veloren/veloren!1719
2021-01-24 00:11:34 +00:00
3866bc73a4
Merge branch 'lboklin/glider-stamina' into 'master'
...
Fix glider stamina drain
See merge request veloren/veloren!1718
2021-01-23 23:21:22 +00:00
82147653df
Merge branch 'torvus-quick-fix' into 'master'
...
Fix torvus
See merge request veloren/veloren!1720
2021-01-23 22:31:15 +00:00
7cbf946a65
6 new sceptres, add DPS display to tooltips
2021-01-23 23:10:36 +01:00
3d195348d2
fix ci, which was broken by merging unittests and check
2021-01-23 23:05:24 +01:00
39d1c9e885
Merge branch 'sam/skill-balancing-1' into 'master'
...
Skill balancing
See merge request veloren/veloren!1716
2021-01-23 21:12:35 +00:00
77312ccdd4
Move outcome vec from being defined in frontend and server to common.
2021-01-23 15:17:36 -05:00
