Commit Graph

2987 Commits

Author SHA1 Message Date
09cbb90f61 Make the mounter animations dependant of the mountee animation 2021-07-18 15:03:57 -04:00
b15f426ee5 Resolve all approved error supressions 2021-07-18 17:11:46 +00:00
37147e2a83 Merge branch 'juliancoffee/overworld_assetization' into 'master'
Wildlife assetization

See merge request veloren/veloren!2591
2021-07-18 13:43:32 +00:00
1501f0467e 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
30119a6afc Re-address approx_constant lint without using fractional constants and
re-add a few blank lines
2021-07-17 20:41:09 -04:00
eade248e1f Fixed handling of orientation changes for airships 2021-07-18 01:13:36 +01:00
9c72333741 Revert "Merge branch..."
This reverts merge request !2608
2021-07-17 22:04:59 +00:00
021d5c60de Add test for duplicates in EntityConfig::meta
+ make tests cleaner
2021-07-17 15:37:31 +03:00
23a020f602 Add Automatic NameKind to EntityConfig
+ add animal entities for wildlife spawns
2021-07-17 15:37:31 +03:00
d04364b1f1 Replace EntityConfig main/second_tool with hands
+ Check equip_slot can hold item in LoadoutBuilder
2021-07-17 15:37:31 +03:00
1d2ea717ab Move builder assets in EntityConfig to meta field 2021-07-17 15:37:31 +03:00
6403ee0634 Merge None-loot in EntityConfig to LootKind 2021-07-17 15:37:31 +03:00
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
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
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
a4d6f0f3c1 Address MR 2612 review comments. 2021-07-16 17:46:48 -04:00
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
c417e8c5b9 Defer repositioning until after chunks are generated normally, to reduce latency and avoid duplicate work. 2021-07-16 15:42:50 -04:00
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
b88c23e74f Resolve all '#[allow(clippy::if_same_then_else)]' error supressions 2021-07-15 21:07:55 +00:00
9e9cbd290b cargo fmt 2021-07-15 15:52:10 -04:00
171113ea74 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
c1c331d59e Resolve all '#[allow(clippy::approx_constant)]' error supressions 2021-07-15 16:56:55 +00:00
f05fc79fe2 Merge branch 'juliancoffee/forgiving_travellers' into 'master'
AI small fixes

See merge request veloren/veloren!2598
2021-07-15 08:15:25 +00:00
4d96d6f9a0 Resolve all '#[allow(clippy::neg_multiply)]' error supressions 2021-07-14 22:18:30 +02:00
d42c7be141 Teach AI how to interact in this evil world 2021-07-14 19:26:12 +03:00
b6460f6c61 Teach AI how to forgive 2021-07-14 19:26:11 +03:00
59e9fc6530 Agent code refactoring
0) extracting code branches to closures
1) make RTSim remember target, even if they can't speak about it
2) make only RTSim Ships constantly flying (and not every flying RTSim)

You can tame RTSim Phoenix, yay
2021-07-14 14:55:50 +03:00
f316f1da60 Make Guards Defend Villagers 2021-07-14 07:40:43 +00:00
468cfe84e7 clippy fixes in tests 2021-07-12 13:35:26 +02:00
db8aedd363 fmt after applying clippy fixes after toolchain update 2021-07-12 12:09:27 +02:00
9b3b21f368 fix clippy warnings 2021-07-12 12:09:09 +02:00
Sam
be8b12845a Added buff strength stat to weapons. 2021-07-11 12:50:38 -05:00
146f86be2c Removed references to Healing Beam, which Healing Aura is replacing 2021-07-10 21:39:11 -07:00
Sam
fbcc774911 Renamed poise_strength to effect_power to allow it to be used more generally with other weapons in the future. 2021-07-10 23:22:00 -05:00
b96bb6fc5d Added combo scaling to healing aura and allowed cultists to use it 2021-07-10 20:02:36 -07:00
b4ec433509 Add healing aura for sceptre M2 2021-07-10 20:02:35 -07:00
286037166a Update wasmer 2021-07-10 15:06:51 +02:00
351a68944b Merge branch 'juliancoffee/skill_truth' into 'master'
Move skill boost modifiers to skills module

See merge request veloren/veloren!2540
2021-07-09 23:05:48 +00:00
32c2807ee0 Merge branch 'swrup/fix_melee_hit_count_increment' into 'master'
fix melee hit_count increment

See merge request veloren/veloren!2574
2021-07-09 16:17:51 +00:00
02151417f2 fix melee hit_count increment 2021-07-09 16:17:51 +00:00
c5c89e8662 Added check to prevent melee leaps from stalling in liquids 2021-07-08 23:52:00 -07:00
a8579670cf make apply_attack() return if attack was actually applied 2021-07-08 21:05:32 +02:00
98800c5424 update depednencies 2021-07-08 12:21:02 +02:00
e6af005ed1 Merge branch 'pfau/stuff' into 'master'
Minimap modes, Danari customizations update & bald hairstyles

See merge request veloren/veloren!2576
2021-07-08 00:01:09 +00:00
7c8d73a0c6 Minimap modes, Danari customizations update & bald hairstyles 2021-07-08 00:01:08 +00:00
066e0a0323 Revert non-ui code changes 2021-07-07 17:53:17 +03:00
034b032954 Add tests 2021-07-07 17:51:30 +03:00
274acae939 Move skill boost modifiers to skills module 2021-07-07 17:51:30 +03:00
Sam
509461763b Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive. 2021-07-06 22:54:23 -05:00