Commit Graph

9122 Commits

Author SHA1 Message Date
a9767c40d1 Merge branch 'aweinstock/networktracy' into 'master'
Add some tracy plots about network usage to the client.

See merge request veloren/veloren!2510
2021-07-03 05:44:30 +00:00
b4c2bc14df Deduplicate data involved in sprite harvesting, making it harder to make mistakes with. 2021-07-02 15:23:19 -04:00
c751ec1381 Merge branch 'aweinstock/blockstats' into 'master'
Add block statistics generator to world/examples.

See merge request veloren/veloren!2526
2021-07-02 17:10:26 +00:00
c2106e158f Use approximate byte count for the terrain recv graph. 2021-07-02 12:43:34 -04:00
6ba512efc8 Add some tracy plots about network usage to the client. 2021-07-02 12:40:52 -04:00
f9c263faf6 Add benchmark for color quantization using the rtree crate. 2021-07-01 13:41:37 -04:00
9bcec54313 Merge branch 'tygyh/bot-main-refactor' into 'master'
Tygyh/bot main refactor

See merge request veloren/veloren!2528
2021-07-01 15:59:05 +00:00
85285f9b8e Tygyh/bot main refactor 2021-07-01 15:59:05 +00:00
bad4da8769 Merge branch 'Extract-create-new-button-from-update' into 'master'
Extract 'create_new_button' function from 'update'

See merge request veloren/veloren!2440
2021-07-01 14:39:03 +00:00
fc618b2222 Extract 'create_new_button' function from 'update' 2021-07-01 14:39:02 +00:00
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
83f0807754 Merge branch 'aweinstock/fix-campfires' into 'master'
Fix underwater campfires.

See merge request veloren/veloren!2536
2021-06-30 23:19:45 +00:00
110aa17642 Fix underwater campfires. 2021-06-30 18:36:43 -04:00
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
d92d54f8ad Better error signaling in assets::load_dir_expect 2021-06-30 21:06:06 +03:00
61edae79ae Merge branch 'zesterer/keyboard' into 'master'
Improve default keybindings and Key names

See merge request veloren/veloren!2532
2021-06-30 17:33:17 +00:00
a3bf073875 Use assets::load_dir to test item assets 2021-06-30 18:48:28 +03:00
cf01dd7df7 Improved consistency of default controls 2021-06-30 13:39:37 +01:00
a7f7ea6327 Improved key names and platform support 2021-06-30 13:14:17 +01:00
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
a757bf3dbd Sfx fixes and new test 2021-06-30 11:43:00 +00:00
6418bcefac Introduce maxed skillsets for melee and staff 2021-06-30 13:21:12 +03:00
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
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
adf340cf32 Nerf hammer poise 2021-06-30 03:52:51 +03:00
f2f50c88dc Split room enemy generation to separate functions 2021-06-30 03:52:51 +03:00
7ff62275bf Add RoomKind enum, address comments
- enum RoomKind {Peaceful, Fight, Boss, Miniboss} to specify type of
generated room.
2021-06-30 03:52:51 +03:00
86af138dc7 Buff Mindflayer flamethrower
- Buff DPS twice: increase tick_rate from 0.9 to 5.0 (x5.5), while reducing
damage from 400 to 150 (x2.6)
- Make ori_rate slower: 0.2 from 0.6 and make it use FromOri orientation
behaviour
2021-06-30 03:52:50 +03:00
21fc5aafcd Nerf bow repeater knockback 2021-06-30 03:52:50 +03:00
63a9ceda29 More deterministic dungeon fights
- Spawn fixed number of enemies (2-4) in a room with any size. 1-3 enemies for T5 dungeon.
2021-06-30 03:52:50 +03:00
5b2ef98a7d Slower ori_rate of StaffSimple flamethrower
+ use FromOri for StaffSimple flamethrower
2021-06-30 03:52:50 +03:00
c5da56e900 Nerf Husk Brute
- Remove HuskBrute health level buff
- Make their attack slower
2021-06-30 03:52:50 +03:00
b9134a3f61 Make QuadMed great again
- Make Bonerattler, Darkhound, Lion, Snowleopard use QuadMedJump (Saber
attack)
2021-06-30 03:52:50 +03:00
f9b71750ca Make cultist great again
- Change cultist set stats to mixed dragonscale (hands and feet),
sunsilk (belt, pants and shoulders) and orichalcum (chest and cape)
Distribute cultist set stats as hybrid set.

- Make cultist cape count towards npc aggro
- Remove unused staff skilltree from cultist
- Remove spin number skill from sword cultist skillset
2021-06-30 03:52:50 +03:00
21a29ecf74 Add CorruptionSpores
- New lootable food which you can find as husk or darkhound drop
2021-06-30 03:33:06 +03:00
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
0151e5aeed Merge branch 'potion-animations' into 'master'
Consumable Animations

See merge request veloren/veloren!2512
2021-06-29 16:36:41 +00:00
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
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
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