Imbris
9c72333741
Revert "Merge branch..."
...
This reverts merge request !2608
2021-07-17 22:04:59 +00:00
Imbris
8270baffe5
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
aac3a3a5f7
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
d44702ef20
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
29e034fa5e
Resolve all '#[allow(clippy::op_ref)]' error supressions
2021-07-17 21:53:33 +02:00
Marcel Märtens
eeafdfed3a
Revert "no longer incremental builds in CI"
...
This reverts commit b3983c5451
2021-07-17 21:53:32 +02:00
Dr. Dystopia
6480cbd784
Resolve all '#[allow(clippy::len_zero)]' error supressions
2021-07-17 21:49:37 +02:00
Dr. Dystopia
dd84c320a3
Resolve all '#[allow(clippy::needless_return)]' error supressions
2021-07-17 21:47:17 +02:00
Joshua Barretto
7686023430
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
2c764c663a
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
e6696e1b50
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
121d87d87a
Resolve all '#[allow(clippy::redundant_clone)]' error supressions
2021-07-17 18:04:01 +00:00
Joshua Barretto
5bdea9249c
More sunset variation for higher graphics modes
2021-07-17 19:00:12 +01:00
Imbris
bff44ec03f
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
5c50ba2716
update cache image
2021-07-17 18:23:58 +02:00
Dr. Dystopia
353c4411c7
Resolve all '#[allow(clippy::print_literal)]' error supressions
2021-07-17 17:32:00 +02:00
Dr. Dystopia
52b4192dbd
Resolve all '#[allow(clippy::logic_bug)]' error supressions
2021-07-17 17:27:44 +02:00
Dr. Dystopia
beed7b81f9
Resolve all '#[allow(clippy::clone_on_copy)]' error supressions
2021-07-17 17:26:23 +02:00
Dr. Dystopia
9c6cdbba71
Resolve all '#[allow(clippy::redundant_pattern_matching)]' error supressions
2021-07-17 17:12:29 +02:00
Dr. Dystopia
a98edaace9
Resolve all '#[allow(clippy::useless_conversion)]' error supressions
2021-07-17 16:55:11 +02:00
Marcel
8d18c2be1f
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
021d5c60de
Add test for duplicates in EntityConfig::meta
...
+ make tests cleaner
2021-07-17 15:37:31 +03:00
juliancoffee
ccaacdd166
Better naming & comments
2021-07-17 15:37:31 +03:00
juliancoffee
c999720dbf
adress review
2021-07-17 15:37:31 +03:00
juliancoffee
fa34739ed6
clippy
2021-07-17 15:37:31 +03:00
juliancoffee
80f61e34a5
Move spawn_manifest to Index
2021-07-17 15:37:31 +03:00
juliancoffee
23a020f602
Add Automatic NameKind to EntityConfig
...
+ add animal entities for wildlife spawns
2021-07-17 15:37:31 +03:00
juliancoffee
d04364b1f1
Replace EntityConfig main/second_tool with hands
...
+ Check equip_slot can hold item in LoadoutBuilder
2021-07-17 15:37:31 +03:00
juliancoffee
1d2ea717ab
Move builder assets in EntityConfig to meta field
2021-07-17 15:37:31 +03:00
juliancoffee
6403ee0634
Merge None-loot in EntityConfig to LootKind
2021-07-17 15:37:31 +03:00
juliancoffee
7401d74aa6
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
6654c9e372
Fix bug with ignoring second_tool in EntityInfo
2021-07-17 15:37:30 +03:00
juliancoffee
d920f911a2
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
54eb2a3ff7
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
13fc4de561
Add per-species head offsets.
2021-07-16 19:22:28 -04:00
Imbris
eb999b2821
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
0a33c98268
Basic implementation of hat visuals.
2021-07-16 18:49:40 -04:00
Avi Weinstock
a4d6f0f3c1
Address MR 2612 review comments.
2021-07-16 17:46:48 -04:00
Samuel Keiffer
f38cde9d40
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
c417e8c5b9
Defer repositioning until after chunks are generated normally, to reduce latency and avoid duplicate work.
2021-07-16 15:42:50 -04:00
Marcel
0492b8dc87
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
01c9d6d6d0
icon
2021-07-16 18:39:14 +02:00
Samuel Keiffer
5063264e04
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
26d32d1273
fix scripts that ended with && and correct the ASSETS variable for tests
2021-07-16 15:32:39 +02:00
juliancoffee
0d1667c7c5
Set charge_through to false for non-humanoid dash
2021-07-16 15:49:02 +03:00
Marcel
1aa816a780
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
423b87316e
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
7555be0e25
Spawn players aboveground when using /site or when their waypoint is underground.
2021-07-15 17:54:29 -04:00
Dominik Broński
05bce2d7d5
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
5391a612c1
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
