Commit Graph

8655 Commits

Author SHA1 Message Date
5c8fc8da83 Extract 'get_inviter_and_kind' method from 'handle_invite_decline' and... 2021-05-25 20:34:46 +00:00
d4204bafbc Merge branch 'juliancoffee/dungeon_chests' into 'master'
dungeon chests

See merge request veloren/veloren!2342
2021-05-24 23:05:20 +00:00
e36e63825d fmt 2021-05-25 01:23:32 +03:00
dc7c093bbb add CHANGELOG 2021-05-25 01:08:11 +03:00
0fada1cfde Unique loot tables for each dungeon chest 2021-05-25 00:42:43 +03:00
9bc15c3adf Overhaul loot tables 2021-05-25 00:20:18 +03:00
718c5b88f4 Adding different chests for each dungeon 2021-05-24 23:00:44 +03:00
c4f1f99985 Merge branch 'lboklin/wing-clip' into 'master'
Fix higher than intended drag for winged entities

See merge request veloren/veloren!2336
2021-05-24 11:42:12 +00:00
9dbc58ce03 Merge branch 'juliancoffee/asset_loadout' into 'master'
Move loadout creation to .ron files

See merge request veloren/veloren!2337
2021-05-23 21:57:41 +00:00
d5c566ff24 fixing tests 2021-05-24 00:06:03 +03:00
8e5f2d4d3b Fix species tests for random body_type and fmt 2021-05-23 22:59:48 +03:00
f01b700c88 Add tests for validation assets 2021-05-23 22:27:33 +03:00
9ed030442b Switch to using EquipSlot key instead of String 2021-05-23 21:37:41 +03:00
3c82a0e8cd LoadoutBuilder efactoring 2021-05-23 20:29:19 +03:00
Sam
f79d507d24 Updated comments in states code. 2021-05-23 11:41:09 -05:00
53cd3ccfec Remove unused LoadoutConfig-s 2021-05-23 19:19:20 +03:00
95dedc0e4e Add directory hierarchy 2021-05-23 19:19:20 +03:00
8cb1e22dda add TODO about tests 2021-05-23 19:19:20 +03:00
e8c0f62c60 Move loadout config handling to .ron files 2021-05-23 19:19:20 +03:00
d587aff613 Implement random choosing of item from loadout 2021-05-23 19:19:20 +03:00
23b566dbf8 Add support for .ron loadouts 2021-05-23 19:19:20 +03:00
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
9dde9259cd Don't modify position in glide character state 2021-05-23 07:26:11 +00:00
e611b048e2 Birds don't have wings 2021-05-23 08:17:49 +02:00
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
62de40239a Fix mindflayer tactic to make it shoot purple fireballs again. 2021-05-22 20:35:21 -04:00
7988f50259 Merge branch 'juliancoffee/dungeon_mobs' into 'master'
Dungeon rebalance

See merge request veloren/veloren!2333
2021-05-22 22:38:21 +00:00
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
d584da11d6 Move fireworks into own table 2021-05-23 01:04:11 +03:00
a1d2849dae fmt 2021-05-23 01:04:11 +03:00
2f568235d9 Adjust mob numbers and add /kit tier-0 2021-05-23 01:04:11 +03:00
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
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
52c7ec0db1 update conrod core commit to enhance highlight colors 2021-05-22 23:22:12 +02:00
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
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
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
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
e91d0c4dbd update uk ua 2021-05-22 18:58:11 +00:00
Sam
6028befbce Fix 2021-05-22 13:29:03 -05:00
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
d7fa4e093d Adjusted masses; less excessive knockbacks; prevent loot shooting off 2021-05-22 17:56:13 +00:00
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
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
20faacd04f Ferocious armour for t5-dungeon minibosses 2021-05-22 10:55:36 +00:00
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