Commit Graph

8275 Commits

Author SHA1 Message Date
5164b1a539 Add comments to the PID controller code. 2021-05-30 13:36:25 -04:00
8b20175b6e Implement PID controllers and use them to stabilize Agent airship flight. 2021-05-30 13:36:25 -04:00
a8fb168315 Merge branch 'aweinstock/terrain-entity-physics-20210528' into 'master'
Fixed entities with voxel colliders being off by one physics tick for collision.

See merge request veloren/veloren!2355
2021-05-30 16:25:44 +00:00
d38db15411 Fixed entities with voxel colliders being off by one physics tick for collision. 2021-05-28 20:25:57 -04:00
f8b642ce86 Merge branch 'aweinstock/economy-20210528' into 'master'
Fix economy data not properly being used to price trades, resulting in default...

See merge request veloren/veloren!2353
2021-05-28 22:05:24 +00:00
5380fc4eac Clear the economy database when creating it. 2021-05-28 16:14:31 -04:00
3684cf0454 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
2771c29d54 Merge branch 'sam/torvus-fix' into 'master'
Fixed torvus

See merge request veloren/veloren!2351
2021-05-28 12:01:45 +00:00
Sam
9db8406e4c Fixed torvus 2021-05-27 19:56:16 -05:00
a0fc75ad18 Merge branch 'sam/small-fixes' into 'master'
Fixed bow AI and inactive weapon exp gain

See merge request veloren/veloren!2349
2021-05-28 00:45:45 +00:00
Sam
01f82314dc Fixed a few oddities with the AI 2021-05-26 21:34:21 -05:00
Sam
b826d5cb2b Fixed exp splitting in inactive equip slots. 2021-05-26 21:13:16 -05:00
Sam
42c8c08145 Fixed bow AI 2021-05-26 20:53:29 -05:00
99cf533a8a Merge branch 'aweinstock/bow-zoom-charge-master' into 'master'
Make the camera zoom as the bow (or any ChargedRanged attack) is charging.

See merge request veloren/veloren!2339
2021-05-26 17:34:47 +00:00
d6442dbd3b Change the ChargedRanged zoom distance from 0.0 to 2.0, and add a delay after the mouse click before the zoom starts (i.e. hold to zoom, spam click will not zoom). 2021-05-26 11:51:29 -04:00
7a97fbb5cf Add zoom scaling as well as FOV scaling to ChargedRanged, and restore the old zoom afterwards. 2021-05-26 09:34:08 -04:00
4d7828ec94 Make the camera zoom as the bow (or any ChargedRanged attack) is charging. 2021-05-26 09:34:07 -04:00
d7c7f6bf5d Merge branch 'sam/rework-bow' into 'master'
Bow Rework

See merge request veloren/veloren!2310
2021-05-26 04:44:09 +00:00
ae43102a5b anim 2021-05-26 00:04:15 -04:00
827c6c874d Merge branch 'juliancoffee/dungeon_refactoring' into 'master'
Refactor enemy creation in dungeons

See merge request veloren/veloren!2344
2021-05-25 23:22:26 +00:00
6f0f3d1b62 Refactor enemy creation in dungeons 2021-05-26 01:39:48 +03:00
2baa6f63bd Merge branch 'Extract-invite-handling' into 'master'
Extract 'get_inviter_and_kind' method from 'handle_invite_decline' and...

See merge request veloren/veloren!2328
2021-05-25 20:34:47 +00:00
f5ed77184b Extract 'get_inviter_and_kind' method from 'handle_invite_decline' and... 2021-05-25 20:34:46 +00:00
1074352ca4 Merge branch 'juliancoffee/dungeon_chests' into 'master'
dungeon chests

See merge request veloren/veloren!2342
2021-05-24 23:05:20 +00:00
c618ec7222 fmt 2021-05-25 01:23:32 +03:00
2da8d96ec9 add CHANGELOG 2021-05-25 01:08:11 +03:00
2d56b5dcde Unique loot tables for each dungeon chest 2021-05-25 00:42:43 +03:00
3700cc8a67 Overhaul loot tables 2021-05-25 00:20:18 +03:00
940655dcb6 Adding different chests for each dungeon 2021-05-24 23:00:44 +03:00
80b8561317 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
17e684f2a2 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
e248e795a1 fixing tests 2021-05-24 00:06:03 +03:00
d80a45a066 Fix species tests for random body_type and fmt 2021-05-23 22:59:48 +03:00
457e5b14d8 Add tests for validation assets 2021-05-23 22:27:33 +03:00
8c1643cad9 Switch to using EquipSlot key instead of String 2021-05-23 21:37:41 +03:00
22b1880ae5 LoadoutBuilder efactoring 2021-05-23 20:29:19 +03:00
Sam
0961f00c7c Updated comments in states code. 2021-05-23 11:41:09 -05:00
00b182c183 Remove unused LoadoutConfig-s 2021-05-23 19:19:20 +03:00
6656cfe010 Add directory hierarchy 2021-05-23 19:19:20 +03:00
cbdb7dc1c1 add TODO about tests 2021-05-23 19:19:20 +03:00
0722861364 Move loadout config handling to .ron files 2021-05-23 19:19:20 +03:00
f0692c491b Implement random choosing of item from loadout 2021-05-23 19:19:20 +03:00
a8699cfa15 Add support for .ron loadouts 2021-05-23 19:19:20 +03:00
cbde2d9ab8 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
419cd2a5e4 Don't modify position in glide character state 2021-05-23 07:26:11 +00:00
a2afb75c83 Birds don't have wings 2021-05-23 08:17:49 +02:00
0aee0e2f4b 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
624f8796bd Fix mindflayer tactic to make it shoot purple fireballs again. 2021-05-22 20:35:21 -04:00
95f3a12d41 Merge branch 'juliancoffee/dungeon_mobs' into 'master'
Dungeon rebalance

See merge request veloren/veloren!2333
2021-05-22 22:38:21 +00:00
6d6bf1c2ab 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