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
swrup
83ecf7bd32
fix melee hit_count increment
2021-07-09 16:17:51 +00:00
Knightress Paladin
b1cb8bdd1f
Added check to prevent melee leaps from stalling in liquids
2021-07-08 23:52:00 -07:00
Swrup
48bf083efa
make apply_attack() return if attack was actually applied
2021-07-08 21:05:32 +02:00
Marcel Märtens
e2e1f15cff
update depednencies
2021-07-08 12:21:02 +02:00
Dominik Broński
3a2d615fe5
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
Monty Marz
2a1efb4b2b
Minimap modes, Danari customizations update & bald hairstyles
2021-07-08 00:01:08 +00:00
juliancoffee
308348e1dc
Revert non-ui code changes
2021-07-07 17:53:17 +03:00
juliancoffee
8b032d661b
Add tests
2021-07-07 17:51:30 +03:00
juliancoffee
9f8faad329
Move skill boost modifiers to skills module
2021-07-07 17:51:30 +03:00
Sam
0b22953f05
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-06 22:54:23 -05:00
Samuel Keiffer
80fb4fc530
Merge branch 'aweinstock/improve-airship-pid' into 'master'
...
Fix integral error calculations in PID controller, and change coefficients for...
See merge request veloren/veloren!2568
2021-07-06 21:38:07 +00:00
Samuel Keiffer
9460d76a06
Merge branch 'sam/range-stat' into 'master'
...
Added range stat to weapons.
See merge request veloren/veloren!2563
2021-07-06 21:18:47 +00:00
Avi Weinstock
fdb5dedac1
Fix integral error calculations in PID controller, and change coefficients for airship and hot air balloon.
2021-07-06 16:52:12 -04:00
Sam
572072608b
Addressed review comments. Removed individual stat assignments.
2021-07-06 15:27:49 -05:00
Sam
aa60081ec7
Added range stat to weapons.
2021-07-05 20:32:12 -05:00
Benoît du Garreau
ab6105d789
Add a feature to optionnally disable hot-reloading
2021-07-06 00:27:09 +02:00
Marcel
4f87576482
Merge branch 'juliancoffee/trade_rebalancing' into 'master'
...
Make trade_pricing great again
See merge request veloren/veloren!2546
2021-07-05 21:40:58 +00:00
juliancoffee
63aa4219c5
Remove load_expect_dir as it's misused
...
- load_expect_dir while expected to fail on erros, fails only on
filesystem errors and only on root directory.
This commit replaces this function with `read_expect_dir` which returns iterator
which loads all files and panics if can't load them.
2021-07-05 20:14:26 +03:00
juliancoffee
0640902b7f
Make ItemEquality work
...
+ Create own directory for trade_pricing `assets/common/trading`
+ Move fictive loot tables there
+ Mark sellable/non-sellable items in trade_pricing tests
2021-07-05 19:55:08 +03:00
juliancoffee
28c9ea029b
Fill trade_pricing with craftable items
2021-07-05 15:43:03 +03:00
AldanTanneo
b50188d69f
Implemented trading stackable items with a full inventory
2021-07-05 10:34:03 +00:00
juliancoffee
3c20c4383b
(voxygen) Better support for multibuff items
...
+ change `effect` field in ItemKind::Consumable to `effects`, as it's
set of effects and not single effect.
2021-07-05 10:56:29 +03:00
juliancoffee
4f75e98cfa
Use Food after Buildup
...
+ Remove Saturation effect by rolling
+ Remove Saturation effect if interrupted with poise
+ Rename Potion to Drink, add ComplexFood
2021-07-05 10:56:29 +03:00
Samuel Keiffer
ac5bc5a217
Merge branch 'sam/fix-roll' into 'master'
...
Fix first person backwards roll.
See merge request veloren/veloren!2558
2021-07-05 03:46:47 +00:00
