c214f2f940
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
da319e71ec
Added default-publish feature and updated build scripts.
2021-06-26 17:48:48 +01:00
0076b8379c
Fixing #1169 - use strum macros for BlockKind conversion
2021-06-26 17:52:32 +02:00
1cba7db9b6
Update assets_manager to 0.5
2021-06-26 12:05:40 +02:00
f983295318
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
8d0a1ad7b4
Gem Rings and small change to trading.
2021-06-26 02:44:02 +00:00
768e1c0d31
Merge branch 'aweinstock/site2dungeon' into 'master'
...
Convert dungeons to site2.
See merge request veloren/veloren!2499
2021-06-25 23:06:24 +00:00
0ac6305dfc
Rename difficulty to dungeon_difficulty.
2021-06-25 18:18:27 -04:00
6e8daefa97
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
524dd02f45
Tweaks to dungeon pillars.
2021-06-25 15:54:42 -04:00
379e755006
Increases base damage of husk attack, rename some cultist weapons
2021-06-25 21:18:28 +02:00
7328b71243
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
b66957bf74
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
6af988b806
Fix tests and examples to point to site2 dungeons.
2021-06-24 23:21:49 -04:00
19979413d5
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
ef6d6563ea
Ajust new npcs from feedback
2021-06-25 03:26:32 +02:00
3e421917e2
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
d7f25627ab
Ajustments to new npcs
2021-06-24 19:31:21 +02:00
8760b69345
Husk brute animations
2021-06-24 19:31:19 +02:00
58b95d12d4
Adds alpaca and llama npcs
2021-06-24 19:30:15 +02:00
fef0f407d3
Removes warlord and warlock armours
2021-06-24 19:30:11 +02:00
87ca00fac0
Adds new species
2021-06-24 19:29:44 +02:00
1eb9c165be
(uk_UA) small fitting fix
2021-06-24 19:52:38 +03:00
58f237eaf5
Ensure bind groups are ordered with the most frequently changed ones in later slots
2021-06-24 00:47:59 -04:00
e3bf77298b
Merge branch 'sam/harvester' into 'master'
...
Harvester
See merge request veloren/veloren!2413
2021-06-24 04:15:56 +00:00
645cc60dc0
Balance tweaks.
2021-06-23 22:38:37 -05:00
f0c5ed1397
Added sparseness field to sprite summon.
2021-06-23 22:38:16 -05:00
68c6a0a495
Balance tweaks for harvester.
2021-06-23 22:38:16 -05:00
aac24ad601
Added ensnared debuff icon.
2021-06-23 22:38:16 -05:00
47cc040301
Adds SpriteSummon animation
2021-06-23 22:38:16 -05:00
c162827f97
Harvester AI
2021-06-23 22:38:16 -05:00
0a32b676c8
Vines now ensnare you by applying a buff.
2021-06-23 22:38:16 -05:00
763461ebef
Ensnaring vines now ensnare you.
2021-06-23 22:38:16 -05:00
ed503236d6
Slightly functional sprite summon.
2021-06-23 22:38:16 -05:00
15a2fbc555
3 attack anims done
2021-06-23 22:38:16 -05:00
879aafad5c
3 attacks done
2021-06-23 22:38:16 -05:00
033dbbf02a
Add pillars and wall sconces to site2 dungeons.
2021-06-23 23:22:14 -04:00
c68d79315e
Add wall contours and sprites to site2 dungeon. Also add septagon decal in boss rooms.
2021-06-23 23:22:14 -04:00
c8383aba38
Traverse the dungeon tile structure to create the rooms, and align the stairs.
2021-06-23 23:22:14 -04:00
c6bb61f2e6
Add Primitive::Prefab and Fill::Prefab for coloring dungeon entrances.
2021-06-23 23:22:14 -04:00
95214649db
Get structures loading via sampling primitive.
2021-06-23 23:22:14 -04:00
df4f536523
Progress on converting dungeons to site2. Adds Sampling and Translate primitives.
2021-06-23 23:22:14 -04:00
46e93ba563
Merge branch 'juliancoffee/slow_food' into 'master'
...
Balance food to have sane health per second regen
See merge request veloren/veloren!2490
2021-06-24 01:45:10 +00:00
f1b83962bd
Fixed smooth layer at z=434 (and a few other)
2021-06-23 21:13:15 +02:00
87c86b919b
Merge branch 'yusdacra/chore/nix' into 'master'
...
build(nix): update audio resource patch
See merge request veloren/veloren!2493
2021-06-23 06:46:02 +00:00
1b3a8db8d4
build(nix): update audio resource patch
2021-06-23 08:52:04 +03:00
16633cc3ec
Merge branch 'slipped/movetweak' into 'master'
...
strafe side speed tweak
See merge request veloren/veloren!2492
2021-06-23 02:48:38 +00:00
81aaf30d00
stride speed backwardd-dependence
2021-06-22 22:08:34 -04:00
ced180bbc9
changelog
2021-06-22 20:52:44 +03:00
ccf7c7a0e4
Balance food to have sane health per second regen
...
* Gatherable food gives you slightly variable regen with variable time
based on tier and that fact that we have x2 health on endgame character.
For example while mushroom gives you 5 health over 10 seconds (0.5 health-per-second),
mushroom curry will give you 120 health over 80 seconds (1.5 health-per-second).
* Meat gives you twice powerful regen strength, but with twice shorter
duration
2021-06-22 20:51:31 +03:00
