8338 Commits

Author SHA1 Message Date
juliancoffee
8cb1e22dda add TODO about tests 2021-05-23 19:19:20 +03:00
juliancoffee
e8c0f62c60 Move loadout config handling to .ron files 2021-05-23 19:19:20 +03:00
juliancoffee
d587aff613 Implement random choosing of item from loadout 2021-05-23 19:19:20 +03:00
juliancoffee
23b566dbf8 Add support for .ron loadouts 2021-05-23 19:19:20 +03:00
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
Ludvig Böklin
e611b048e2 Birds don't have wings 2021-05-23 08:17:49 +02: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
Sam
7a40a04f16 Balance tweaks. 2021-05-22 15:00:05 -05: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
Sam
62e21e5961 Various tweaks. 2021-05-22 12:41:47 -05:00
juliancoffee
b6570d3151 Fix skill presets, add tests 2021-05-22 12:33:22 -05:00
Sam
0bc059513e Made new skills for reworked bow.
Created migration to reset bow skills.
2021-05-22 12:33:21 -05:00
Sam
74f4556349 Reworked bow 2021-05-22 12:33:20 -05: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
Marcel Märtens
c19c592586 remove Protocol from Quic, cleanup code, fix some log spam 2021-05-21 10:41:19 +02:00
Marcel
be56cd2a87 Revert "Merge branch 'sharp/revert-quinn' into 'master'"
This reverts merge request !2315
2021-05-21 10:41:16 +02: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