Commit Graph

2722 Commits

Author SHA1 Message Date
Imbris
a1fac487e4 Suppress wgpu_core::device info logging 2021-06-02 23:59:48 -04:00
Samuel Keiffer
4b359b8ca4 Merge branch 'aweinstock/price-equality' into 'master'
Add a manifest for making different items count as the same item for the purpose of pricing.

See merge request veloren/veloren!2360
2021-06-02 23:48:45 +00:00
Samuel Keiffer
9a31d77f0a Merge branch 'tygyh/default-loadout' into 'master'
LoadoutBuilder refactoring

See merge request veloren/veloren!2361
2021-06-02 23:42:39 +00:00
Samuel Keiffer
d235e98efe Merge branch 'aweinstock/agent-pid' into 'master'
Implement PID controllers and use them to stabilize Agent airship flight.

See merge request veloren/veloren!2356
2021-06-02 23:15:08 +00:00
Avi Weinstock
054fb1d763 Add a manifest for making different items count as the same item for the purpose of pricing. 2021-06-02 19:12:51 -04:00
juliancoffee
1fc3fce970 Move warning-supressing from global onto function 2021-06-03 01:58:34 +03:00
juliancoffee
00714db492 Implement Choice of Choice in loadout files 2021-06-02 18:35:22 +03:00
juliancoffee
674a7f41bd Using clippy::pedantic and improve asset tests
- Turned clippy::pedantic on for loadout_builder.rs and applied some
proposition
- Check for invalid weights in loadout files
2021-06-02 17:54:14 +03:00
Marcel
f988584337 Merge branch 'revert-c6e200a3' into 'master'
Add a configuration Option to opt-in Quic backend

See merge request veloren/veloren!2318
2021-06-02 14:27:13 +00:00
juliancoffee
952156ad99 Add ability to override weapon in loadout assets 2021-06-02 17:17:19 +03:00
juliancoffee
3c66e62fe0 Decompose LoadoutBuilder::from_asset_expect
- Introduce apply_asset_expect() to mutate passed builder and complete it
from asset
- Remove runtime panic from choosing item
- Rewrite defaults() to load from asset
2021-06-02 17:17:19 +03:00
Dr. Dystopia
641ccd5282 Replace object initialization with read from file 2021-06-02 17:17:19 +03:00
Imbris
3a1a65b134 Remove stabilized or_patterns feature 2021-06-01 13:19:20 -04:00
Imbris
23eca4c3f6 Re-disable incremental just for common-systems, small fix in plugin
crate, more new clippy fixes
2021-05-31 20:44:57 -04:00
Imbris
48ebb10d50 Update toolchain 2021-05-31 20:44:57 -04:00
Samuel Keiffer
9637d874ab Merge branch 'adam/frozen-debuff' into 'master'
Frozen Debuff

See merge request veloren/veloren!2357
2021-05-30 22:39:11 +00:00
Adam Whitehurst
daa18dd92a fix: remove limit 2021-05-30 13:42:47 -07:00
Adam Whitehurst
2e74348813 refactor: variable names 2021-05-30 13:40:25 -07:00
Adam Whitehurst
9e7937d98f refactor: BuffKind::Frozen comment 2021-05-30 13:39:18 -07:00
Adam Whitehurst
98fdf5c3e1 fix: more succinct checked_tick_attack 2021-05-30 13:36:18 -07:00
Adam Whitehurst
6dc1c05089 fix: better scaling 2021-05-30 13:06:01 -07:00
Adam Whitehurst
66cf4ab74c fix: name 2021-05-30 12:56:26 -07:00
Ygor Souza
d890a58b93 Reset on_ceiling state
Previously, the on_ceiling state would remain true for the entire
lifetime of the entity after it touched the ceiling once.
2021-05-30 21:49:11 +02:00
Adam Whitehurst
6b1351bdc3 feat: impl attack speed modifier 2021-05-30 12:39:30 -07:00
Adam Whitehurst
0b92cc5732 feat: tick_attack utils 2021-05-30 12:39:00 -07:00
Avi Weinstock
e09ae8ad83 Address MR 2356 comments. 2021-05-30 13:36:25 -04:00
Avi Weinstock
5164b1a539 Add comments to the PID controller code. 2021-05-30 13:36:25 -04:00
Avi Weinstock
8b20175b6e Implement PID controllers and use them to stabilize Agent airship flight. 2021-05-30 13:36:25 -04:00
Adam Whitehurst
eea7eead2e wip: impl Stats::attack_speed_modifier 2021-05-30 09:40:11 -07:00
Adam Whitehurst
e06bd0eaa3 feat: BuffKind::Frozen 2021-05-30 08:51:47 -07:00
Avi Weinstock
d38db15411 Fixed entities with voxel colliders being off by one physics tick for collision. 2021-05-28 20:25:57 -04:00
Avi Weinstock
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
Avi Weinstock
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
Avi Weinstock
4d7828ec94 Make the camera zoom as the bow (or any ChargedRanged attack) is charging. 2021-05-26 09:34:07 -04:00
Justin Shipsey
d7c7f6bf5d 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
1074352ca4 Merge branch 'juliancoffee/dungeon_chests' into 'master'
dungeon chests

See merge request veloren/veloren!2342
2021-05-24 23:05:20 +00:00
juliancoffee
c618ec7222 fmt 2021-05-25 01:23:32 +03:00
juliancoffee
940655dcb6 Adding different chests for each dungeon 2021-05-24 23:00:44 +03:00
Marcel
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
juliancoffee
e248e795a1 fixing tests 2021-05-24 00:06:03 +03:00
juliancoffee
d80a45a066 Fix species tests for random body_type and fmt 2021-05-23 22:59:48 +03:00
juliancoffee
457e5b14d8 Add tests for validation assets 2021-05-23 22:27:33 +03:00
juliancoffee
8c1643cad9 Switch to using EquipSlot key instead of String 2021-05-23 21:37:41 +03:00
juliancoffee
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
juliancoffee
00b182c183 Remove unused LoadoutConfig-s 2021-05-23 19:19:20 +03:00
juliancoffee
6656cfe010 Add directory hierarchy 2021-05-23 19:19:20 +03:00
juliancoffee
cbdb7dc1c1 add TODO about tests 2021-05-23 19:19:20 +03:00
juliancoffee
0722861364 Move loadout config handling to .ron files 2021-05-23 19:19:20 +03:00
juliancoffee
f0692c491b Implement random choosing of item from loadout 2021-05-23 19:19:20 +03:00