Commit Graph

6635 Commits

Author SHA1 Message Date
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
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
3adb9f9f03 All gems make a sound. 2021-01-25 22:53:23 +00:00
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
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
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
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
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
5e9b63e308 Added other gems to crafting loot table. 2021-01-24 19:49:42 +00:00
9d3982940b Changed some recipes to use other gems. Removed DELETE statements from migration. 2021-01-24 19:45:44 +00:00
Sam
15f0ce1173 Nerfed bow M1 and M2, slightly buffed bow skillbar ability. 2021-01-24 14:24:59 -05:00
358bb159e9 Added gem models for item_manifest 2021-01-24 18:20:10 +00:00
a9c79d1798 Merge branch 'sam/mindflayer-rebalance' into 'master'
Rebalanced mindflayer.

See merge request veloren/veloren!1728
2021-01-24 18:03:02 +00:00
2a69813cf8 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
6fb816f71c Added to changelog. 2021-01-24 16:52:56 +00:00
95c67cbfbd 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
000105d950 Rebalanced mindflayer. 2021-01-24 10:56:12 -05:00
5ba5740305 Added 6 gems, removed shiny gem from cave, replaced with diamond. 2021-01-24 14:00:49 +00:00
ee2f0f55fa Glider deploy stamina cost value tweak 2021-01-24 12:06:23 +01:00
712baf9c33 Glider stamina only costs on deploy 2021-01-24 10:56:35 +01:00
fe536dda2f 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
c7700f4caf General NPC Hitbox Adjustments 2021-01-24 04:00:57 +00:00
1742933bc5 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
1a9b60d036 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
ca55c63a40 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
17f358681b 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
7c6ce75e6b Merge branch 'torvus-quick-fix' into 'master'
Fix torvus

See merge request veloren/veloren!1720
2021-01-23 22:31:15 +00:00
b853fecf61 6 new sceptres, add DPS display to tooltips 2021-01-23 23:10:36 +01:00
9092e65c2c fix ci, which was broken by merging unittests and check 2021-01-23 23:05:24 +01:00
ac87cb7155 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
1ee7cc4760 Move outcome vec from being defined in frontend and server to common. 2021-01-23 15:17:36 -05:00
e4ff0c75a5 Fixes #935 - deterministic sprite placement in caves 2021-01-23 21:14:07 +01:00
515e86fe02 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
de1fcf8938 Fix glider stamina drain 2021-01-23 18:20:43 +01:00
fd49debc90 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
ad714151b4 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
92c0d43169 Implemented #896 - Added option for Unlimited FPS 2021-01-23 08:34:38 +00:00
ceccdecb47 Merge branch 'Rotsuoy/SavannaGrass' into 'master'
Rotsuoy/savanna grass

See merge request veloren/veloren!1711
2021-01-23 07:46:54 +00:00
212ee4b407 Rotsuoy/savanna grass 2021-01-23 07:46:54 +00:00
e818403dcb Update winit and iced 2021-01-23 01:09:33 -05:00
957eb91397 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
2a6f1236d4 Sceptre nerfs. 2021-01-22 22:46:18 -05:00
Sam
3a36408461 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
4ce6e079ad 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
020e4acba4 Removed body from stats component as there is already a body component. 2021-01-22 16:50:22 -05:00
000f3fdbbb 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
32eca9b0a5 Swilliams/golem hitbox fix 2021-01-22 16:30:35 +00:00
9bc7ad453f Merge branch 'sam/lactose-tolerant-golems' into 'master'
Gives golems a spin attack

See merge request veloren/veloren!1709
2021-01-22 07:30:53 +00:00