Marcel
72e270368d
Merge branch 'aweinstock/resolve-clippy-lints' into 'master'
...
Globally allow more clippy lints and reconfigure complexity to be less verbose
See merge request veloren/veloren!3052
2022-01-30 22:53:36 +00:00
James Melkonian
44865d99ff
Fix guards menacing instead of defending villagers
2022-01-30 13:14:24 -08:00
Avi Weinstock
f3f08936d8
Decrease too-many-arguments-threshold and type-complexity-threshold.
2022-01-30 20:16:21 +01:00
Avi Weinstock
5f8957d8ef
Globally allow the clippy lints {new_without_default, many_single_char_names, identity_op, type_complexity, too_many_arguments}.
2022-01-30 20:16:20 +01:00
Joshua Barretto
d8c4284a32
Merge branch 'zesterer/worldgen' into 'master'
...
Improvements to site2
See merge request veloren/veloren!3159
2022-01-28 17:14:07 +00:00
Joshua Barretto
5b3d826396
Better hazard checks
2022-01-28 15:17:56 +00:00
Joshua Barretto
69436db64c
Added wall lamps
2022-01-28 13:58:41 +00:00
juliancoffee
ed593cd0cb
Adress review №2
2022-01-28 00:02:34 +02:00
juliancoffee
6ae25d5956
Require rng from EntityInfo::with_asset_expect
2022-01-28 00:02:34 +02:00
juliancoffee
e004fba9da
Adress review
2022-01-28 00:02:34 +02:00
juliancoffee
5a370cb6f7
Loadout Update: Use
...
Delete guard and villager lazy_loadout and use LoadoutKind::Extended
with potions instead
2022-01-28 00:02:34 +02:00
juliancoffee
4a4f2f8d8f
Loadout Update: Managed Rng
...
Rewrite EntityInfo api to take Rng from caller.
2022-01-28 00:02:34 +02:00
juliancoffee
d5b927602a
Loadout Udpate: NpcData part
...
Actually implement creating npc with new EntitytInfo by chaning
CreateNpc.loadout to CreateNpc.inventory and cleaning code in
NpcData::from_entity_info.
2022-01-28 00:02:34 +02:00
Samuel Keiffer
d89edc9357
Merge branch 'tygyh/Extract-controller-functions' into 'master'
...
Tygyh/extract controller functions
See merge request veloren/veloren!3151
2022-01-26 22:36:36 +00:00
Dr. Dystopia
b0d6a68e8c
Create 'push_initiate_invite' function
2022-01-26 21:23:37 +01:00
Dr. Dystopia
027154a5be
Create 'push_invite_response' function
2022-01-26 21:16:29 +01:00
Dr. Dystopia
0516526985
Create 'push_utterance' function
2022-01-26 21:12:19 +01:00
Dr. Dystopia
765e858c19
Create 'push_cancel_input' function
2022-01-26 21:07:36 +01:00
Dr. Dystopia
b2b208687c
Create 'push_basic_input' function
2022-01-26 20:09:59 +01:00
Dr. Dystopia
bc0a8c7704
Create 'push_action' function
2022-01-26 19:52:19 +01:00
Dr. Dystopia
f47184df85
Use 'push_event' function in more places
2022-01-26 19:40:18 +01:00
juliancoffee
e3927ed3f6
Move server to 2021 edition
2022-01-26 15:57:50 +02:00
James Melkonian
2671f824d0
Prohibit accidental cliff diving by NPCs
2022-01-25 16:25:40 +00:00
Justin Shipsey
54d5a06a0d
Merge branch 'unvariant/lantern_bug' into 'master'
...
Fixes #1406 - Lantern light does not change when dragging it from inventory
Closes #1406
See merge request veloren/veloren!3107
2022-01-25 02:59:29 +00:00
ninefox
04b0277e33
Changed how lantern swap is caught
2022-01-23 13:28:23 -08:00
Dr. Dystopia
dd76438299
Revert parameter removal
2022-01-23 19:03:47 +01:00
Dr. Dystopia
bb48267827
Fix warnings
2022-01-23 19:03:47 +01:00
Samuel Keiffer
7052aad11b
Merge branch 'snowram/arthropods' into 'master'
...
Snowram/arthropods
See merge request veloren/veloren!3071
2022-01-20 00:20:24 +00:00
Snowram
a6e396e29a
Stunned and jump anims, stats, spawns, more IA work
2022-01-20 00:53:29 +01:00
InfRandomness
dabae7ece8
Remove bomb pile item
2022-01-19 19:31:43 +00:00
Snowram
fd3ed89899
More arthropod animations
2022-01-19 19:01:15 +01:00
Snowram
38bbd60fd2
Arthropod basic attack
2022-01-19 19:01:14 +01:00
Snowram
1e6ead4005
Arthropod charge
2022-01-19 19:01:13 +01:00
Snowram
02ed6ffd60
More arthropod work
2022-01-19 19:01:13 +01:00
Snowram
ae71f2e4f0
Adds poisoned debuff (energy change over time)
2022-01-19 19:01:13 +01:00
Snowram
f67bf2a539
Adds arthropod skeleton
2022-01-19 19:01:11 +01:00
Imbris
13d970bf6f
Rename SyncFrom::AllEntities to SyncFrom::AnyEntity for more clarity, add more comments for component syncing code, address MR comment
2022-01-19 00:56:42 -05:00
Imbris
7f7dc5ff8a
Add ability to plot component update counts each tick in tracy, controlled by the PLOT_UPDATE_COUNTS env var
2022-01-19 00:56:42 -05:00
Imbris
aa122c1a18
Sync some components only from the client's own entity. Vastly reduce the amount of places to modify when adding/removing a component from network syncing.
2022-01-19 00:56:42 -05:00
ninefox
973b392e38
Fixed code quality issues
2022-01-18 21:14:27 -08:00
ninefox
8ca627342a
Changed how the lantern swap is caught
2022-01-18 20:21:12 -08:00
James Melkonian
ac6f53922f
Move agent code into separate files
2022-01-18 03:02:43 +00:00
ninefox
64f6faece5
Switched to using existing swap_lantern function
...
Removed unnecessary function
2022-01-17 11:24:18 -08:00
Joshua Barretto
9c565dadc5
Merge branch 'zesterer/mount-everest' into 'master'
...
Mount Everest
See merge request veloren/veloren!3101
2022-01-17 13:21:38 +00:00
Joshua Barretto
60b7528199
Improved rtsim entity pathfinding
2022-01-17 12:34:31 +00:00
Joshua Barretto
c9762568d6
Don't block teleportation when mounted
2022-01-17 09:47:29 +00:00
ninefox
889a593b13
cargo fmt
2022-01-16 16:32:03 -08:00
ninefox
fc012b4989
Lantern color will now change when swapping lanterns while lantern is activated
2022-01-16 16:24:31 -08:00
Joshua Barretto
3b7ea72a9c
Fixed review comments
2022-01-16 21:13:13 +00:00
terrarier2111
5da2850624
Fix loot forcing
2022-01-16 21:12:59 +00:00
