Marcel
27e505e79d
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
26160df8e5
adjust tracing
2021-06-06 19:31:25 +02:00
Marcel
521e1eacf3
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
edfe713076
Cyclops, basilisk, air balloon offsets
2021-06-06 14:12:08 +02:00
Sam
acf7ad27f1
Balance tweaks.
2021-06-05 17:15:04 -05:00
Sam
74b7039219
Yeti AI
2021-06-05 13:25:47 -05:00
Sam
93f90d514c
Particles for ice spikes
2021-06-04 18:17:15 -05:00
Sam
81f7e690fd
Snowball attack.
2021-06-04 18:17:15 -05:00
Sam
a82984b925
Added base ability set
2021-06-04 18:17:14 -05:00
Sam
eaf87a53bb
Final tweaks.
2021-06-03 21:39:47 -05:00
Sam
5bf99eac11
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
ac2f097d80
Tidal warrior AI.
2021-06-03 21:39:14 -05:00
Sam
c81e1534f7
First 3 abilities for tidal warrior functional. Added bubble particles.
2021-06-03 21:39:13 -05:00
Avi Weinstock
05c699878f
Add Basilisk and Cyclops models by Gemu, and AirBalloon model by SarraKitty.
2021-06-03 19:24:34 -04:00
Marcel Märtens
affb9730a8
use criterion groups and fix tracing to much on wgpu
2021-06-03 22:37:17 +02:00
Imbris
7da6b5e59d
Fix ProfSpan constructor being private
2021-06-03 00:10:06 -04:00
Imbris
c2da81cf18
Move pipeline creation into the background, still needs Drawer modications and UI to display status
2021-06-02 23:59:51 -04:00
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
