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
Avi Weinstock
17c2459a01
Basic implementation of hat visuals.
2021-07-16 18:49:40 -04:00
Avi Weinstock
b9b666c2dc
Address MR 2612 review comments.
2021-07-16 17:46:48 -04:00
Samuel Keiffer
651b775932
Merge branch 'knightresspaladin/healing-aura' into 'master'
...
Knightresspaladin/healing aura
See merge request veloren/veloren!2587
2021-07-16 21:32:03 +00:00
Avi Weinstock
a463b8b171
Defer repositioning until after chunks are generated normally, to reduce latency and avoid duplicate work.
2021-07-16 15:42:50 -04:00
Marcel
b67cf70c70
Merge branch 'savalige/ai_spacing' into 'master'
...
Issue #1153 - Improve combat AI spacing between Agents of the same Alignment
Closes #1153
See merge request veloren/veloren!2451
2021-07-16 16:40:27 +00:00
Monty Marz
1443b3e78d
icon
2021-07-16 18:39:14 +02:00
Samuel Keiffer
0ef3a978b0
Merge branch 'juliancoffee/patch_animal_dash_double_hit' into 'master'
...
Set charge_through to false for non-humanoid dash
See merge request veloren/veloren!2616
2021-07-16 15:33:59 +00:00
Marcel Märtens
b04ba58040
fix scripts that ended with && and correct the ASSETS variable for tests
2021-07-16 15:32:39 +02:00
juliancoffee
c6b1446f72
Set charge_through to false for non-humanoid dash
2021-07-16 15:49:02 +03:00
Marcel
33aba370d4
Merge branch 'zesterer/sfx' into 'master'
...
Clipped arrow sound effects for more immediate feedback
See merge request veloren/veloren!2476
2021-07-16 10:32:29 +00:00
Marcel
f10f583a92
Merge branch 'xMAC94x/experiment_ci' into 'master'
...
fix/cleanup ci
See merge request veloren/veloren!2595
2021-07-16 00:33:35 +00:00
Avi Weinstock
47d185d094
Spawn players aboveground when using /site or when their waypoint is underground.
2021-07-15 17:54:29 -04:00
Dominik Broński
d4cde2bffa
Merge branch 'knightresspaladin/toggle-block-collision' into 'master'
...
Implemented setting blocks with the wiring system
See merge request veloren/veloren!2604
2021-07-15 21:50:34 +00:00
Marcel
0622ac6308
Merge branch 'Resolve-all-'#-allow(clippy--if_same_then_else)]'-error-supressions' into 'master'
...
Resolve all '#[allow(clippy::if_same_then_else)]' error supressions
See merge request veloren/veloren!2602
2021-07-15 21:07:56 +00:00
Jonathan Berglin
e165d52d03
Resolve all '#[allow(clippy::if_same_then_else)]' error supressions
2021-07-15 21:07:55 +00:00
Avi Weinstock
c037a75310
cargo fmt
2021-07-15 15:52:10 -04:00
Knightress Paladin
60b11ca408
Cleaned up chunk-relative block setting math
2021-07-15 12:36:00 -07:00
Knightress Paladin
c80c5c6ab4
Implemented setting blocks with the wiring system
2021-07-15 12:36:00 -07:00
Aylana
513085da30
Add asp sound effects
2021-07-15 20:15:36 +02:00
Savalige
2a1a84fef7
Added a spacing_radius method to body to make it possible to sett different spacing for different entities
2021-07-15 13:33:51 -04:00
