Commit Graph

15215 Commits

Author SHA1 Message Date
Javier Pérez
497e66d2bb fix: update social.ftl 2024-02-24 14:31:01 +01:00
Javier Pérez
7cb04a7040 feat: minor adjustments 2024-02-22 22:47:05 +01:00
Javier Pérez
e8c1666d64 feat: update English translation 2024-02-22 19:56:52 +01:00
crabman
dcbbf01bd9 Merge branch 'do-no-van/more-sword-balancing' into 'master'
buff crippling/cleaving basics and fix fortitude

See merge request veloren/veloren!4328
2024-02-22 06:32:05 +00:00
Samuel Keiffer
abea5bc9f3 Merge branch 'necti/revert-sword-speed-buff-energy-reward' into 'master'
reverting recover duration of some sword attacks and increasing the energy...

See merge request veloren/veloren!4338
2024-02-22 00:59:10 +00:00
do-no-van
52c79375eb decrease cleaving cross cut damage 2024-02-21 23:23:33 +00:00
do-no-van
f051509ce1 decrease cleaving fell strike damage 2024-02-21 23:23:33 +00:00
do-no-van
e8ada67ae8 use Health::fraction 2024-02-21 23:23:33 +00:00
do-no-van
edddab997e buff crippling/cleaving basics and fix fortitude 2024-02-21 23:23:32 +00:00
crabman
7a77fa6bfd Merge branch 'crabman/glider-buff' into 'master'
Revert previous glider span length

See merge request veloren/veloren!4336
2024-02-21 22:59:21 +00:00
nectical
92bcfbd884 reverting recover duration and increasing the energy reward of sword and axe M1/M2 2024-02-21 21:55:01 +00:00
flo
ab89750a9a Merge branch 'terracotta_tweaks' into 'master'
terracotta_small_tweaks

See merge request veloren/veloren!4332
2024-02-21 21:52:09 +00:00
flo
673425f9f1 terracotta_small_tweaks 2024-02-21 21:52:09 +00:00
crabman
515e7fe4f0
revert previous glider span length 2024-02-21 20:48:24 +01:00
Samuel Keiffer
94f6c3350c Merge branch 'danielkenji83/block-based-on-poise' into 'master'
Block based on poise

See merge request veloren/veloren!4283
2024-02-21 16:53:24 +00:00
Imbris
b05350946a Merge branch 'imbris/shaderc-opt-default-off' into 'master'
Make shaderc optimization off by default for now

See merge request veloren/veloren!4335
2024-02-21 16:44:29 +00:00
crabman
2eef98f44b Merge branch 'beginner-balance-tweaks-2' into 'master'
Beginner balance tweaks addendum

See merge request veloren/veloren!4329
2024-02-21 15:39:56 +00:00
UncomfySilence
fc08c172c2 revert cave spawn chance 2024-02-21 15:50:16 +01:00
UncomfySilence
4506fdce1a review comments 2024-02-21 14:11:20 +01:00
UncomfySilence
efadb07032 wolf armor 2024-02-21 13:10:27 +01:00
UncomfySilence
f3cc4bf90f cave and tree distributions and minor tweaks 2024-02-21 12:28:41 +01:00
Imbris
9ff9a535fd Make shaderc optimization off by default for now since wgpu currently rejects if fragment shader inputs are optimized out such that they don't match fragment shader outputs 2024-02-21 00:18:06 -05:00
nectical
9efda9f189 reverting recover duration of some sword attacks and increasing the energy reward of double slash/thrust and triple chop/cleave 2024-02-20 23:23:34 +00:00
UncomfySilence
3b7a9b38af tweaks to starter weapons and secondary components w/start of entity balancing 2024-02-20 16:18:57 +01:00
UncomfySilence
d7af58aefd overworld entity distribution tweaks and movement speed changes 2024-02-20 16:18:03 +01:00
uniior
cf8371373a Address TreantSapling 2024-02-20 16:18:03 +01:00
uniior
ba0db563cc Address comments 2024-02-20 16:18:02 +01:00
uniior
7e7bfa00e4 Further tweaks from testing 2024-02-20 16:18:02 +01:00
crabman
60c58200a9 reduce XP yield of axolotls and geckos 2024-02-20 16:18:02 +01:00
crabman
2249ca6a49 don't attempt to increase duration of stackable buffs 2024-02-20 16:18:01 +01:00
uniior
e720ee834e Initial 2024-02-20 16:18:01 +01:00
danielkenji83
961edf910d Updates from review 2024-02-19 19:42:37 -03:00
danielkenji83
9d73fcfc3f Updates from review 2024-02-18 23:30:43 -03:00
flo
9031ac922a Merge branch 'phoenix_tweaks' into 'master'
phoenix_tweaks

See merge request veloren/veloren!4331
2024-02-18 19:11:34 +00:00
flo
605cb0837f phoenix_tweaks 2024-02-18 19:11:34 +00:00
danielkenji83
1271b5ff9a Remove block_strength stat from main.rs 2024-02-17 19:56:56 -03:00
danielkenji83
c449b229d5 Updates from review 2024-02-17 19:09:32 -03:00
crabman
4adfebf063 Merge branch 'james/get-lit' into 'master'
Apply burning buff to entities touching another entity with the burning buff

See merge request veloren/veloren!4326
2024-02-17 21:56:56 +00:00
James Melkonian
cc059e2882 Apply burning buff to entities touching another entity with the burning buff 2024-02-17 21:56:55 +00:00
danielkenji83
53fddba3ef Remove block_strength stat 2024-02-17 13:12:34 -03:00
Illia Denysenko
9434b11ae3 Merge branch 'fvasco-common-items-npc' into 'master'
Italian translation

See merge request veloren/veloren!4330
2024-02-17 14:05:00 +00:00
Francesco Vasco
2480469cbb Italian translation 2024-02-17 13:23:05 +01:00
danielkenji83
1c504ea060 Rebase fix 2024-02-17 01:07:55 -03:00
danielkenji83
81cfb26059 Updates from review 2024-02-17 00:50:30 -03:00
danielkenji83
5c401215cf Rebase commit 2024-02-17 00:50:23 -03:00
Imbris
8e62c17a81 Merge branch 'imbris/shaderc-opt' into 'master'
Fix issue with missing capability when enabling shaderc optimizations

Closes #1936

See merge request veloren/veloren!4322
2024-02-15 17:25:12 +00:00
flo
99c997fabd Merge branch 'terracotta_ruins' into 'master'
terracotta

See merge request veloren/veloren!4286
2024-02-15 06:08:04 +00:00
flo
ed4fd55bc3 terracotta 2024-02-15 06:08:03 +00:00
crabman
5c4e68cce7 Merge branch 'beginner_balance_tweaks' into 'master'
Beginner balance tweaks

See merge request veloren/veloren!4269
2024-02-14 23:23:29 +00:00
Youssef Fahmy
0d2938d8f1 Beginner balance tweaks 2024-02-14 23:23:29 +00:00