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
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
Jonathan Berglin
b88c23e74f
Resolve all '#[allow(clippy::if_same_then_else)]' error supressions
2021-07-15 21:07:55 +00:00
Avi Weinstock
9e9cbd290b
cargo fmt
2021-07-15 15:52:10 -04:00
Savalige
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
Jonathan Berglin
c1c331d59e
Resolve all '#[allow(clippy::approx_constant)]' error supressions
2021-07-15 16:56:55 +00:00
Marcel
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
Dr. Dystopia
4d96d6f9a0
Resolve all '#[allow(clippy::neg_multiply)]' error supressions
2021-07-14 22:18:30 +02:00
juliancoffee
d42c7be141
Teach AI how to interact in this evil world
2021-07-14 19:26:12 +03:00
juliancoffee
b6460f6c61
Teach AI how to forgive
2021-07-14 19:26:11 +03:00
juliancoffee
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
holychowders
f316f1da60
Make Guards Defend Villagers
2021-07-14 07:40:43 +00:00
Marcel Märtens
468cfe84e7
clippy fixes in tests
2021-07-12 13:35:26 +02:00
Marcel Märtens
db8aedd363
fmt after applying clippy fixes after toolchain update
2021-07-12 12:09:27 +02:00
Marcel Märtens
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
Knightress Paladin
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
Knightress Paladin
b96bb6fc5d
Added combo scaling to healing aura and allowed cultists to use it
2021-07-10 20:02:36 -07:00
Knightress Paladin
b4ec433509
Add healing aura for sceptre M2
2021-07-10 20:02:35 -07:00
Benoît du Garreau
286037166a
Update wasmer
2021-07-10 15:06:51 +02:00
Samuel Keiffer
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
Samuel Keiffer
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
swrup
02151417f2
fix melee hit_count increment
2021-07-09 16:17:51 +00:00
Knightress Paladin
c5c89e8662
Added check to prevent melee leaps from stalling in liquids
2021-07-08 23:52:00 -07:00
Swrup
a8579670cf
make apply_attack() return if attack was actually applied
2021-07-08 21:05:32 +02:00
Marcel Märtens
98800c5424
update depednencies
2021-07-08 12:21:02 +02:00
Dominik Broński
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
Monty Marz
7c8d73a0c6
Minimap modes, Danari customizations update & bald hairstyles
2021-07-08 00:01:08 +00:00
juliancoffee
066e0a0323
Revert non-ui code changes
2021-07-07 17:53:17 +03:00
juliancoffee
034b032954
Add tests
2021-07-07 17:51:30 +03:00
juliancoffee
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
Samuel Keiffer
01a8f53ba3
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
e5a5d28246
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
1a60ebd5db
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
1c3bd13afa
Addressed review comments. Removed individual stat assignments.
2021-07-06 15:27:49 -05:00
Sam
e8e953ffab
Added range stat to weapons.
2021-07-05 20:32:12 -05:00
Benoît du Garreau
110b9742b7
Add a feature to optionnally disable hot-reloading
2021-07-06 00:27:09 +02:00
Marcel
572a41b029
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
15d83e65cc
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
1e358e6f0c
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
f213ba138a
Fill trade_pricing with craftable items
2021-07-05 15:43:03 +03:00
AldanTanneo
3804c3d032
Implemented trading stackable items with a full inventory
2021-07-05 10:34:03 +00:00
juliancoffee
d4c61ae2f3
(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
c538a9696c
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
21523de394
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
