jshipsey
b55bc7b003
crafting item partial re-organization, armor recipes, some specific animal drops
2021-06-07 10:56:35 +02:00
Marcel
eeed5fd2df
Merge branch 'xMAC94x/log_spam' into 'master'
...
XMAC94x/log spam
See merge request veloren/veloren!2385
2021-06-07 07:55:27 +00:00
Marcel Märtens
b48c3ca80c
adjust tracing
2021-06-06 19:31:25 +02:00
Marcel
3182724b66
Merge branch 'aweinstock/add-models-20210603' into 'master'
...
Add Basilisk and Cyclops models by Gemu, and AirBalloon model by SarraKitty.
See merge request veloren/veloren!2371
2021-06-06 16:56:21 +00:00
Snowram
b1a2d0b698
Cyclops, basilisk, air balloon offsets
2021-06-06 14:12:08 +02:00
Sam
a73e7c78e0
Balance tweaks.
2021-06-05 17:15:04 -05:00
Sam
6d342537d6
Yeti AI
2021-06-05 13:25:47 -05:00
Sam
d5b25bd36b
Particles for ice spikes
2021-06-04 18:17:15 -05:00
Sam
6add5510a7
Snowball attack.
2021-06-04 18:17:15 -05:00
Sam
9c5ca3bba5
Added base ability set
2021-06-04 18:17:14 -05:00
Sam
0658510ba6
Final tweaks.
2021-06-03 21:39:47 -05:00
Sam
1ebe6461d4
Added totem ability, totem ai, totem ability set, particles for totem abilities, and totem voxel model.
2021-06-03 21:39:15 -05:00
Sam
47d5ea69eb
Tidal warrior AI.
2021-06-03 21:39:14 -05:00
Sam
d0bfcabd1c
First 3 abilities for tidal warrior functional. Added bubble particles.
2021-06-03 21:39:13 -05:00
Avi Weinstock
07829fffab
Add Basilisk and Cyclops models by Gemu, and AirBalloon model by SarraKitty.
2021-06-03 19:24:34 -04:00
Marcel Märtens
5a517977df
use criterion groups and fix tracing to much on wgpu
2021-06-03 22:37:17 +02:00
Imbris
af951bc665
Fix ProfSpan constructor being private
2021-06-03 00:10:06 -04:00
Imbris
699cf9e197
Move pipeline creation into the background, still needs Drawer modications and UI to display status
2021-06-02 23:59:51 -04:00
Imbris
8612a237eb
Suppress wgpu_core::device info logging
2021-06-02 23:59:48 -04:00
Samuel Keiffer
8e278a2124
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
92f150bf5b
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
a3ee98cfb9
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
489fe930ac
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
adbe17dfd7
Move warning-supressing from global onto function
2021-06-03 01:58:34 +03:00
juliancoffee
2ec161aec9
Implement Choice of Choice in loadout files
2021-06-02 18:35:22 +03:00
juliancoffee
eeab9aa5bb
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
35980f82a6
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
d2a580b0d0
Add ability to override weapon in loadout assets
2021-06-02 17:17:19 +03:00
juliancoffee
3e88df129f
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
d67d6773f0
Replace object initialization with read from file
2021-06-02 17:17:19 +03:00
Imbris
82b0ed1ab0
Remove stabilized or_patterns feature
2021-06-01 13:19:20 -04:00
Imbris
5caf8b6b55
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
5985584c5c
Update toolchain
2021-05-31 20:44:57 -04:00
Samuel Keiffer
db8ea7c84f
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
0baf16704d
fix: remove limit
2021-05-30 13:42:47 -07:00
Adam Whitehurst
e3364d1bf4
refactor: variable names
2021-05-30 13:40:25 -07:00
Adam Whitehurst
734ec1d386
refactor: BuffKind::Frozen comment
2021-05-30 13:39:18 -07:00
Adam Whitehurst
83723327e4
fix: more succinct checked_tick_attack
2021-05-30 13:36:18 -07:00
Adam Whitehurst
9404c824a9
fix: better scaling
2021-05-30 13:06:01 -07:00
Adam Whitehurst
bc53adeb9a
fix: name
2021-05-30 12:56:26 -07:00
Ygor Souza
47943783e9
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
3cf72cbee2
feat: impl attack speed modifier
2021-05-30 12:39:30 -07:00
Adam Whitehurst
21780856ea
feat: tick_attack utils
2021-05-30 12:39:00 -07:00
Avi Weinstock
7aac77288b
Address MR 2356 comments.
2021-05-30 13:36:25 -04:00
Avi Weinstock
b2f88af26e
Add comments to the PID controller code.
2021-05-30 13:36:25 -04:00
Avi Weinstock
be35da9e57
Implement PID controllers and use them to stabilize Agent airship flight.
2021-05-30 13:36:25 -04:00
Adam Whitehurst
6263f6de8a
wip: impl Stats::attack_speed_modifier
2021-05-30 09:40:11 -07:00
Adam Whitehurst
fcde358b86
feat: BuffKind::Frozen
2021-05-30 08:51:47 -07: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
