Commit Graph

8655 Commits

Author SHA1 Message Date
4f83a4fa4a Add placeholders for bosses armour 2021-05-22 00:20:56 +03:00
beee857cf7 Merge branch 'juliancoffee/boss_loot_tables' into 'master'
Improve dungeon loot tables

See merge request veloren/veloren!2324
2021-05-21 21:05:14 +00:00
ced5293d15 Add tests to loadout builder 2021-05-21 23:36:09 +03:00
083f67dbb2 Merge branch 'sam/extra-equip-slots' into 'master'
Added Extra Loadout Slots

See merge request veloren/veloren!2295
2021-05-21 20:28:53 +00:00
0cd6ffbbba Add note to tests 2021-05-21 19:33:31 +03:00
77a7676d46 Merge branch 'lboklin/auto-glide' into 'master'
Implement auto-glide

See merge request veloren/veloren!2321
2021-05-21 09:02:59 +00:00
c19c592586 remove Protocol from Quic, cleanup code, fix some log spam 2021-05-21 10:41:19 +02:00
be56cd2a87 Revert "Merge branch 'sharp/revert-quinn' into 'master'"
This reverts merge request !2315
2021-05-21 10:41:16 +02:00
21fd246cb3 fmt 2021-05-21 11:36:48 +03:00
5201de7192 Fixing loot tables
- Use quad_low and quad_medium loot table for corresponding mobs in
dungeons
- Remove cultist loot table from T3-T4 loot tables
- Use resize instead of vec[obj; len] to create different loot and not
duplicated for miniboss_1
2021-05-21 11:31:39 +03:00
12c42cc1ad Give bosses own creation function and loot table
- Make goose miniboss fallback to differentiate bosses and minibosses
2021-05-21 11:01:47 +03:00
e15afd2733 Merge branch 'james/aggro-radius' into 'master'
Allow NPCs to path towards far away enemies

See merge request veloren/veloren!2323
2021-05-21 03:14:45 +00:00
bc7b453b5b Allow NPCs to path towards far away enemies 2021-05-21 03:14:45 +00:00
51c4b31132 Prevent auto-glide from pitching too high up 2021-05-20 17:20:49 +02:00
1012a22dfa Disable glider input until keys are pressed again after deploy 2021-05-20 12:13:59 +02:00
b1e1760bc5 Code quality 2021-05-20 10:46:39 +02:00
f6f075a82c Implement auto-glide 2021-05-20 09:27:41 +02:00
471488508a Merge branch 'sharp/fix-meshing' into 'master'
Chunk meshing fixes and speedups.

See merge request veloren/veloren!2320
2021-05-20 00:02:38 +00:00
2fcf5c2b24 Various improvements to chunk load latency.
Firstly, most importantly, improves the heuristic used for deciding
which chunks to mesh (which matters more even at low view distances
with meshing being so expensive now, but has an even more obvious
improvement at large view distances).  Essentially, instead of always
prioritizing whatever chunk was fetched earliest from the server,
instead we prioritize chunks *closest* to the player first, then chunk
order.

This greatly improves the apparent latency for things like
picking up a sprite, as well as cases where the player moves out of the
loaded range but (due to slow loading from the server or a large VD
range) there are many remaining chunks left to be meshed still within
the VD but nowhere near the player.  By properly priotizing chunks near
the player, we minimize the time / likelihood of a player being on or
very near an unmeshed chunk, and make high VDs and faster travel
speeds more viable.

We make a few other minor improvements as well:

Avoid duplicate meshing of neighbors when first inserting chunks, if
they are already in the todo list and the chunk being inserted was not
directly modified.

Also avoid remeshing neighbors if only a solid block's color changed,
which could sometimes be useful for non-sprite modifications (for
example flame-induced changes to non-destructible terrain color).
2021-05-18 17:10:29 -07:00
b4479fe793 Make meshing work properly for rapid changes.
The previous fix accidentally caused meshing to not perform an update if
a chunk was already actively meshing; this change fixes this behavior to
go back to the old behavior.  It also fixes a subtle bug where sprites
would be using old lighting if a chunk was being actively meshed on the
same tick that a sprite change happened (this should only affect things
in a handful of circumstances and could be avoided if, e.g., only color
was changing, but this can be addressed better at another time).
2021-05-18 12:43:38 -07:00
fcb0b00575 Merge branch 'james/fix-cockatrice' into 'master'
Small cockatrice AI fixes

See merge request veloren/veloren!2319
2021-05-17 22:46:50 +00:00
8e9e550ce0 Small cockatrice AI fixes 2021-05-17 22:46:50 +00:00
Sam
dc2c26bba5 Removed commented code 2021-05-17 16:48:56 -05:00
84eca4a7b8 Added swap_equipped_weapons icon and resized inactive weapons 2021-05-17 15:35:27 -04:00
88250771c2 Merge branch 'update_pt_BR_20210517' into 'master'
Update pt br 20210517

