46772c67e3
Remove post-armor crit damage
2021-06-30 03:16:04 +03:00
ef6a12edc2
bumb Biped Cultist armour
2021-06-30 02:10:39 +03:00
f5533cdb92
Moved match on ItemUseKind to create durations to a function under ItemUseKind.
2021-06-29 05:59:02 -05:00
8a9de26132
Food now applies buff at end of state.
...
Rolling and poise states now cancel the potion buff.
UseItem character state now checks that the item in the slot has the same item_definition_id as when the entity enters the state.
Rolling can no cancel item use.
Rolling now checks for move_dir instead of velocity.
2021-06-29 05:59:02 -05:00
37c6fe9ee8
anims
2021-06-29 05:59:02 -05:00
9ff7ecea81
Item use now goes through use item character state if it is a consumable.
2021-06-29 05:59:02 -05:00
3559ce5803
Added UseItem character state.
2021-06-29 05:59:02 -05:00
1978b590aa
Destringified consumables
2021-06-29 05:59:02 -05:00
47b3b5e5d9
Generate palette info from block statistics, and benchmark how well it compresses.
2021-06-28 22:11:19 -04:00
aaf5f89076
Merge branch 'snowram/death-outcome' into 'master'
...
Adds an outcome to death with SFX and VFX
See merge request veloren/veloren!2519
2021-06-28 23:18:45 +00:00
3ec5306ed0
Adds an outcome to death with SFX and VFX
2021-06-29 00:14:05 +02:00
11d2017bb3
Extract 'swap_equipment' and 'swap_armor' functions
2021-06-28 16:17:18 +02:00
f063dcd939
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
b477eac816
Merge branch 'juliancoffee/fix_dismantle' into 'master'
...
Improve Dismantle UX
See merge request veloren/veloren!2498
2021-06-27 00:11:01 +00:00
681fd37429
style
2021-06-27 02:44:19 +03:00
12243bd0c0
Add is_recycling field to recipe book
2021-06-26 21:37:13 +03: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
379e755006
Increases base damage of husk attack, rename some cultist weapons
2021-06-25 21:18:28 +02: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
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
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
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
c6bb61f2e6
Add Primitive::Prefab
and Fill::Prefab
for coloring dungeon entrances.
2021-06-23 23:22:14 -04:00
81aaf30d00
stride speed backwardd-dependence
2021-06-22 22:08:34 -04:00
8356e2ffca
Merge branch 'aweinstock/lava' into 'master'
...
Lava
See merge request veloren/veloren!2482
2021-06-21 20:49:44 +00:00
e930ff6779
Sanitise controller inputs
2021-06-21 21:13:49 +01:00
90e5bac395
Made movement slower when strafing in non-forward directions
2021-06-21 20:32:20 +01:00
288f2c13d4
Enable strafing in first-person mode
2021-06-21 13:27:19 +01:00
ec7d3b5e37
Merge branch 'swilliams/give_item_fix' into 'master'
...
Fix for Issue 1210
See merge request veloren/veloren!2484
2021-06-20 23:26:59 +00:00
b0574b4ddc
Merge branch 'imbris/tracy' into 'master'
...
Refactor Client message handling, improve use of tracy, increase coverage of profiling spans in voxygen
See merge request veloren/veloren!2479
2021-06-20 23:17:08 +00:00
80c45b6396
Added another .replace
2021-06-20 22:55:58 +01:00
0f9181cbcb
Address MR 2482 comments.
...
- Change lava density to 3x water density.
- Use `ServerEvent::Buff` instead of modifying the buff component directly.
- Revert commented-out changes to fluid shaders.
2021-06-20 11:32:05 -04:00
f1a1160b80
Make lava solid w.r.t. rendering while still being liquid w.r.t. physics.
2021-06-19 16:52:21 -04:00
2226a4c6a9
Add lava to caves, which sets you on fire if you swim in it. Currently requires uncommenting #define LAVA
in the shaders, and only looks good with cheap fluid mode.
2021-06-19 16:31:21 -04:00