|
|
18a064c855
|
Merge branch 'imbris/fix-pages' into 'master'
Fix pages by specifying a docker image
See merge request veloren/veloren!2363
|
2021-06-01 21:07:57 +00:00 |
|
|
|
e5a6ae3e57
|
Merge branch 'imbris/macos-ci' into 'master'
Use native macos runner for builds
See merge request veloren/veloren!2362
|
2021-06-01 20:34:07 +00:00 |
|
|
|
988f2eae25
|
Fix pages by specifying a docker image
|
2021-06-01 16:26:41 -04:00 |
|
|
|
82788716e0
|
Use native macos runner for builds
|
2021-06-01 16:08:47 -04:00 |
|
|
|
b365b9a54b
|
Merge branch 'imbris/update-toolchain' into 'master'
Update toolchain
See merge request veloren/veloren!2322
|
2021-06-01 18:49:30 +00:00 |
|
|
|
72136103d7
|
delete all incremental things for clippy CI
|
2021-06-01 14:15:01 -04:00 |
|
|
|
e9940371b7
|
Re-disable incremental for veloren-network-protocol, switch back to
`veloren-docker` tagged runners
|
2021-06-01 13:35:03 -04:00 |
|
|
|
82b0ed1ab0
|
Remove stabilized or_patterns feature
|
2021-06-01 13:19:20 -04:00 |
|
|
|
1cc565a32f
|
Use new multi image cache scheme in the CI and consolidate runner tag specification so that it is easier to modify
|
2021-06-01 13:19:12 -04:00 |
|
|
|
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 |
|
|
|
5985584c5c
|
Update toolchain
|
2021-05-31 20:44:57 -04:00 |
|
|
|
19179cd1f9
|
Fixed loot scroller collisions and moved/cleaned up previous changes
|
2021-05-31 15:29:35 -04:00 |
|
|
|
db8ea7c84f
|
Merge branch 'adam/frozen-debuff' into 'master'
Frozen Debuff
See merge request veloren/veloren!2357
|
2021-05-30 22:39:11 +00:00 |
|
|
|
7f2fa4181d
|
fix: commas
|
2021-05-30 14:47:42 -07:00 |
|
|
|
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 |
|
|
|
0baf16704d
|
fix: remove limit
|
2021-05-30 13:42:47 -07:00 |
|
|
|
e3364d1bf4
|
refactor: variable names
|
2021-05-30 13:40:25 -07:00 |
|
|
|
734ec1d386
|
refactor: BuffKind::Frozen comment
|
2021-05-30 13:39:18 -07:00 |
|
|
|
83723327e4
|
fix: more succinct checked_tick_attack
|
2021-05-30 13:36:18 -07:00 |
|
|
|
9404c824a9
|
fix: better scaling
|
2021-05-30 13:06:01 -07:00 |
|
|
|
bc53adeb9a
|
fix: name
|
2021-05-30 12:56:26 -07:00 |
|
|
|
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 |
|
|
|
3cf72cbee2
|
feat: impl attack speed modifier
|
2021-05-30 12:39:30 -07:00 |
|
|
|
21780856ea
|
feat: tick_attack utils
|
2021-05-30 12:39:00 -07:00 |
|
|
|
7aac77288b
|
Address MR 2356 comments.
|
2021-05-30 13:36:25 -04:00 |
|
|
|
b2f88af26e
|
Add comments to the PID controller code.
|
2021-05-30 13:36:25 -04:00 |
|
|
|
be35da9e57
|
Implement PID controllers and use them to stabilize Agent airship flight.
|
2021-05-30 13:36:25 -04:00 |
|
|
|
6263f6de8a
|
wip: impl Stats::attack_speed_modifier
|
2021-05-30 09:40:11 -07:00 |
|
|
|
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 |
|
|
|
fcde358b86
|
feat: BuffKind::Frozen
|
2021-05-30 08:51:47 -07:00 |
|
|
|
524bb4d7c7
|
feat: add frozen debuff icon, en strings
|
2021-05-30 08:49:32 -07:00 |
|
|
|
6b0db82ddf
|
Fixed entities with voxel colliders being off by one physics tick for collision.
|
2021-05-28 20:25:57 -04:00 |
|
|
|
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 |
|
|
|
0f85a7daf5
|
Clear the economy database when creating it.
|
2021-05-28 16:14:31 -04:00 |
|
|
|
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 |
|
|
|
0703e5f34d
|
Merge branch 'sam/torvus-fix' into 'master'
Fixed torvus
See merge request veloren/veloren!2351
|
2021-05-28 12:01:45 +00:00 |
|
|
|
e298a6492b
|
Fixed torvus
|
2021-05-27 19:56:16 -05:00 |
|
|
|
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 |
|
|
|
cb50b5940a
|
Fixed a few oddities with the AI
|
2021-05-26 21:34:21 -05:00 |
|
|
|
60880b8fff
|
Fixed exp splitting in inactive equip slots.
|
2021-05-26 21:13:16 -05:00 |
|
|
|
875f1efc61
|
Fixed bow AI
|
2021-05-26 20:53:29 -05:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
5652f68019
|
Make the camera zoom as the bow (or any ChargedRanged attack) is charging.
|
2021-05-26 09:34:07 -04:00 |
|
|
|
285904a850
|
Merge branch 'sam/rework-bow' into 'master'
Bow Rework
See merge request veloren/veloren!2310
|
2021-05-26 04:44:09 +00:00 |
|
|
|
51383eee13
|
anim
|
2021-05-26 00:04:15 -04:00 |
|
|
|
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 |
|
|
|
f4b3aef9b4
|
Refactor enemy creation in dungeons
|
2021-05-26 01:39:48 +03:00 |
|
|
|
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 |
|
