2692 Commits

Author SHA1 Message Date
Avi Weinstock
be35da9e57 Implement PID controllers and use them to stabilize Agent airship flight. 2021-05-30 13:36:25 -04:00
Avi Weinstock
6b0db82ddf Fixed entities with voxel colliders being off by one physics tick for collision. 2021-05-28 20:25:57 -04:00
Avi Weinstock
202646787d Fix economy data not properly being used to price trades, resulting in default prices being applied at most towns.
Also add an exporter from econsim results to sqlite to aid in debugging the economy (which revealed this bug).
2021-05-28 15:09:29 -04:00
Avi Weinstock
c0a9c4245b Add zoom scaling as well as FOV scaling to ChargedRanged, and restore the old zoom afterwards. 2021-05-26 09:34:08 -04:00
Avi Weinstock
5652f68019 Make the camera zoom as the bow (or any ChargedRanged attack) is charging. 2021-05-26 09:34:07 -04:00
Justin Shipsey
285904a850 Merge branch 'sam/rework-bow' into 'master'
Bow Rework

See merge request veloren/veloren!2310
2021-05-26 04:44:09 +00:00
Justin Shipsey
d4204bafbc Merge branch 'juliancoffee/dungeon_chests' into 'master'
dungeon chests

See merge request veloren/veloren!2342
2021-05-24 23:05:20 +00:00
juliancoffee
e36e63825d fmt 2021-05-25 01:23:32 +03:00
juliancoffee
718c5b88f4 Adding different chests for each dungeon 2021-05-24 23:00:44 +03:00
Marcel
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
juliancoffee
d5c566ff24 fixing tests 2021-05-24 00:06:03 +03:00
juliancoffee
8e5f2d4d3b Fix species tests for random body_type and fmt 2021-05-23 22:59:48 +03:00
juliancoffee
f01b700c88 Add tests for validation assets 2021-05-23 22:27:33 +03:00
juliancoffee
9ed030442b Switch to using EquipSlot key instead of String 2021-05-23 21:37:41 +03:00
juliancoffee
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
juliancoffee
53cd3ccfec Remove unused LoadoutConfig-s 2021-05-23 19:19:20 +03:00
juliancoffee
95dedc0e4e Add directory hierarchy 2021-05-23 19:19:20 +03:00
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
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
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
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
juliancoffee
4f83a4fa4a Add placeholders for bosses armour 2021-05-22 00:20:56 +03: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
Ludvig Böklin
1012a22dfa Disable glider input until keys are pressed again after deploy 2021-05-20 12:13:59 +02:00
Sam
dc2c26bba5 Removed commented code 2021-05-17 16:48:56 -05: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
Sam
daafde048f Fixed comments and some functionality. 2021-05-16 21:35:17 -05:00
Ben Wallis
951b006e1c main/offhand weapon swap check refactor 2021-05-16 21:07:36 -05: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