James Melkonian
f21e0f31fb
Restrict RtSim ships to airships
2022-02-03 21:41:20 -08:00
Dominik Broński
19c764dde6
Merge branch 'christof/econfix' into 'master'
...
Small economy cleanup
See merge request veloren/veloren!3164
2022-02-03 21:48:01 +00:00
Youssef Fahmy
fdfd2c99ff
Removal of /home
2022-02-02 08:50:23 +00:00
Christof Petig
42faef9ab0
clippy is right,
...
but I don't want to rearrange print_sorted (test). so reduce overall strictness
2022-01-31 22:25:38 +01:00
Christof Petig
080444fc8b
juliancoffee prefers this style
2022-01-31 22:19:21 +01:00
Christof Petig
f4f1b5c77b
more stable sorting
2022-01-31 22:00:23 +01:00
Christof Petig
dc92d0ab12
fix multiple calls of init
2022-01-31 21:31:08 +01:00
Christof Petig
d8edd70837
create a nice csv table for comparison
2022-01-31 21:19:23 +01:00
Christof Petig
47aba3e4cd
clean up double rescaling
2022-01-31 20:52:25 +01:00
Christof Petig
6b9180bba6
separate amount from probability
2022-01-31 19:45:39 +01:00
Christof Petig
12fedef98f
fix some test cases
2022-01-31 19:45:39 +01:00
juliancoffee
45ba21796c
Add test cases
2022-01-31 19:45:39 +01:00
Christof Petig
8230323a76
fix code quality
2022-01-31 19:45:39 +01:00
Christof Petig
66c431ba86
cargo fmt
2022-01-31 19:45:39 +01:00
Christof Petig
a98b9ad049
normalize loot tables before combining them, take current values for a start
2022-01-31 19:45:38 +01:00
Christof Petig
8228437b22
load loot table only once, add utility function and test cases
2022-01-31 19:45:38 +01:00
Justin Shipsey
612f084831
Merge branch 'slipped/bipeds' into 'master'
...
Slipped/bipeds
See merge request veloren/veloren!3163
2022-01-31 17:08:01 +00: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
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
jshipsey
7cac4b4001
myrmidon fix
2022-01-30 02:02:23 -05:00
Scott Williams
21fd296407
Changed entity drops csv export to export names instead of asset paths
2022-01-29 17:37: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
69436db64c
Added wall lamps
2022-01-28 13:58:41 +00:00
jshipsey
4fbd3027a1
new mobs
2022-01-28 02:50:15 -05:00
juliancoffee
fa724ec2e2
Fix doc-tests
2022-01-28 00:18:29 +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
43b5af2980
Create asset_migrate bin from entity_migrate
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
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
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
infrandomness
1a1acfae2c
Fix RUSTSEC-2022-0006
2022-01-26 22:08:38 +01: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
juliancoffee
fba89517de
Move Veloren to 2021 edition
2022-01-26 16:46:40 +02:00
juliancoffee
25b04e6ee7
Move common to 2021 edition
2022-01-26 15:17:01 +02:00
juliancoffee
ebe95ebe33
Move common-assets to 2021 edition
2022-01-26 15:09:00 +02:00
Dominik Broński
ca7b048184
Merge branch 'SeaCrocodile' into 'master'
...
Sea crocodile
See merge request veloren/veloren!3146
2022-01-26 01:26:38 +00:00
Sam
e6bef416b4
Fix possession for animation work purposes.
2022-01-25 12:29:05 -05:00
floppy
fb316e8f66
SeaCrocodile spawning in tropical Oceans
2022-01-24 19:36:13 +01:00
