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
|
7f2fa4181d
|
fix: commas
|
2021-05-30 14:47:42 -07:00 |
|
Samuel Keiffer
|
e4d2d08e7d
|
Merge branch 'ygor/fix-glider-stuck-inside-wall' into 'master'
Reset on_ceiling when not on ceiling
See merge request veloren/veloren!2247
|
2021-05-30 21:09:31 +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 |
|
Adam Whitehurst
|
6263f6de8a
|
wip: impl Stats::attack_speed_modifier
|
2021-05-30 09:40:11 -07:00 |
|
Marcel
|
f1d10c7f28
|
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 |
|
Adam Whitehurst
|
fcde358b86
|
feat: BuffKind::Frozen
|
2021-05-30 08:51:47 -07:00 |
|
Adam Whitehurst
|
524bb4d7c7
|
feat: add frozen debuff icon, en strings
|
2021-05-30 08:49:32 -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 |
|
Marcel
|
423a716837
|
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 |
|
Avi Weinstock
|
0f85a7daf5
|
Clear the economy database when creating it.
|
2021-05-28 16:14:31 -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 |
|
Marcel
|
0703e5f34d
|
Merge branch 'sam/torvus-fix' into 'master'
Fixed torvus
See merge request veloren/veloren!2351
|
2021-05-28 12:01:45 +00:00 |
|
Sam
|
e298a6492b
|
Fixed torvus
|
2021-05-27 19:56:16 -05:00 |
|
Samuel Keiffer
|
6495e53c21
|
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
|
cb50b5940a
|
Fixed a few oddities with the AI
|
2021-05-26 21:34:21 -05:00 |
|
Sam
|
60880b8fff
|
Fixed exp splitting in inactive equip slots.
|
2021-05-26 21:13:16 -05:00 |
|
Sam
|
875f1efc61
|
Fixed bow AI
|
2021-05-26 20:53:29 -05:00 |
|
Monty Marz
|
3dd2bcd9e5
|
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 |
|
Avi Weinstock
|
e127067431
|
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 |
|
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 |
|
jshipsey
|
51383eee13
|
anim
|
2021-05-26 00:04:15 -04:00 |
|
Samuel Keiffer
|
f84ef7f8c0
|
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 |
|
juliancoffee
|
f4b3aef9b4
|
Refactor enemy creation in dungeons
|
2021-05-26 01:39:48 +03:00 |
|
Marcel
|
567f9d2119
|
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 |
|
Jonathan Berglin
|
5c8fc8da83
|
Extract 'get_inviter_and_kind' method from 'handle_invite_decline' and...
|
2021-05-25 20:34:46 +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
|
dc7c093bbb
|
add CHANGELOG
|
2021-05-25 01:08:11 +03:00 |
|
juliancoffee
|
0fada1cfde
|
Unique loot tables for each dungeon chest
|
2021-05-25 00:42:43 +03:00 |
|
juliancoffee
|
9bc15c3adf
|
Overhaul loot tables
|
2021-05-25 00:20:18 +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 |
|
Samuel Keiffer
|
9dbc58ce03
|
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 |
|
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 |
|