Sam
4bc54e0287
Fix oob panic in combo melee which can happen during desyncs.
2021-07-04 20:54:08 -05:00
Marcel
5da8c70f48
Merge branch 'aweinstock/sprite-collectible-refactoring' into 'master'
...
Deduplicate data involved in sprite harvesting, making it harder to make mistakes with.
See merge request veloren/veloren!2542
2021-07-04 17:23:53 +00:00
Ben Wallis
b499cf2c58
Added egui debug UI - a 100% rust UI framework (similar to imgui) allowing for rapid development of debug interfaces to aid development. This is feature-gated behind the egui-ui feature which is enabled by default but removed for airshipper builds.
...
Included in the initial implementation is an entity browser which lists all entities in the client ECS, an entity component viewer which shows select components belonging to the selected entity including character state information, and a simple frame time graph.
This MR also includes an extraction of the animation hot reloading code which has been reused for egui to allow for hot-reloading of the egui interface to allow rapid development of the UI with realtime feedback upon save as is the case with aninmations. This is feature-gated behind the `hot-egui` feature which is not enabled by default due to the extra startup time that it adds.
2021-07-04 09:47:18 +00:00
Avi Weinstock
836f10ae63
Remove allocation in SpriteKind::collectible_id.
2021-07-03 15:32:36 -04:00
Avi Weinstock
b4c2bc14df
Deduplicate data involved in sprite harvesting, making it harder to make mistakes with.
2021-07-02 15:23:19 -04:00
Samuel Keiffer
099ddea165
Merge branch 'juliancoffee/dungeon_rebalance' into 'master'
...
Make cultist great again
See merge request veloren/veloren!2513
2021-07-01 02:37:39 +00:00
Ben Wallis
398b658524
Merge branch 'juliancoffee/better_item_tests' into 'master'
...
More informative item tests
See merge request veloren/veloren!2534
2021-06-30 20:12:21 +00:00
juliancoffee
a3bf073875
Use assets::load_dir to test item assets
2021-06-30 18:48:28 +03: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
juliancoffee
c5da56e900
Nerf Husk Brute
...
- Remove HuskBrute health level buff
- Make their attack slower
2021-06-30 03:52:50 +03:00
juliancoffee
b9134a3f61
Make QuadMed great again
...
- Make Bonerattler, Darkhound, Lion, Snowleopard use QuadMedJump (Saber
attack)
2021-06-30 03:52:50 +03:00
juliancoffee
46772c67e3
Remove post-armor crit damage
2021-06-30 03:16:04 +03:00
juliancoffee
ef6a12edc2
bumb Biped Cultist armour
2021-06-30 02:10:39 +03:00
Sam
f5533cdb92
Moved match on ItemUseKind to create durations to a function under ItemUseKind.
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
Dr. Dystopia
11d2017bb3
Extract 'swap_equipment' and 'swap_armor' functions
2021-06-28 16:17:18 +02: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
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
juliancoffee
12243bd0c0
Add is_recycling field to recipe book
2021-06-26 21:37:13 +03:00
Daan Vanoverloop
0076b8379c
Fixing #1169 - use strum macros for BlockKind conversion
2021-06-26 17:52:32 +02:00
Benoît du Garreau
1cba7db9b6
Update assets_manager to 0.5
2021-06-26 12:05:40 +02:00
Justin Shipsey
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
Scott Williams
8d0a1ad7b4
Gem Rings and small change to trading.
2021-06-26 02:44:02 +00:00
Joshua Barretto
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
Snowram
379e755006
Increases base damage of husk attack, rename some cultist weapons
2021-06-25 21:18:28 +02:00
Avi Weinstock
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
Snowram
ef6d6563ea
Ajust new npcs from feedback
2021-06-25 03:26:32 +02:00
Snowram
d7f25627ab
Ajustments to new npcs
2021-06-24 19:31:21 +02:00
Snowram
8760b69345
Husk brute animations
2021-06-24 19:31:19 +02:00
Snowram
58b95d12d4
Adds alpaca and llama npcs
2021-06-24 19:30:15 +02:00
Snowram
fef0f407d3
Removes warlord and warlock armours
2021-06-24 19:30:11 +02:00
Snowram
87ca00fac0
Adds new species
2021-06-24 19:29:44 +02:00
Sam
645cc60dc0
Balance tweaks.
2021-06-23 22:38:37 -05:00
Sam
f0c5ed1397
Added sparseness field to sprite summon.
2021-06-23 22:38:16 -05:00
Sam
68c6a0a495
Balance tweaks for harvester.
2021-06-23 22:38:16 -05:00
Sam
0a32b676c8
Vines now ensnare you by applying a buff.
2021-06-23 22:38:16 -05:00
Sam
763461ebef
Ensnaring vines now ensnare you.
2021-06-23 22:38:16 -05:00
Sam
ed503236d6
Slightly functional sprite summon.
2021-06-23 22:38:16 -05:00
Snowram
15a2fbc555
3 attack anims done
2021-06-23 22:38:16 -05:00
Sam
879aafad5c
3 attacks done
2021-06-23 22:38:16 -05:00
Avi Weinstock
c6bb61f2e6
Add Primitive::Prefab and Fill::Prefab for coloring dungeon entrances.
2021-06-23 23:22:14 -04:00
jshipsey
81aaf30d00
stride speed backwardd-dependence
2021-06-22 22:08:34 -04:00