See merge request veloren/veloren!2317
2021-05-17 18:12:20 +00:00
9150c05ac1 Update pt br 20210517 2021-05-17 18:12:20 +00:00
1f7a6aa566 Merge branch 'sharp/revert-quinn' into 'master'
Revert "Merge branch 'xMAC94x/quic_enablement' into 'master'"

See merge request veloren/veloren!2315
2021-05-17 16:40:49 +00:00
20eccf597b Revert "Merge branch 'xMAC94x/quic_enablement' into 'master'"
This reverts commit 04d8ddf25e, reversing
changes made to 9dcf7a9d26.
2021-05-17 08:32:12 -07:00
48208b711d Merge branch 'xMAC94x/quic_enablement' into 'master'
Add a configuration Option to opt-in Quic backend

See merge request veloren/veloren!2268
2021-05-17 12:02:55 +00:00
Sam
daafde048f Fixed comments and some functionality. 2021-05-16 21:35:17 -05:00
951b006e1c main/offhand weapon swap check refactor 2021-05-16 21:07:36 -05:00
b83ba9c10f Add offhand weapons to bag ui 2021-05-16 20:43:19 -04:00
d10dbdf352 Merge branch 'juliancoffee/small_fixes' into 'master'
Set poise_resilience to sane values

See merge request veloren/veloren!2311
2021-05-16 17:35:39 +00:00
12da9a80db Merge branch 'xMAC94x/czech' into 'master'
add czech language. fixed #1044

Closes #1044

See merge request veloren/veloren!2297
2021-05-16 16:39:51 +00:00
06a69fa335 Set poise_resilience to sane values
- Druid Shoulders to 1.0
- Rugged Chest to 1.0
- Cultist Gloves to 1.0
2021-05-16 01:07:55 +03:00
Sam
f5b3872bd4 Removed special case for equipping a weapon that is no longer needed. 2021-05-15 15:16:39 -05:00
Sam
b41f668de2 Unequipping a mainhand weapon now moves offhand weapon into mainhand. 2021-05-15 15:16:39 -05:00
Sam
1b3e619115 Swapping weapon sets is now functional. (Though very hacky?) 2021-05-15 15:16:39 -05:00
Sam
3e33a612f8 Now allows weapons to be swapped between the mainhand and offhand slot. (Probably hacky?) 2021-05-15 15:16:38 -05:00
Sam
f81afa7fc9 Enforced certain invariants in how an item was equipped into the loadout:
- a 2h weapon can only be equipped in a mainhand slot if the offhand slot is empty
 - a 1h weapon can only be equipped in an offhand slot if the mainhand slot has a 1h weapon
 - 2h weapons can never be equipped in an offhand slot

Fixed some tests
2021-05-15 15:16:38 -05:00
Sam
6f00d556ad Added equip slots for other weapons. 2021-05-15 15:16:37 -05:00
5a992e59f6 Merge branch 'holychowders/make_npcs_aware_of_sound' into 'master'
Make NPCs Aware of Sound - See Issue #913

See merge request veloren/veloren!2138
2021-05-15 19:36:41 +00:00
21867f8a85 Make NPCs Aware of Sound - See Issue #913 2021-05-15 19:36:27 +00:00
2ee38bda68 Merge branch 'sam/small-fix' into 'master'
Combat Fix

See merge request veloren/veloren!2309
2021-05-15 16:13:44 +00:00
Sam
a2d8496b3d Shifted poise damage of sword dash 2021-05-15 10:30:39 -05:00
4ea398dfd9 Merge branch 'juliancoffee/update-it_IT' into 'master'
update Italian translation by 'Чингис Хан'

See merge request veloren/veloren!2305
2021-05-14 15:35:05 +00:00
0fa437f1cb update Italian translation by 'Чингис Хан' 2021-05-14 17:31:01 +03:00
7e774bf1f1 Merge branch 'revert-7fe0db22' into 'master'
Revert "Merge branch 'snowram/hacky-mount' into 'master'"

See merge request veloren/veloren!2302
2021-05-14 14:22:13 +00:00
8218fdd329 Revert "Merge branch 'snowram/hacky-mount' into 'master'"
This reverts merge request !2219
2021-05-14 13:43:20 +00:00
f377c9c8a8 Merge branch 'snowram/hacky-mount' into 'master'
Allow for collars to make QuadMed npcs mountable

See merge request veloren/veloren!2219
2021-05-14 12:27:19 +00:00