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 |
|
floppy
|
2fe8cb965d
|
change SeaCrocodile spawn
|
2022-01-27 11:34:59 +01:00 |
|
Joshua Barretto
|
25543b45c5
|
Merge branch 'zesterer/tiny-fixes' into 'master'
Remove colour banding
See merge request veloren/veloren!3153
|
2022-01-27 01:03:56 +00:00 |
|
Joshua Barretto
|
39863e8727
|
Remove colour banding
|
2022-01-27 00:29:03 +00: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 |
|
Forest Anderson
|
e675b20451
|
Merge branch 'infrandomness/thread_local_vuln' into 'master'
Fix RUSTSEC-2022-0006
See merge request veloren/veloren!3152
|
2022-01-26 21:47:07 +00:00 |
|
infrandomness
|
1a1acfae2c
|
Fix RUSTSEC-2022-0006
|
2022-01-26 22:08:38 +01:00 |
|
Dr. Dystopia
|
fe8eee837c
|
Merge branch 'tygyh/Extract-controller-functions' of https://gitlab.com/veloren/dev/veloren into tygyh/Extract-controller-functions
|
2022-01-26 21:26:39 +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
|
a1a9c0f4f2
|
Create 'push_cancel_input' function
|
2022-01-26 20:15:40 +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 |
|
Marcel
|
728488502e
|
Merge branch 'juliancoffee/start_2021' into 'master'
Migrate Veloren to 2021 edition
See merge request veloren/veloren!3149
|
2022-01-26 15:56:29 +00:00 |
|
juliancoffee
|
fba89517de
|
Move Veloren to 2021 edition
|
2022-01-26 16:46:40 +02:00 |
|
juliancoffee
|
4fe5fdad4a
|
Move world to 2021 edition
|
2022-01-26 16:03:27 +02:00 |
|
floppy
|
87ea7a906a
|
more biome namegen bricks
|
2022-01-26 14:58:48 +01:00 |
|
juliancoffee
|
e3927ed3f6
|
Move server to 2021 edition
|
2022-01-26 15:57:50 +02:00 |
|
juliancoffee
|
6a0458ddf1
|
Move voxygen to 2021 edition
|
2022-01-26 15:47:39 +02:00 |
|
juliancoffee
|
25b04e6ee7
|
Move common to 2021 edition
|
2022-01-26 15:17:01 +02:00 |
|
juliancoffee
|
9edd526279
|
Move voxygen-i18n to 2021 edition
|
2022-01-26 15:13:05 +02:00 |
|
juliancoffee
|
ebe95ebe33
|
Move common-assets to 2021 edition
|
2022-01-26 15:09:00 +02:00 |
|
Joshua Barretto
|
9d7370ab57
|
Merge branch 'infrandomness/site2/name_sites' into 'master'
Give names to site2 sites
See merge request veloren/veloren!3145
|
2022-01-26 11:42:35 +00:00 |
|
InfRandomness
|
52c92ba0d4
|
Give names to site2 sites
|
2022-01-26 11:42:35 +00:00 |
|
Marcel
|
0ebff57a59
|
Merge branch 'Martin/remove-server-from-list' into 'master'
Feature: Delete button in the servers menu
See merge request veloren/veloren!3144
|
2022-01-26 10:20:15 +00:00 |
|
ninefox
|
e6ced0577e
|
Persist interface debug checkbox
|
2022-01-25 22:47:26 -08: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 |
|
Samuel Keiffer
|
ac42b184f5
|
Merge branch 'sam/possess-fix' into 'master'
Fix possession for animation work purposes.
See merge request veloren/veloren!3142
|
2022-01-25 18:03:40 +00:00 |
|
Martin
|
700f709664
|
added delete button in the settings window which deletes a server from the list
|
2022-01-25 19:48:58 +02:00 |
|
Martin
|
a86ed49293
|
added message and event for deleting a server from the list
|
2022-01-25 19:48:19 +02:00 |
|
Sam
|
e6bef416b4
|
Fix possession for animation work purposes.
|
2022-01-25 12:29:05 -05:00 |
|
Joshua Barretto
|
3bee4ef0d1
|
Merge branch 'zesterer/worldgen' into 'master'
Fixed site2 economies
See merge request veloren/veloren!3141
|
2022-01-25 17:02:47 +00:00 |
|
Joshua Barretto
|
59ac3b1d4f
|
Fixed site2 economies
|
2022-01-25 16:31:12 +00:00 |
|
Samuel Keiffer
|
4803891a29
|
Merge branch 'james/no-cliff-diving-allowed' into 'master'
Prohibit accidental cliff diving by NPCs
See merge request veloren/veloren!3139
|
2022-01-25 16:25:40 +00:00 |
|
James Melkonian
|
2671f824d0
|
Prohibit accidental cliff diving by NPCs
|
2022-01-25 16:25:40 +00:00 |
|
Imbris
|
432d78a232
|
Merge branch 'imbris/screenshot-format' into 'master'
Support multiple texture formats for screenshots
See merge request veloren/veloren!3134
|
2022-01-25 14:45:54 +00:00 |
|
Imbris
|
f9ce85164f
|
Merge branch 'imbris/fix-egui-mouse-capture' into 'master'
Fix egui capturing mouse when hidden.
See merge request veloren/veloren!3140
|
2022-01-25 14:41:50 +00:00 |
|
floppy
|
ea6f09ec88
|
change SeaCrocodile spawn
|
2022-01-25 10:27:25 +01:00 |
|