Marcel
d96679d4ef
Merge branch 'xMAC94x/logging_fix' into 'master'
...
fix logging cnt didnt reset
See merge request veloren/veloren!2518
2021-06-27 21:54:35 +00:00
Marcel
aa8069b53b
Merge branch 'aweinstock/dungeonvoxel' into 'master'
...
Use new dungeons in dungeon_voxel_export, remove old dungeon sampling...
See merge request veloren/veloren!2516
2021-06-27 21:54:32 +00:00
Marcel
730de326d7
Merge branch 'yusdacra/chore/nix' into 'master'
...
build(nix): fix audio resource patching
See merge request veloren/veloren!2517
2021-06-27 20:54:24 +00:00
Marcel Märtens
172dbfbfbd
fix logging cnt didnt reset
2021-06-27 22:51:23 +02:00
Yusuf Bera Ertan
1cfad57684
build(nix): fix audio resource patching
2021-06-27 23:23:01 +03:00
Avi Weinstock
7a5388b8bb
Use new dungeons in dungeon_voxel_export, remove old dungeon sampling function, and add more of world/examples to CI.
2021-06-27 15:35:43 -04:00
Marcel
0137c7f77c
Merge branch 'drunkonhotcoco/issue_1204_chat_scroll_fix' into 'master'
...
Added fix for Issue #1204 - Incorrect scrolling when switching between filtered tabs
See merge request veloren/veloren!2514
2021-06-27 18:18:02 +00:00
DrunkOnHotCoco
5852dad802
Added fix for Issue #1204 - Incorrect scrolling when switching between filtered tabs
2021-06-27 18:18:01 +00:00
Marcel
9e47c177d2
Merge branch 'alphyr/assets_manager0_5' into 'master'
...
Update `assets_manager` to 0.5
See merge request veloren/veloren!2501
2021-06-27 15:50:16 +00:00
Justin Shipsey
b5855abe28
Merge branch 'update_pt_BR_20210627' into 'master'
...
Update pt br 20210627
See merge request veloren/veloren!2511
2021-06-27 03:26:44 +00:00
Nícolas Wildner
a05cebc64e
Update pt br 20210627
2021-06-27 03:26:44 +00:00
Snowram
1c7c70c1bf
Merge branch 'juliancoffee/fix_dismantle' into 'master'
...
Improve Dismantle UX
See merge request veloren/veloren!2498
2021-06-27 00:11:01 +00:00
juliancoffee
641aa921bf
style
2021-06-27 02:44:19 +03:00
Ben Wallis
925a174205
Merge branch 'xvar/fix-plugin-build-warnings' into 'master'
...
Fixed build warnings for server-cli related to non-default plugin feature
See merge request veloren/veloren!2506
2021-06-26 21:35:54 +00:00
Ben Wallis
ed9c619822
Fixed build warnings for server-cli related to non-default plugin feature
2021-06-26 21:56:03 +01:00
Ben Wallis
12b1d1a6ca
Merge branch 'aweinstock/fix-warlord-warlock-migration' into 'master'
...
Rename `remove_warlock_warlord` migration so it actually triggers.
See merge request veloren/veloren!2507
2021-06-26 20:49:28 +00:00
Avi Weinstock
bea9de0d46
Rename remove_warlock_warlord migration so it actually triggers.
2021-06-26 16:28:49 -04:00
juliancoffee
cba3187b92
Split Material and Dismantle crafting tabs
2021-06-26 21:37:13 +03:00
juliancoffee
f533e3433c
Add is_recycling field to recipe book
2021-06-26 21:37:13 +03:00
juliancoffee
fb8787a826
Sort tabs in logical sequence
2021-06-26 21:37:13 +03:00
juliancoffee
ffa01621c1
Clean Material tags
...
- Make ferocious set (currently not lootable) made from Moonweave
- Remove material tag from twig sets
2021-06-26 21:37:13 +03:00
juliancoffee
71e18ef310
Dismantle Leather items to Thick Leather
...
- Previously both Leather and Rawhide items were dismantled to simple
leather
2021-06-26 21:37:13 +03:00
juliancoffee
e22ddb0385
Improve Dismantle UX
...
- Change `Any {}` to `Any {} item` so for example when you want to
dismantle something into linen, you will see `Any linen item` which
points you that you need to get some item which is made from linen, and
not some generic linen.
2021-06-26 21:37:13 +03:00
Ben Wallis
d76c40bb5c
Merge branch 'xvar/default-publish-feature' into 'master'
...
Added default-publish feature and updated build scripts.
See merge request veloren/veloren!2504
2021-06-26 18:04:53 +00:00
Imbris
8b747e1035
Merge branch 'danacus/enumstring' into 'master'
...
Fixing #1169 - use strum macros for BlockKind conversion
Closes #1169
See merge request veloren/veloren!2503
2021-06-26 16:52:26 +00:00
Ben Wallis
f8dc0e3a2c
Added default-publish feature and updated build scripts.
2021-06-26 17:48:48 +01:00
Daan Vanoverloop
7d39c14481
Fixing #1169 - use strum macros for BlockKind conversion
2021-06-26 17:52:32 +02:00
Benoît du Garreau
ab3c8cf764
Update assets_manager to 0.5
2021-06-26 12:05:40 +02:00
Justin Shipsey
dbc3243691
Merge branch 'swilliams/jewellery' into 'master'
...
Gem Rings and small change to trading.
See merge request veloren/veloren!2500
2021-06-26 02:44:04 +00:00
Scott Williams
14f16a3a47
Gem Rings and small change to trading.
2021-06-26 02:44:02 +00:00
Joshua Barretto
9c746f7867
Merge branch 'aweinstock/site2dungeon' into 'master'
...
Convert dungeons to site2.
See merge request veloren/veloren!2499
2021-06-25 23:06:24 +00:00
Avi Weinstock
7b2adc0e22
Rename difficulty to dungeon_difficulty.
2021-06-25 18:18:27 -04:00
Snowram
593f12c861
Merge branch 'snowram/new-npcs-batch' into 'master'
...
Snowram/new npcs batch
See merge request veloren/veloren!2495
2021-06-25 20:29:41 +00:00
Avi Weinstock
98a1034167
Tweaks to dungeon pillars.
2021-06-25 15:54:42 -04:00
Snowram
a81c71b461
Increases base damage of husk attack, rename some cultist weapons
2021-06-25 21:18:28 +02:00
Avi Weinstock
2221825533
Add comments to dungeon code. Fix the radius calculation (which lead to dungeons getting truncated), and fix sprites spawning above staircases.
2021-06-25 14:08:23 -04:00
Joshua Barretto
0b571af2a5
Merge branch 'AldanTanneo/smooth-layers-shader-fix' into 'master'
...
Fixes a block noise issue at specific layers (z=434 among others)
See merge request veloren/veloren!2494
2021-06-25 12:43:27 +00:00
Avi Weinstock
97d0be5a15
Fix tests and examples to point to site2 dungeons.
2021-06-24 23:21:49 -04:00
Avi Weinstock
f74506038d
Convert dungeon lights to CSG, tweak pillars, convert the magic circle from lava to glowing rock, make enemies spawn in dungeons, and fix clippy warnings.
2021-06-24 23:03:24 -04:00
Snowram
3b393a9c5c
Ajust new npcs from feedback
2021-06-25 03:26:32 +02:00
Marcel
6f0e40d907
Merge branch 'juliancoffee/update-uk_UA' into 'master'
...
(uk_UA) small fitting fix
See merge request veloren/veloren!2497
2021-06-24 17:43:23 +00:00
Snowram
f518aebe81
Ajustments to new npcs
2021-06-24 19:31:21 +02:00
Snowram
38c9ff5225
Husk brute animations
2021-06-24 19:31:19 +02:00
Snowram
080328941b
Adds alpaca and llama npcs
2021-06-24 19:30:15 +02:00
Snowram
78afaf32a2
Removes warlord and warlock armours
2021-06-24 19:30:11 +02:00
Snowram
21b526856d
Adds new species
2021-06-24 19:29:44 +02:00
juliancoffee
6016d19602
(uk_UA) small fitting fix
2021-06-24 19:52:38 +03:00
Samuel Keiffer
36b0e326f5
Merge branch 'sam/harvester' into 'master'
...
Harvester
See merge request veloren/veloren!2413
2021-06-24 04:15:56 +00:00
Sam
cd1ede0131
Balance tweaks.
2021-06-23 22:38:37 -05:00
Sam
4d5ab5c374
Added sparseness field to sprite summon.
2021-06-23 22:38:16 -05:00
