8226 Commits

Author SHA1 Message Date
Justin Shipsey
02c1c170fb Merge branch 'james/glide-clip' into 'master'
Don't modify position in glide character state

See merge request veloren/veloren!2334
2021-05-23 07:26:11 +00:00
James Melkonian
9dde9259cd Don't modify position in glide character state 2021-05-23 07:26:11 +00:00
Samuel Keiffer
4832ffef5a Merge branch 'aweinstock/mindflayer-fix-20210522' into 'master'
Fix mindflayer tactic to make it shoot purple fireballs again.

See merge request veloren/veloren!2335
2021-05-23 01:15:04 +00:00
Avi Weinstock
62de40239a Fix mindflayer tactic to make it shoot purple fireballs again. 2021-05-22 20:35:21 -04:00
Samuel Keiffer
7988f50259 Merge branch 'juliancoffee/dungeon_mobs' into 'master'
Dungeon rebalance

See merge request veloren/veloren!2333
2021-05-22 22:38:21 +00:00
Monty Marz
6231208eb8 Merge branch 'pfau/update_conrod_core' into 'master'
update conrod core commit to enhance highlight colors

See merge request veloren/veloren!2332
2021-05-22 22:34:22 +00:00
juliancoffee
d584da11d6 Move fireworks into own table 2021-05-23 01:04:11 +03:00
juliancoffee
a1d2849dae fmt 2021-05-23 01:04:11 +03:00
juliancoffee
2f568235d9 Adjust mob numbers and add /kit tier-0 2021-05-23 01:04:11 +03:00
juliancoffee
6027f2ffa3 Adjust loot tables
- Add regular drop to T5 miniboss
- Fixup cultist loot table
- Give own loot table to Deadwood in T0
2021-05-23 01:04:11 +03:00
juliancoffee
b31b80637e Edit minibosses in lower tiers
- Deadwood to T0 (instead of bonerattlers)
- Rats to T1 (instead of bonerattlers)
- Bonerattlers to T3 (instead of hakulaqs, it's still placeholder)
2021-05-23 01:04:05 +03:00
Monty
52c7ec0db1 update conrod core commit to enhance highlight colors 2021-05-22 23:22:12 +02:00
Ben Wallis
41777371dc Merge branch 'hqurve/item-pickups' into 'master'
Item pickups are shown in separate window and "inventory-full" messages are shown above the item attempted to be picked up

See merge request veloren/veloren!2329
2021-05-22 20:47:08 +00:00
hqurve
36aae8b34b Item pickups are shown in separate window and "inventory-full" messages are shown above the item attempted to be picked up 2021-05-22 20:47:08 +00:00
Samuel Keiffer
0adff71506 Merge branch 'sam/fix-equip-slots' into 'master'
Fix Equip Slots

See merge request veloren/veloren!2331
2021-05-22 19:05:22 +00:00
Ben Wallis
59af4af9a9 Merge branch 'juliancoffee/update-uk_UA' into 'master'
update uk ua

See merge request veloren/veloren!2330
2021-05-22 18:58:11 +00:00
Illia Denysenko
e91d0c4dbd update uk ua 2021-05-22 18:58:11 +00:00
Sam
6028befbce Fix 2021-05-22 13:29:03 -05:00
Samuel Keiffer
c771549a19 Merge branch 'lboklin/bird-drag' into 'master'
Adjusted masses; less excessive knockbacks; prevent loot shooting off

See merge request veloren/veloren!2307
2021-05-22 17:56:14 +00:00
Ludvig Böklin
d7fa4e093d Adjusted masses; less excessive knockbacks; prevent loot shooting off 2021-05-22 17:56:13 +00:00
Samuel Keiffer
e64f4b8e9a Merge branch 'juliancoffee/boss_armour' into 'master'
Boss armor

See merge request veloren/veloren!2327
2021-05-22 17:42:27 +00:00
Monty Marz
20faacd04f Ferocious armour for t5-dungeon minibosses 2021-05-22 10:55:36 +00:00
Monty Marz
c1bbae5ca9 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
4f83a4fa4a Add placeholders for bosses armour 2021-05-22 00:20:56 +03:00
Samuel Keiffer
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
juliancoffee
ced5293d15 Add tests to loadout builder 2021-05-21 23:36:09 +03:00
Samuel Keiffer
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
juliancoffee
0cd6ffbbba Add note to tests 2021-05-21 19:33:31 +03:00
Marcel
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
juliancoffee
21fd246cb3 fmt 2021-05-21 11:36:48 +03:00
juliancoffee
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
juliancoffee
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
Imbris
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
James Melkonian
bc7b453b5b Allow NPCs to path towards far away enemies 2021-05-21 03:14:45 +00:00
Ludvig Böklin
51c4b31132 Prevent auto-glide from pitching too high up 2021-05-20 17:20:49 +02:00
Ludvig Böklin
1012a22dfa Disable glider input until keys are pressed again after deploy 2021-05-20 12:13:59 +02:00
Ludvig Böklin
b1e1760bc5 Code quality 2021-05-20 10:46:39 +02:00
Ludvig Böklin
f6f075a82c Implement auto-glide 2021-05-20 09:27:41 +02:00
Joshua Yanovski
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
Joshua Yanovski
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
Joshua Yanovski
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
Snowram
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
James Melkonian
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
hqurve
84eca4a7b8 Added swap_equipped_weapons icon and resized inactive weapons 2021-05-17 15:35:27 -04:00
Marcel
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
Nícolas Wildner
9150c05ac1 Update pt br 20210517 2021-05-17 18:12:20 +00:00
Joshua Yanovski
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
Joshua Yanovski
20eccf597b Revert "Merge branch 'xMAC94x/quic_enablement' into 'master'"
This reverts commit 04d8ddf25ed6b1ae8dd97846c5c4b9af4ab399b8, reversing
changes made to 9dcf7a9d26f7d60020c5707fea3ed8ac5596d3dc.
2021-05-17 08:32:12 -07:00
Marcel
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