Commit Graph

12574 Commits

Author SHA1 Message Date
flo666
79e6fd58fe - make tricksters spawn in groups and play instruments
- remove defunct draugr flee
2022-10-23 20:05:39 +02:00
flo666
82026c1acc remove defunct headband from trickster loadout 2022-10-23 20:05:39 +02:00
flo666
60a48e450c facegourd and helmet offset (Female Orc) 2022-10-23 20:05:39 +02:00
flo666
e1bd385408 make draugrs Npcs flee at health below 100%,
trickster gear,
single spawns (trickster, dullahan),
2022-10-23 20:05:39 +02:00
flo666
1d98050f28 halloween npcs:
in forests, spawn harvester or dullahans or tricksters with custom halloween loot: facegourd, pumpkin_spice_brew, honeygourd
2022-10-23 20:05:39 +02:00
Isse
3b2eba1457 autumn leaves 2022-10-23 20:05:39 +02:00
IsseW
9c4736f47b Make pumpkins more common for Halloween 2022-10-23 20:05:39 +02:00
IsseW
1d6b7d6a03 Add Halloween event 2022-10-23 20:05:39 +02:00
Joshua Barretto
8d8d9309b0 Merge branch 'floppy_instruments_foot_animation_fix' into 'master'
floppy_instruments_foot_animation_fix

See merge request veloren/veloren!3665
2022-10-22 22:47:26 +00:00
flo
050150e7e8 floppy_instruments_foot_animation_fix 2022-10-22 22:47:25 +00:00
Joshua Barretto
ed5e9b4aa9 Merge branch 'floppy_savannah_pit' into 'master'
savannah_pit

See merge request veloren/veloren!3624
2022-10-22 19:48:50 +00:00
flo
698a00bae3 savannah_pit 2022-10-22 19:48:50 +00:00
Marcel
938fd77b5a Merge branch 'floppy_instrument_samples' into 'master'
floppy_instrument_samples

See merge request veloren/veloren!3664
2022-10-21 07:58:41 +00:00
flo
1d04c9ba8c floppy_instrument_samples 2022-10-21 07:58:41 +00:00
Samuel Keiffer
60be658518 Merge branch 'fix_gnarling_mask_drop_visual' into 'master'
fix drop model for chieftain mask

See merge request veloren/veloren!3663
2022-10-20 22:57:06 +00:00
Monty Marz
3a63f210b2 fix drop model for chieftain mask 2022-10-21 00:20:15 +02:00
Isse
712db9adea Merge branch 'hot-fix' into 'master'
Hot-fix for sword

See merge request veloren/veloren!3660
2022-10-19 22:03:42 +00:00
Youssef Fahmy
44e19d7c54 Hot-fix for sword 2022-10-19 22:03:42 +00:00
Samuel Keiffer
dbc1872016 Merge branch 'sam/armor-nerf' into 'master'
Armor nerf

See merge request veloren/veloren!3651
2022-10-19 14:08:45 +00:00
Sam
b1f45ea241 Sword triple strike tweaks. 2022-10-19 09:36:20 -04:00
Sam
69bb7d9047 Changelog 2022-10-19 09:34:11 -04:00
UncomfySilence
f21082fa76 minor stat tweaks and cleanup 2022-10-16 14:12:37 +02:00
Sam
8eb89adb61 Fixed unintentional overbuff to speed focused secondary components 2022-10-16 14:06:42 +02:00
UncomfySilence
c432a0b719 rings and necks 2022-10-16 14:06:42 +02:00
Sam
3222fb88b0 Nerfed melee combo melee skills 2022-10-16 14:06:42 +02:00
UncomfySilence
fe87f8c38d induv hat stat changes 2022-10-16 14:06:42 +02:00
Sam
2735d3403c Nerfed other sets 2022-10-16 14:06:41 +02:00
Sam
46daa6bfa9 Armor nerf 2022-10-16 14:06:41 +02:00
Marcel
471b5996c3 Merge branch 'pfau/things' into 'master'
Add gnarling chieftain mask

See merge request veloren/veloren!3657
2022-10-15 11:05:21 +00:00
Monty Marz
2d8627c29b Add gnarling chieftain mask 2022-10-15 11:05:21 +00:00
Imbris
0c05fe54d3 Merge branch '4ydx/overflow-fix' into 'master'
Fix int overflows causing crash when using /goto

See merge request veloren/veloren!3656
2022-10-13 13:58:03 +00:00
4ydx
4ae332b8d1 Fix int overflows causing crash when using /goto 2022-10-13 13:58:02 +00:00
Joshua Barretto
b677051ef8 Merge branch 'zesterer/perf2' into 'master'
Various terrain-related performance improvements

See merge request veloren/veloren!3655
2022-10-12 14:46:13 +00:00
Joshua Barretto
3c54e63592 Various minor optimisations 2022-10-12 13:57:14 +01:00
Joshua Barretto
8800bdbef6 Updated missed changelog entry 2022-10-11 23:57:48 +01:00
Isse
536bb9b71c Merge branch 'zesterer/citadel' into 'master'
Two new tree types and disabled citadel site.

See merge request veloren/veloren!3652
2022-10-10 16:19:48 +00:00
Samuel Keiffer
51b679928a Merge branch 'james/recipes' into 'master'
Add unit test to validate recipe keys

See merge request veloren/veloren!3653
2022-10-10 05:03:37 +00:00
James Melkonian
99d547c7c6 Add unit test to validate recipe keys 2022-10-09 20:50:09 -07:00
IsseW
2ba5b33868 fmt 2022-10-10 00:15:57 +02:00
IsseW
c8a08b4794 fix warnings 2022-10-09 23:42:38 +02:00
Joshua Barretto
0a6ac5f5f1 sync 2022-10-09 23:25:40 +02:00
Joshua Barretto
68df88a721 Added redwoods 2022-10-09 23:23:43 +02:00
Joshua Barretto
1392a8662f Added dead trees 2022-10-09 23:23:42 +02:00
Joshua Barretto
0b5d043d8e Began work on citadel 2022-10-09 23:23:39 +02:00
Marcel
160cbbf449 Merge branch 'steel_pick_desc' into 'master'
Removes blue vein reference from Steel Pickaxe description

See merge request veloren/veloren!3491
2022-10-09 19:50:31 +00:00
Julio Cezar Silva
0d090bb93e Removes blue vein reference from Steel Pickaxe description 2022-10-09 19:50:30 +00:00
Joshua Barretto
dbc7ac9710 Merge branch 'kilpkonn/fix_agent_target_unset_in_trade' into 'master'
Fix npcs untargeting trade partner while in trade

Closes #1725

See merge request veloren/veloren!3649
2022-10-07 15:06:40 +00:00
Tavo Annus
fcd7447991 Fix npcs untargeting trade partner while in trade 2022-10-07 15:17:49 +03:00
Marcel
d4f5a18bd0 Merge branch 'tygyh/Swedish-translations' into 'master'
Update swedish translation

See merge request veloren/veloren!3648
2022-10-05 09:12:16 +00:00
tygyh
fcc096c599 Update swedish translation 2022-10-05 09:48:18 +02:00