Commit Graph

1414 Commits

Author SHA1 Message Date
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
edddab997e buff crippling/cleaving basics and fix fortitude 2024-02-21 23:23:32 +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
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
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
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
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
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
605cb0837f phoenix_tweaks 2024-02-18 19:11:34 +00:00
danielkenji83
c449b229d5 Updates from review 2024-02-17 19:09:32 -03:00
danielkenji83
53fddba3ef Remove block_strength stat 2024-02-17 13:12:34 -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
flo
ed4fd55bc3 terracotta 2024-02-15 06:08:03 +00:00
Youssef Fahmy
0d2938d8f1 Beginner balance tweaks 2024-02-14 23:23:29 +00:00
Maxicarlos08
88feb4cc60
removed unused fields from item assets 2024-02-06 22:05:08 +01:00
unknown
c3942b5f1f
Removed crit_chance stat from two item .ron files 2024-02-06 21:47:41 +01:00
maxicarlos08
8d3cd277b9 Merge branch 'jcoxeye/price-entries' into 'master'
Lots of price entries for miscellaneous items

See merge request veloren/veloren!4231
2024-01-24 06:57:07 +00:00
maxicarlos08
ef84ab6603 Merge branch 'jcoxeye/item-tiering-fixes' into 'master'
Adjusted tiers of various items

See merge request veloren/veloren!4249
2024-01-23 21:58:14 +00:00
JCoxeye
d017844416 Adjusted tiers of various items 2024-01-23 21:58:14 +00:00
JCoxeye
3207df3762 Rebalances, and moved sandals to cloth armor loot table, in line with other starter armor. 2024-01-23 16:46:24 -05:00
do-no-van
8c5759cb5e balance sword abilities 2024-01-21 20:18:19 +00:00
Illia Denysenko
5137966940 Merge branch 'evgenkot/follow-up-processing-of-i18n-items' into 'master'
i18n items processing

See merge request veloren/veloren!4260
2024-01-21 18:45:08 +00:00
evgenkot
7fb8506565 Split i18n items by category 2024-01-21 21:29:27 +05:00
evgenkot
799d636833 Change names of items with the same vox descriptor
| old | new |
|-|-|
| object-key_rusty-0-ancient | object-key_quarry_ancient |
| object-key_rusty-0-backdoor | object-key_quarry_backdoor |
| items-keeper_goggle | object-key_quarry_keeper_goggle_left |
| items-keeper_goggle-flamekeeper_right | object-key_quarry_keeper_goggle_right |
| object-key_rusty-0-overseer | object-key_quarry_overseer |
| object-key_rusty-0-smelting | object-key_quarry_smelting |
| weapon-staff-firestaff_starter | weapon-staff-firestaff_humble_stick |
| weapon-staff-firestaff_starter_gnarled | weapon-staff-firestaff_starter |
| weapon-hammer-2hhammer_rusty-starter_hammer | weapon-hammer-2hhammer_starter |
| armor-misc-chest-worker_green-worker_orange_0 | armor-misc-chest-worker_orange_0 |
| armor-misc-chest-shirt_white-worker_orange_1 | armor-misc-chest-worker_orange_1 |
| armor-misc-chest-worker_green-worker_purple_0 | armor-misc-chest-worker_purple_0 |
| armor-misc-chest-shirt_white-worker_purple_1 | armor-misc-chest-worker_purple_1 |
| armor-misc-chest-worker_green-worker_red_0 | armor-misc-chest-worker_red_0 |
| armor-misc-chest-shirt_white-worker_red_1 | armor-misc-chest-worker_red_1 |
| armor-misc-chest-worker_green-worker_yellow_0 | armor-misc-chest-worker_yellow_0 |
| armor-misc-chest-shirt_white-worker_yellow_1 | armor-misc-chest-worker_yellow_1 |
| armor-misc-back-backpack-backpack | armor-misc-back-backpack-traveler |
| armor-tabard_admin-admin | armor-tabard-admin_tabard |
| armor-misc-back-admin-admin_back | armor-misc-back-admin_back |
| weapon-sword-frost-1-admin_sword | weapon-sword-frost-admin_sword |
| armor-velorite_battlemage-belt-cultist_belt | armor-velorite-belt |
| armor-velorite_battlemage-foot-cultist_boots | armor-velorite-boots |
| armor-velorite_battlemage-chest-cultist_chest_blue | armor-velorite-chest |
| armor-velorite_battlemage-hand-cultist_hands_blue | armor-velorite-hands |
| armor-velorite_battlemage-pants-cultist_legs_blue | armor-velorite-legs |
| armor-velorite_battlemage-shoulder-cultist_shoulder_blue | armor-velorite-shoulder |
| armor-velorite_battlemage-back-dungeon_purple | armor-velorite-back |
| weapon-bow-velorite-velorite_bow_debug | weapon-bow-velorite-debug |
| sprite-mineral-ore-coal | sprite-mineral-stone-coal |
| sprite-mineral-ore-coal-coal | sprite-mineral-ore-coal |
| sprite-crafting_ing-animal_misc-grim_eyeball | sprite-crafting_ing-animal_misc-cyclops_eyeball |
| sprite-crafting_ing-animal_misc-grim_eyeball-grim_eyeball | sprite-crafting_ing-animal_misc-grim_eyeball |
| object-potion_red-potion_big | object-potion_big |
| object-potion_red-potion_med | object-potion_med |
| object-potion_red-potion_minor | object-potion_minor |
| sprite-flowers-sunflower_1-yellow | sprite-flowers-yellow |
2024-01-21 21:21:10 +05:00
maxicarlos08
83a24acc1e
Add charm animation 2024-01-21 15:00:06 +01:00
Sam
95835887e1
Charms now have crafting recipes. 2024-01-21 15:00:06 +01:00
Samuel Keiffer
3224bc5147 Merge branch 'crabman/earthsplitter-nerf' into 'master'
earthsplitter nerf

See merge request veloren/veloren!4264
2024-01-20 18:30:55 +00:00
flo
48a79b3e78 haniwa 2024-01-20 17:45:23 +00:00
Maxicarlos08
d30fed3961
earthsplitter nerf 2024-01-20 18:32:29 +01:00
juliancoffee
d3fcade857 Rename ItemL10n to ItemI18n 2024-01-16 19:14:14 +02:00
juliancoffee
7228543fbf Mark legacy item asset content 2024-01-14 21:25:15 +02:00
juliancoffee
28b400825e Add item localization assets 2024-01-14 21:25:15 +02:00
juliancoffee
b8e6840bf6 Enhance /kit all
- "all" is now in proposed completions
- `/kit all` gives all imaginable items, it's not limited to assets
  anymore
2024-01-14 21:25:15 +02:00
JCoxeye
be951e747c Merge branch veloren:master into jcoxeye/price-entries 2024-01-11 14:21:23 +00:00
Hrom
88c5a2e009 renamed twiggy shoulders 2024-01-09 23:54:32 +00:00
Pybit
f6204f9d04 Merge branch 'master' into 'More-potions'
# Conflicts:
#   CHANGELOG.md
2024-01-04 11:48:30 +00:00
Sam
f65d449aa3 Deprecated combo melee character state 2023-12-28 19:02:10 -05:00
JCoxeye
49994af136 Added glacial crystal to unsellable_materials.ron, and buffed price of boreal armor by 5x. 2023-12-27 08:34:27 -05:00