Knightress Paladin
9f86189d86
Removed exhausted check from BasicAura and reformat max call
2021-07-21 20:20:27 -07:00
Knightress Paladin
974ab07e82
Used integer types to store combo values
2021-07-21 16:46:26 -07:00
Knightress Paladin
9abe3691af
Relocated BasicAura's combo reading to its static data
2021-07-21 16:46:26 -07:00
Knightress Paladin
18edd19240
Added check to prevent heal aura from being negative
2021-07-21 16:46:26 -07:00
Knightress Paladin
05a2efee52
Added exhaustion check to BasicAura to try to prevent repeated casts
2021-07-21 16:46:26 -07:00
Knightress Paladin
3b217e59aa
Added check for 0 combo in healing aura strength equation
2021-07-21 16:46:26 -07:00
Dr. Dystopia
9218c3bc3b
Apply same member order as in trait
2021-07-20 09:43:52 +02:00
Imbris
ceb800f187
Fix check before calculating entity pushback, was causing a NaN and probably other bugs
2021-07-19 01:31:40 -04:00
Imbris
e2fc167e0c
Setup animation mount points for quadruped medium, update offsets in
...
common for new quadruped mediums, properly transform the offset in the
mount system using ori, fix issue with composing in the base ori with
the mounting bone ori in voxygen.
2021-07-18 15:09:36 -04:00
Imbris
00b92096c9
Rework mounting animation so that full hierarchies of animation transforms can be applied to the mounter, factor out some common code in figure/mod.rs
2021-07-18 15:04:02 -04:00
Snowram
00b029d338
Make the mounter animations dependant of the mountee animation
2021-07-18 15:03:57 -04:00
Jonathan Berglin
214e6c1d42
Resolve all approved error supressions
2021-07-18 17:11:46 +00: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
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
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
Imbris
7c60b9577c
Revert "Merge branch..."
...
This reverts merge request !2608
2021-07-17 22:04:59 +00:00
juliancoffee
aa9ecdfa83
Add test for duplicates in EntityConfig::meta
...
+ make tests cleaner
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
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
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
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
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
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
Jonathan Berglin
51aa54ba8d
Resolve all '#[allow(clippy::approx_constant)]' error supressions
2021-07-15 16:56:55 +00:00
Marcel
54672a922e
Merge branch 'juliancoffee/forgiving_travellers' into 'master'
...
AI small fixes
See merge request veloren/veloren!2598
2021-07-15 08:15:25 +00:00
Dr. Dystopia
748074f075
Resolve all '#[allow(clippy::neg_multiply)]' error supressions
2021-07-14 22:18:30 +02:00
juliancoffee
2b2d5d7541
Teach AI how to interact in this evil world
2021-07-14 19:26:12 +03:00
juliancoffee
7923876fe4
Teach AI how to forgive
2021-07-14 19:26:11 +03:00
juliancoffee
7f30760ce9
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
holychowders
a1db073af5
Make Guards Defend Villagers
2021-07-14 07:40:43 +00:00
Marcel Märtens
2cb27be0c6
clippy fixes in tests
2021-07-12 13:35:26 +02:00
Marcel Märtens
e2cd431908
fmt after applying clippy fixes after toolchain update
2021-07-12 12:09:27 +02:00
Marcel Märtens
7153e8879d
fix clippy warnings
2021-07-12 12:09:09 +02:00
Sam
192078c6fb
Added buff strength stat to weapons.
2021-07-11 12:50:38 -05:00
Knightress Paladin
1289b21e70
Removed references to Healing Beam, which Healing Aura is replacing
2021-07-10 21:39:11 -07:00
Sam
61a18a671d
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
Knightress Paladin
97e59fc633
Added combo scaling to healing aura and allowed cultists to use it
2021-07-10 20:02:36 -07:00
Knightress Paladin
ac5bec1b09
Add healing aura for sceptre M2
2021-07-10 20:02:35 -07:00
Benoît du Garreau
2a14509640
Update wasmer
2021-07-10 15:06:51 +02:00
Samuel Keiffer
7cc4a7b593
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
Samuel Keiffer
439404988e
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
