Jonathan Berglin
214e6c1d42
Resolve all approved error supressions
2021-07-18 17:11:46 +00:00
Marcel Märtens
013faa8c6a
set CI to also check a MR if it only modifies shell scripts
2021-07-18 18:53:52 +02:00
Marcel Märtens
c6d9fbd147
choose correct path for tarpaulin
2021-07-18 18:52:08 +02:00
Samuel Keiffer
42d6e4b118
Merge branch 'juliancoffee/overworld_assetization' into 'master'
...
Wildlife assetization
See merge request veloren/veloren!2591
2021-07-18 13:43:32 +00:00
Imbris
a4fd0ff84c
Merge branch 'tygyh/Resolve-all-'#-allow(clippy--redundant_pattern_matching)]'-error-supressions' into 'master'
...
Resolve all '#[allow(clippy::redundant_pattern_matching)]' error supressions
See merge request veloren/veloren!2622
2021-07-18 12:26:44 +00:00
Joshua Barretto
d0e7ef9c92
Merge branch 'zesterer/small-fixes' into 'master'
...
Fixed handling of orientation changes for airships
See merge request veloren/veloren!2640
2021-07-18 08:29:50 +00:00
Imbris
c60b02223b
Merge branch 'revert-eb08b6a1' into 'master'
...
Revert "Resolve all '#[allow(clippy::approx_constant)]' error supressions" and re-address the lint using just the PI constant
See merge request veloren/veloren!2639
2021-07-18 08:00:43 +00:00
Marcel
ced9c563d0
Merge branch 'tygyh/Resolve-all-'#-allow(clippy--needless_return)]'-error-supressions' into 'master'
...
Resolve all '#[allow(clippy::needless_return)]' error supressions
See merge request veloren/veloren!2632
2021-07-18 02:00:03 +00:00
Marcel
36a777aa6b
Merge branch 'tygyh/Resolve-all-'#-allow(clippy--len_zero)]'-error-supressions' into 'master'
...
Resolve all '#[allow(clippy::len_zero)]' error supressions
See merge request veloren/veloren!2633
2021-07-18 01:24:28 +00:00
Marcel
364f978b9b
Merge branch 'tygyh/Resolve-all-'#-allow(clippy--op_ref)]'-error-supressions' into 'master'
...
Resolve all '#[allow(clippy::op_ref)]' error supressions
See merge request veloren/veloren!2635
2021-07-18 00:59:25 +00:00
Joshua Barretto
1c5ce83b66
Merge branch 'zesterer/better-sunsets' into 'master'
...
More sunset variation for higher graphics modes
See merge request veloren/veloren!2630
2021-07-18 00:59:22 +00:00
Imbris
fa439fb08d
Re-address approx_constant lint without using fractional constants and
...
re-add a few blank lines
2021-07-17 20:41:09 -04:00
Joshua Barretto
5989a25ef2
Fixed handling of orientation changes for airships
2021-07-18 01:13:36 +01:00
Marcel
6c73216f35
Merge branch 'tygyh/Resolve-all-'#-allow(clippy--logic_bug)]'-error-supressions' into 'master'
...
Resolve all '#[allow(clippy::logic_bug)]' error supressions
See merge request veloren/veloren!2624
2021-07-17 23:46:28 +00:00
Imbris
7c60b9577c
Revert "Merge branch..."
...
This reverts merge request !2608
2021-07-17 22:04:59 +00:00
Imbris
afe639d4ce
Merge branch 'xMAC94x/incremental_fix' into 'master'
...
Revert "no longer incremental builds in CI"
See merge request veloren/veloren!2634
2021-07-17 21:08:22 +00:00
Marcel
ef1b175b17
Merge branch 'tygyh/Resolve-all-'#-allow(clippy--print_literal)]'-error-supressions' into 'master'
...
Resolve all '#[allow(clippy::print_literal)]' error supressions
See merge request veloren/veloren!2627
2021-07-17 20:29:35 +00:00
Imbris
7efe2559cf
Merge branch 'tygyh/Resolve-all-'#-allow(clippy--clone_on_copy)]'-error-supressions' into 'master'
...
Resolve all '#[allow(clippy::clone_on_copy)]' error supressions
See merge request veloren/veloren!2623
2021-07-17 20:00:29 +00:00
Dr. Dystopia
d94f360a0f
Resolve all '#[allow(clippy::op_ref)]' error supressions
2021-07-17 21:53:33 +02:00
Marcel Märtens
6de161a68f
Revert "no longer incremental builds in CI"
...
This reverts commit b3983c545188853b7e26c844d5c7231330009a5f.
2021-07-17 21:53:32 +02:00
Dr. Dystopia
28b7911e19
Resolve all '#[allow(clippy::len_zero)]' error supressions
2021-07-17 21:49:37 +02:00
Dr. Dystopia
33e57a46b3
Resolve all '#[allow(clippy::needless_return)]' error supressions
2021-07-17 21:47:17 +02:00
Joshua Barretto
23c35cfca8
Merge branch 'aweinstock/hats' into 'master'
...
Basic implementation of hat visuals.
See merge request veloren/veloren!2485
2021-07-17 19:42:26 +00:00
Marcel
bfad3523fc
Merge branch 'xMAC94x/update_ci_cache' into 'master'
...
update cache image
See merge request veloren/veloren!2629
2021-07-17 18:29:00 +00:00
Imbris
339862ea1b
Merge branch 'tygyh/Resolve-all-'#-allow(clippy--redundant_clone)]'-error-supressions' into 'master'
...
Resolve all '#[allow(clippy::redundant_clone)]' error supressions
See merge request veloren/veloren!2621
2021-07-17 18:04:02 +00:00
Jonathan Berglin
092210df2f
Resolve all '#[allow(clippy::redundant_clone)]' error supressions
2021-07-17 18:04:01 +00:00
Joshua Barretto
689574e9a0
More sunset variation for higher graphics modes
2021-07-17 19:00:12 +01:00
Imbris
9258308ce7
Merge branch 'tygyh/Resolve-all-'#-allow(clippy--useless_conversion)]'-error-supressions' into 'master'
...
Resolve all '#[allow(clippy::useless_conversion)]' error supressions
See merge request veloren/veloren!2620
2021-07-17 16:50:32 +00:00
Marcel Märtens
a757fe3d2f
update cache image
2021-07-17 18:23:58 +02:00
Dr. Dystopia
b9927fe30f
Resolve all '#[allow(clippy::print_literal)]' error supressions
2021-07-17 17:32:00 +02:00
Dr. Dystopia
134857c42c
Resolve all '#[allow(clippy::logic_bug)]' error supressions
2021-07-17 17:27:44 +02:00
Dr. Dystopia
c806c1e766
Resolve all '#[allow(clippy::clone_on_copy)]' error supressions
2021-07-17 17:26:23 +02:00
Dr. Dystopia
8049b74e38
Resolve all '#[allow(clippy::redundant_pattern_matching)]' error supressions
2021-07-17 17:12:29 +02:00
Dr. Dystopia
5b591c4d95
Resolve all '#[allow(clippy::useless_conversion)]' error supressions
2021-07-17 16:55:11 +02:00
Marcel
eae24f96a0
Merge branch 'xMAC94x/fix_scripts' into 'master'
...
fix scripts that ended with &&
See merge request veloren/veloren!2614
2021-07-17 14:35:58 +00:00
juliancoffee
aa9ecdfa83
Add test for duplicates in EntityConfig::meta
...
+ make tests cleaner
2021-07-17 15:37:31 +03:00
juliancoffee
e5de076d7a
Better naming & comments
2021-07-17 15:37:31 +03:00
juliancoffee
e7e3f60e84
adress review
2021-07-17 15:37:31 +03:00
juliancoffee
84b7addfc3
clippy
2021-07-17 15:37:31 +03:00
juliancoffee
b58211a2f5
Move spawn_manifest to Index
2021-07-17 15:37:31 +03:00
juliancoffee
4a83cb13c5
Add Automatic NameKind to EntityConfig
...
+ add animal entities for wildlife spawns
2021-07-17 15:37:31 +03:00
juliancoffee
91b3f49c15
Replace EntityConfig main/second_tool with hands
...
+ Check equip_slot can hold item in LoadoutBuilder
2021-07-17 15:37:31 +03:00
juliancoffee
335dbf4cc8
Move builder assets in EntityConfig to meta field
2021-07-17 15:37:31 +03:00
juliancoffee
b74dd21d3b
Merge None-loot in EntityConfig to LootKind
2021-07-17 15:37:31 +03:00
juliancoffee
19c7355c4e
Add wildlife assetization support
...
+ add asset tests
+ migrate tundra animals
+ migrate taiga animals
+ declare temperate zone (animals yet to be created)
+ declare jungle zone (animals yet to be created)
+ declare tropical zone (animals yet to be created)
+ declare desert zone (animals yet to be created)
+ declare water (river inhabitants) zones (animals yet to be created)
2021-07-17 15:37:30 +03:00
juliancoffee
78b780e8bd
Fix bug with ignoring second_tool in EntityInfo
2021-07-17 15:37:30 +03:00
juliancoffee
f7b7f1ca4d
Add Exact body field for EntityConfig
...
Add Alignment field to EntityConfig
+ Migrate to specifying alignment and body in entity assets
+ Make Body required field (with Uninit if you want to specify it later)
2021-07-17 15:37:30 +03:00
Forest Anderson
83692ae1b7
Merge branch 'aylana/asp-sfx' into 'master'
...
Princess-Lana - Add asp sound effects for the game
See merge request veloren/veloren!2611
2021-07-17 01:49:20 +00:00
Avi Weinstock
78ae2d76dc
Add per-species head offsets.
2021-07-16 19:22:28 -04:00
Imbris
d776cafa4a
Merge branch 'aweinstock/fix-waypoint' into 'master'
...
Spawn players aboveground when using `/site` or when their waypoint is underground.
See merge request veloren/veloren!2612
2021-07-16 23:18:33 +00:00
