Commit Graph

8939 Commits

Author SHA1 Message Date
João Capucho
164bb4f87f
DOESN'T WORK
I made this commit because I've accidentally broke this when rebasing
and deleted the veloren folder and don't want to write this for the 4th
time.

Please ignore this.
2021-06-30 16:10:24 +01:00
Joshua Barretto
269c6171e4 Merge branch 'DaforLynx/aeh' into 'master'
Sfx fixes and new test

See merge request veloren/veloren!2529
2021-06-30 11:43:01 +00:00
DaforLynx
a757bf3dbd Sfx fixes and new test 2021-06-30 11:43:00 +00:00
Samuel Keiffer
593e47418c Merge branch 'juliancoffee/dark_curry' into 'master'
Add variance to food drop in T5 dungeon

See merge request veloren/veloren!2522
2021-06-30 01:14:45 +00:00
Samuel Keiffer
07abf65bd6 Merge branch 'juliancoffee/remove_post_armor_crit' into 'master'
Remove post-armor crit damage

See merge request veloren/veloren!2531
2021-06-30 00:58:12 +00:00
juliancoffee
21a29ecf74 Add CorruptionSpores
- New lootable food which you can find as husk or darkhound drop
2021-06-30 03:33:06 +03:00
juliancoffee
46772c67e3 Remove post-armor crit damage 2021-06-30 03:16:04 +03:00
Samuel Keiffer
0151e5aeed Merge branch 'potion-animations' into 'master'
Consumable Animations

See merge request veloren/veloren!2512
2021-06-29 16:36:41 +00:00
Marcel
fefedacf20 Merge branch 'sam/fix-oob-index' into 'master'
Small fixes

See merge request veloren/veloren!2527
2021-06-29 11:58:02 +00:00
Sam
4cdf081a40 Removed potential for accessing OOB index and panicking in animations for combo melee.
Made only entities with a character state component emit a death outcome on death.
2021-06-29 06:20:26 -05:00
Sam
f5533cdb92 Moved match on ItemUseKind to create durations to a function under ItemUseKind. 2021-06-29 05:59:02 -05:00
Sam
381c7121c6 Changelog 2021-06-29 05:59:02 -05:00
Sam
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
jshipsey
37c6fe9ee8 anims 2021-06-29 05:59:02 -05:00
Sam
9ff7ecea81 Item use now goes through use item character state if it is a consumable. 2021-06-29 05:59:02 -05:00
Sam
3559ce5803 Added UseItem character state. 2021-06-29 05:59:02 -05:00
Sam
1978b590aa Destringified consumables 2021-06-29 05:59:02 -05:00
Snowram
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
Snowram
3ec5306ed0 Adds an outcome to death with SFX and VFX 2021-06-29 00:14:05 +02:00
Ben Wallis
94fa7da4fa Merge branch 'aweinstock/scaleprice' into 'master'
Add prices for dragonscale, hard carapace, and plate, so that more craftable armors have prices.

See merge request veloren/veloren!2521
2021-06-28 21:03:44 +00:00
Marcel
cd1c3f3a28 Merge branch 'tygyh/Loadout-builder-refactor' into 'master'
Extract 'swap_equipment' and 'swap_armor' functions

See merge request veloren/veloren!2525
2021-06-28 20:19:49 +00:00
Imbris
20a9a420c6 Merge branch 'imbris/bind-order' into 'master'
Ensure bind groups are ordered with the most frequently changed ones in later slots

See merge request veloren/veloren!2496
2021-06-28 15:39:31 +00:00
Dr. Dystopia
11d2017bb3 Extract 'swap_equipment' and 'swap_armor' functions 2021-06-28 16:17:18 +02:00
Avi Weinstock
0ab451ec36 Add prices for dragonscale, hard carapace, and plate, so that more craftable armors have prices. 2021-06-28 09:24:22 -04:00
Marcel
7c135fb6ff Merge branch 'juliancoffee/fix_clippy' into 'master'
update Cargo.lock

See merge request veloren/veloren!2523
2021-06-28 13:24:11 +00:00
juliancoffee
a434be594c update Cargo.lock 2021-06-28 16:02:31 +03:00
Marcel
f4f6138d3d Merge branch 'master' into 'master'
Update `coreaudio-sys` to v0.2.8 to fix build failure on M1 Macs

See merge request veloren/veloren!2505
2021-06-28 07:47:50 +00:00
Marcel
010f9c250c Merge branch 'aweinstock/nodelay' into 'master'
Enable TCP_NODELAY.

See merge request veloren/veloren!2520
2021-06-27 23:49:01 +00:00
Marcel
11d16f34bb 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
2e57d2a14f 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
Avi Weinstock
8c5d52b70a Enable TCP_NODELAY. 2021-06-27 17:45:33 -04:00
Marcel
61e5c70dd9 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
dd5c9d04b0 fix logging cnt didnt reset 2021-06-27 22:51:23 +02:00
Yusuf Bera Ertan
b8249cc64c
build(nix): fix audio resource patching 2021-06-27 23:23:01 +03:00
Avi Weinstock
957ba5d218 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
f6782e21b8 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
ea41f9ab39 Added fix for Issue #1204 - Incorrect scrolling when switching between filtered tabs 2021-06-27 18:18:01 +00:00
Marcel
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
Justin Shipsey
78961e8956 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
81010e8465 Update pt br 20210627 2021-06-27 03:26:44 +00:00
Snowram
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
juliancoffee
681fd37429 style 2021-06-27 02:44:19 +03:00
Ben Wallis
9865b354f9 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
a50ed6b50a Fixed build warnings for server-cli related to non-default plugin feature 2021-06-26 21:56:03 +01:00
Ben Wallis
1186b07fed 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
af22f56f9e Rename remove_warlock_warlord migration so it actually triggers. 2021-06-26 16:28:49 -04:00
Alex Ryapolov
be75a31c39 Update coreaudio-sys to v0.2.8 2021-06-26 18:39:53 +00:00
juliancoffee
12b5d655cf Split Material and Dismantle crafting tabs 2021-06-26 21:37:13 +03:00
juliancoffee
12243bd0c0 Add is_recycling field to recipe book 2021-06-26 21:37:13 +03:00
juliancoffee
123b2814cf Sort tabs in logical sequence 2021-06-26 21:37:13 +03:00