Sam
0c44a7d1ab
More tweaking
2022-01-30 18:37:11 -05:00
Joshua Barretto
1b9488186e
Merge branch 'treeco/realign-workshop' into 'master'
...
Realign workshops
See merge request veloren/veloren!3168
2022-01-30 23:27:50 +00:00
Sam
bfa9c1ce3a
Fixed lifesteal particles
2022-01-30 18:11:41 -05:00
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
Treeco
ba7251c7e3
Realign workshops
2022-01-30 22:45:56 +00:00
Marcel
a41a766356
Merge branch 'james/guard-menacing' into 'master'
...
Fix guards menacing instead of defending villagers
See merge request veloren/veloren!3166
2022-01-30 22:40:35 +00:00
James Melkonian
44865d99ff
Fix guards menacing instead of defending villagers
2022-01-30 13:14:24 -08:00
Marcel
12f00696ba
Merge branch 'tygyh/Simplify-parameters' into 'master'
...
Tygyh/simplify parameters
See merge request veloren/veloren!3053
2022-01-30 19:42:44 +00:00
Marcel Märtens
201a5ac2c7
stricten some rules and fix some clippy warnings
2022-01-30 20:16:21 +01: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
Dr. Dystopia
7b5d9508b6
Create 'ColliderData' struct and implement it in 'resolve_e2e_collision' function
2022-01-30 19:50:32 +01:00
Imbris
21cad12272
Merge branch 'fix-ghost-item' into 'master'
...
Fix ghost item when trade gets declined
Closes #1429
See merge request veloren/veloren!3117
2022-01-30 17:31:15 +00:00
jshipsey
7cac4b4001
myrmidon fix
2022-01-30 02:02:23 -05:00
jshipsey
7827797106
weapon tweaks
2022-01-30 01:10:13 -05:00
Marcel
3120a64be2
Merge branch 'swilliams/entity-drops-csv-names' into 'master'
...
Changed entity drops csv export to export names instead of asset paths
See merge request veloren/veloren!3161
2022-01-29 17:37:45 +00:00
Scott Williams
21fd296407
Changed entity drops csv export to export names instead of asset paths
2022-01-29 17:37:45 +00:00
Imbris
89edd18787
Dither in nonlinear srgb space and add a few dithering related things to the experimental shader options
2022-01-28 22:55:59 -05:00
Samuel Keiffer
fe532cf536
Merge branch 'isse/repeat-primitive' into 'master'
...
Repeat CSG primitive and float line segment
See merge request veloren/veloren!3158
2022-01-28 20:04:45 +00:00
Isidor Nielsen
6f99e70cca
Repeat CSG primitive and float line segment
2022-01-28 20:04:45 +00: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
15c5f2f969
Better paths in snow
2022-01-28 16:45:58 +00:00
Joshua Barretto
5b3d826396
Better hazard checks
2022-01-28 15:17:56 +00:00
Joshua Barretto
cb45cea6a0
Merge branch 'fix-dungeon-collision' into 'master'
...
Fix dungeon collision
See merge request veloren/veloren!3131
2022-01-28 14:07:01 +00:00
Joshua Barretto
69436db64c
Added wall lamps
2022-01-28 13:58:41 +00:00
threadexception
9822abf9ba
Fix dungeon collision
2022-01-28 13:59:49 +01:00
Joshua Barretto
e991ff7d6d
More precise path placement
2022-01-28 11:56:07 +00:00
jshipsey
4fbd3027a1
new mobs
2022-01-28 02:50:15 -05:00
Imbris
e53d1dde09
Merge branch 'juliancoffee/extended_loadout_config' into 'master'
...
Refactor loadout creation for Npc
See merge request veloren/veloren!3129
2022-01-27 23:05:53 +00:00
juliancoffee
fa724ec2e2
Fix doc-tests
2022-01-28 00:18:29 +02: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
9a2fde557c
Fix rebase
2022-01-28 00:02:34 +02:00
juliancoffee
43b5af2980
Create asset_migrate bin from entity_migrate
2022-01-28 00:02:34 +02:00
juliancoffee
79a04c3533
fmt
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
juliancoffee
e1bfa6c7e2
remove outdated comment
2022-01-28 00:02:34 +02:00
juliancoffee
7585c8dcc1
Migrate EntityConfig for Loadout update
2022-01-28 00:02:34 +02:00
juliancoffee
fbe07f016a
Loadout Update. EntityInfo part
...
EntityConfig changes:
+ Add LoadoutKind instead of Hands + Meta::LoadoutAsset.
+ Allows for random loadout asset and inventory.
```
pub enum LoadoutAsset {
Loadout(String),
Choice(Vec<(f32, String)>),
}
pub enum LoadoutKind {
FromBody,
Asset(LoadoutAsset),
Hands(Hands),
Extended {
hands: Hands,
base_asset: LoadoutAsset,
inventory: Vec<(u32, String)>,
},
}
```
EntityInfo:
Remove
- pub main_tool: Option<Item>,
- pub second_tool: Option<Item>,
- pub loadout_asset: Option<String>,
Add
+ pub inventory: Vec<(u32, Item)>,
+ pub loadout: Option<LoadoutBuilder>,
2022-01-28 00:02:34 +02:00
juliancoffee
765311add0
Add entity config migration tool
2022-01-28 00:02:34 +02:00
Joshua Barretto
e329100455
Prevent workshops destroying their neighbours
2022-01-27 19:37:24 +00:00
Justin Shipsey
6f743b22ae
Merge branch 'fix_SeaCroc_npc_name' into 'master'
...
fix_SeaCroc_npc_name
See merge request veloren/veloren!3155
2022-01-27 18:33:47 +00:00
Joshua Barretto
548591b561
Merge branch 'more_biome_namegen_bricks' into 'master'
...
more biome namegen bricks
See merge request veloren/veloren!3148
2022-01-27 12:02:31 +00:00
Joshua Barretto
692855198e
Improved terrain in sites
2022-01-27 11:48:41 +00:00
floppy
d2e84fb936
- use common fn generate_from_parts to generate biome-names
...
- arrays for bricks instead of vecs
2022-01-27 12:29:34 +01:00
floppy
52c4c170fc
- use common fn generate_from_parts to generate biome-names
...
- arrays for bricks instead of vecs
2022-01-27 12:25:17 +01:00
Joshua Barretto
56eff72670
Fixed blue snow
2022-01-27 11:04:05 +00:00
