Commit Graph

8362 Commits

Author SHA1 Message Date
Samuel Keiffer
e543941073 Merge branch 'juliancoffee/boss_armour' into 'master'
Boss armor

See merge request veloren/veloren!2327
2021-05-22 17:42:27 +00:00
Sam
f993f28eff Various tweaks. 2021-05-22 12:41:47 -05:00
juliancoffee
ca6266e780 Fix skill presets, add tests 2021-05-22 12:33:22 -05:00
Sam
1014ac45bf Made new skills for reworked bow.
Created migration to reset bow skills.
2021-05-22 12:33:21 -05:00
Sam
3f16d15bbb Reworked bow 2021-05-22 12:33:20 -05:00
Monty Marz
30bcc6aaa3 Ferocious armour for t5-dungeon minibosses 2021-05-22 10:55:36 +00:00
Monty Marz
abca6de49b Merge branch 'pfau/animal_trainer_armor' into 'master'
add ferocious armor and give it to t5 dungeon beastmaster miniboss

See merge request veloren/veloren!2325
2021-05-22 10:55:36 +00:00
juliancoffee
7dc50891d2 Add placeholders for bosses armour 2021-05-22 00:20:56 +03:00
Samuel Keiffer
49533cbd26 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
juliancoffee
312a01122a Add tests to loadout builder 2021-05-21 23:36:09 +03:00
Samuel Keiffer
a0599ac046 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
juliancoffee
849d51aaa3 Add note to tests 2021-05-21 19:33:31 +03:00
Marcel
ee93803f4a Merge branch 'lboklin/auto-glide' into 'master'
Implement auto-glide

See merge request veloren/veloren!2321
2021-05-21 09:02:59 +00:00
Marcel Märtens
cf3188b412 remove Protocol from Quic, cleanup code, fix some log spam 2021-05-21 10:41:19 +02:00
Marcel
99304ffddd Revert "Merge branch 'sharp/revert-quinn' into 'master'"
This reverts merge request !2315
2021-05-21 10:41:16 +02:00
juliancoffee
5d86850291 fmt 2021-05-21 11:36:48 +03:00
juliancoffee
df58fa9acf 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
juliancoffee
e48e3e11ba 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
Imbris
88ba97b35a 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
James Melkonian
27885e00b2 Allow NPCs to path towards far away enemies 2021-05-21 03:14:45 +00:00
Ludvig Böklin
eacc49a961 Prevent auto-glide from pitching too high up 2021-05-20 17:20:49 +02:00
Ludvig Böklin
270f89db6b Disable glider input until keys are pressed again after deploy 2021-05-20 12:13:59 +02:00
Ludvig Böklin
fe186fb44d Code quality 2021-05-20 10:46:39 +02:00
Ludvig Böklin
8da59bb8e8 Implement auto-glide 2021-05-20 09:27:41 +02:00
Joshua Yanovski
cf4203da54 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
Joshua Yanovski
d87225d908 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
Joshua Yanovski
978b7232db 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
Snowram
8702a5eb9a 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
James Melkonian
b076fb7baa Small cockatrice AI fixes 2021-05-17 22:46:50 +00:00
Sam
3a004d9d4c Removed commented code 2021-05-17 16:48:56 -05:00
hqurve
6974ab9199 Added swap_equipped_weapons icon and resized inactive weapons 2021-05-17 15:35:27 -04:00
Marcel
e925cc22ad 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
Nícolas Wildner
68f3359238 Update pt br 20210517 2021-05-17 18:12:20 +00:00
Joshua Yanovski
c6e200a311 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
Joshua Yanovski
3679cb75bc 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
Marcel
04d8ddf25e 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
93b5e674f6 Fixed comments and some functionality. 2021-05-16 21:35:17 -05:00
Ben Wallis
fcf4ab7619 main/offhand weapon swap check refactor 2021-05-16 21:07:36 -05:00
hqurve
a4384b81c7 Add offhand weapons to bag ui 2021-05-16 20:43:19 -04:00
Justin Shipsey
9dcf7a9d26 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
Marcel
740ec3208d 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
juliancoffee
287b531b47 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
ad0c247838 Removed special case for equipping a weapon that is no longer needed. 2021-05-15 15:16:39 -05:00
Sam
5cc6168553 Unequipping a mainhand weapon now moves offhand weapon into mainhand. 2021-05-15 15:16:39 -05:00
Sam
19926a2322 Swapping weapon sets is now functional. (Though very hacky?) 2021-05-15 15:16:39 -05:00
Sam
23cc3d671b Now allows weapons to be swapped between the mainhand and offhand slot. (Probably hacky?) 2021-05-15 15:16:38 -05:00
Sam
6b153bcf47 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
9173dca03f Added equip slots for other weapons. 2021-05-15 15:16:37 -05:00
Samuel Keiffer
16b952e01e 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
holychowders
d5f3ba77d4 Make NPCs Aware of Sound - See Issue #913 2021-05-15 19:36:27 +00:00