Sam
680a4e4dde
Fixed base energy being 0.
2021-01-26 21:25:00 -05:00
Samuel Keiffer
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
Entropy9s
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
Joshua Barretto
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
Scott Williams
0cde434e3b
All gems make a sound.
2021-01-25 22:53:23 +00:00
Samuel Keiffer
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
Sam
9b7edcf32f
Changed how beams determined the energy regen and energy cost.
2021-01-24 23:47:10 -05:00
Snowram
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
Samuel Keiffer
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
Samuel Keiffer
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
Samuel Keiffer
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
Sam
a83baa8243
Fixed how the speed stat was applied to beams.
2021-01-24 16:01:38 -05:00
Scott Williams
efd953b4f4
Added other gems to crafting loot table.
2021-01-24 19:49:42 +00:00
Scott Williams
e50bd4dc6f
Changed some recipes to use other gems. Removed DELETE statements from migration.
2021-01-24 19:45:44 +00:00
Sam
6dd740feaa
Nerfed bow M1 and M2, slightly buffed bow skillbar ability.
2021-01-24 14:24:59 -05:00
Scott Williams
be311f8ff2
Added gem models for item_manifest
2021-01-24 18:20:10 +00:00
Samuel Keiffer
60ed87d70d
Merge branch 'sam/mindflayer-rebalance' into 'master'
...
Rebalanced mindflayer.
See merge request veloren/veloren!1728
2021-01-24 18:03:02 +00:00
Joshua Barretto
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
Scott Williams
fda6c9ffd1
Added to changelog.
2021-01-24 16:52:56 +00:00
Scott Williams
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
Sam
314f0428fc
Rebalanced mindflayer.
2021-01-24 10:56:12 -05:00
Scott Williams
32bbdffc38
Added 6 gems, removed shiny gem from cave, replaced with diamond.
2021-01-24 14:00:49 +00:00
Ludvig Böklin
f42869f6ec
Glider deploy stamina cost value tweak
2021-01-24 12:06:23 +01:00
Ludvig Böklin
30168e375f
Glider stamina only costs on deploy
2021-01-24 10:56:35 +01:00
Samuel Keiffer
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
Scott Williams
c7baf1fd86
General NPC Hitbox Adjustments
2021-01-24 04:00:57 +00:00
Justin Shipsey
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
Marcel
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
Marcel
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
Samuel Keiffer
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
Marcel
82147653df
Merge branch 'torvus-quick-fix' into 'master'
...
Fix torvus
See merge request veloren/veloren!1720
2021-01-23 22:31:15 +00:00
Monty
7cbf946a65
6 new sceptres, add DPS display to tooltips
2021-01-23 23:10:36 +01:00
Marcel Märtens
3d195348d2
fix ci, which was broken by merging unittests and check
2021-01-23 23:05:24 +01:00
Samuel Keiffer
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
Sam
77312ccdd4
Move outcome vec from being defined in frontend and server to common.
2021-01-23 15:17:36 -05:00
dryadee
f064033bb4
Fixes #935 - deterministic sprite placement in caves
2021-01-23 21:14:07 +01:00
Marcel Märtens
ff10373cbe
add unittests for api compatibility for client::Client and common::Clock
...
this tests the broad api of veloren and FAILS in case the interface is changed. It contains a not that those functions are commonly used by 3rd parties
and thus they need to be notified
2021-01-23 21:06:47 +01:00
Ludvig Böklin
5eefa86d68
Fix glider stamina drain
2021-01-23 18:20:43 +01:00
Imbris
47bd74469b
Merge branch 'imbris/update-winit' into 'master'
...
Update winit and iced
See merge request veloren/veloren!1717
2021-01-23 09:22:58 +00:00
Imbris
7cbbb70c42
Merge branch 'pizzaluc/unlimited_FPS' into 'master'
...
Implemented #896 - Added option for Unlimited FPS
Closes #896
See merge request veloren/veloren!1713
2021-01-23 08:34:38 +00:00
Lucas Vulpius
43b5559325
Implemented #896 - Added option for Unlimited FPS
2021-01-23 08:34:38 +00:00
Justin Shipsey
fb09d14725
Merge branch 'Rotsuoy/SavannaGrass' into 'master'
...
Rotsuoy/savanna grass
See merge request veloren/veloren!1711
2021-01-23 07:46:54 +00:00
Rotsuoy
994677a4d0
Rotsuoy/savanna grass
2021-01-23 07:46:54 +00:00
Imbris
adaea096d2
Update winit and iced
2021-01-23 01:09:33 -05:00
Samuel Keiffer
97f0413307
Merge branch 'sam/fix-dash' into 'master'
...
Dash now ticks damage based off distance rather than duration.
See merge request veloren/veloren!1715
2021-01-23 04:42:56 +00:00
Sam
5e4b6809ca
Sceptre nerfs.
2021-01-22 22:46:18 -05:00
Sam
d6be67e0a0
Dash now ticks damage based off distance rather than duration. Fix for golem no longer being able to melee.
2021-01-22 18:10:47 -05:00
Samuel Keiffer
d58a72e91b
Merge branch 'sam/purge-body-from-stats' into 'master'
...
Removed body from stats component as there is already a body component.
Closes #931
See merge request veloren/veloren!1714
2021-01-22 23:08:07 +00:00
Sam
4014b28d19
Removed body from stats component as there is already a body component.
2021-01-22 16:50:22 -05:00
Joshua Barretto
4b4504a3a3
Merge branch 'swilliams/golem-hitbox-fix' into 'master'
...
Swilliams/golem hitbox fix
See merge request veloren/veloren!1712
2021-01-22 16:30:35 +00:00
